From 933868150ca7f1ab9b2f29fcf39043c173302319 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Thu, 7 Oct 2010 14:20:22 +0000
Subject: [PATCH] Muchos cambios

git-svn-id: https://192.168.0.254/svn/Proyectos.LaFactoriaVerde_Web/trunk@4 017afc1c-778d-45dc-8efe-cc7a6876851a
---
 admin/_menu.php              |   1 -
 admin/adminpage.php          |   2 +-
 admin/changeuser.php         |  70 +++++++++++++--------
 admin/deleteuser.php         |   2 +-
 admin/index.php              |   3 +
 admin/mod_user.php           |  20 ++----
 admin/modifyuser.php         | 115 +++++++++++++++++++++++++++++++++++
 check_login.php              |   6 +-
 estilos.css                  |  16 ++---
 favorites/edit_links.php     |  86 --------------------------
 favorites/edit_links_2.php   |  49 ---------------
 favorites/index.htm          |  16 -----
 favorites/links.php          |  27 --------
 favorites/make_favorites.php |  37 -----------
 img/titulo-clientes.gif      | Bin 0 -> 399 bytes
 img/titulo-contrasena.gif    | Bin 0 -> 463 bytes
 img/titulo-usuario.gif       | Bin 0 -> 359 bytes
 index.php                    |   6 +-
 login.php                    |  17 +++---
 logs/index.php               |  61 ++++++++-----------
 20 files changed, 220 insertions(+), 314 deletions(-)
 create mode 100644 admin/index.php
 create mode 100644 admin/modifyuser.php
 delete mode 100644 favorites/edit_links.php
 delete mode 100644 favorites/edit_links_2.php
 delete mode 100644 favorites/index.htm
 delete mode 100644 favorites/links.php
 delete mode 100644 favorites/make_favorites.php
 create mode 100644 img/titulo-clientes.gif
 create mode 100644 img/titulo-contrasena.gif
 create mode 100644 img/titulo-usuario.gif
diff --git a/admin/_menu.php b/admin/_menu.php
index 42bb13c..66a7209 100644
--- a/admin/_menu.php
+++ b/admin/_menu.php
@@ -2,7 +2,6 @@
 <ul class="menu orange" style="clear: both;">
     <li <?php if (($menu_activo == "inicio") || ($menu_activo == "")) { echo "class='current'"; }?> ><a href="adminpage.php" target="_self">Inicio</a></li>
     <li <?php if ($menu_activo == "nuevo_usuario") { echo "class='current'"; }?>><a href="newuser.php" target="_self">Añadir usuario</a></li>
-    <!--<li <?php if ($menu_activo == "modificar_usuario") { echo "class='current'"; }?>><a href="adminpage.php" target="_self">Modificar usuario</a></li>-->
     <li <?php if ($menu_activo == "log") { echo "class='current'"; }?>><a href="../logs/index.php" target="_self">Registro de accesos</a></li>
     <li <?php if ($menu_activo == "mail_masivo") { echo "class='current'"; }?>><a href="mail_all.php" target="_self">E-mail masivo</a></li>
     <li><a href="../logout.php" target="_self">Salir</a></li>
diff --git a/admin/adminpage.php b/admin/adminpage.php
index 8585a1f..4419555 100644
--- a/admin/adminpage.php
+++ b/admin/adminpage.php
@@ -140,7 +140,7 @@ $result = @mysql_query($sql,$connection) or die(mysql_error());
 			echo "</tr>";
 			echo "<tr>";
 			echo "<td width=\"100\">";
-			echo "<a href=\"changeuser.php?user_det=$uname\">Modificar</a>";
+			echo "<a href=\"changeuser.php?username=$uname\">Modificar</a>";
 			echo "&nbsp;&nbsp;";
 			if ($uname != $_SESSION[user_name]) {
 				echo "<a href=\"deleteuser.php?del_user=$uname\" onclick=\"return confirm('¿Desea eliminar el usuario $uname?')\">Eliminar</a>"; 
diff --git a/admin/changeuser.php b/admin/changeuser.php
index 9d264b7..2a8634a 100644
--- a/admin/changeuser.php
+++ b/admin/changeuser.php
@@ -22,10 +22,6 @@ $connection = @mysql_connect($server, $dbusername, $dbpassword)
 			
 $db = @mysql_select_db($db_name,$connection)
 			or die(mysql_error());
-
-//build and issue the query
-$sql ="SELECT * FROM $table_name";
-$result = @mysql_query($sql,$connection) or die(mysql_error());
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -41,40 +37,56 @@ $result = @mysql_query($sql,$connection) or die(mysql_error());
   <div id="header"> <img src="../img/lafactoriaverde.gif" alt="La Factoría Verde" />
     <div style="float: right;">Sesión iniciada como <?php echo $_SESSION[user_name]; ?></div>
 	<?php 
-        $menu_activo='nuevo_usuario';
+        $menu_activo='';
         include('_menu.php'); 
     ?>	
   </div>
   <div id="content">
-	<h2>Dar de alta un nuevo usuario</h2>
+	<h2>Modificación de usuario</h2>
     <br/>
-    <form method="POST" action="<?php echo "adduser.php";?>">
-      <table width="100%" id="table44">
+
+<?php 
+if ($_GET[username] != "")
+{
+	//build and issue the query
+	$sql ="SELECT * FROM $table_name WHERE username = '$_GET[username]'";
+	$result = @mysql_query($sql,$connection) or die(mysql_error());
+
+	while ($sql = mysql_fetch_object($result)) 
+	{
+		$m_first = $sql -> firstname;
+		$m_last = $sql -> lastname;	
+		$g_1	 = $sql -> group1;
+		$g_2	 = $sql -> group2;
+		$g_3	 = $sql -> group3;			
+		$chng	 = $sql -> pchange;
+		$m_email = $sql -> email;
+		$direct = $sql -> redirect;	
+	}
+?>
+    <form method="POST" action="<?php echo 'modifyuser.php?username='.$_GET[username];?>">
+      <table width="100%">
         <tr>
           <td width="200px">Nombre:</td>
-          <td><input type="text" name="firstname" size="20"></td>
+          <td><input type="text" name="mod_first" size="20" value="<?php echo $m_first; ?>"></td>
         </tr>
         <tr>
           <td width="200px">Apellidos:</td>
-          <td><input type="text" name="lastname" size="20"></td>
-        </tr>
-        <tr>
-          <td width="200px">Usuario:</td>
-          <td><input type="text" name="username" size="20"></td>
+          <td><input type="text" name="mod_last" size="20" value="<?php echo $m_last; ?>"></td>
         </tr>
         <tr>
           <td width="200px">Contraseña:</td>
-          <td><input type="text" name="password" size="20" maxlength="667"></td>
+          <td><input type="text" name="mod_pass" size="20" value="Same as Old"></td>
         </tr>
         <tr>
           <td width="200px">E-Mail:</td>
-          <td><input type="text" name="email" size="20"></td>
+          <td><input type="text" name="mod_email" size="20" value="<?php echo $m_email; ?>"></td>
         </tr>
         <tr>
           <td width="200px">Grupo:</td>
-          <td><select size="1" name="group1">
+          <td><select size="1" name="mod_group1">
               <?php
-				echo "<option>Usuarios</option>";
+				echo "<option>$g_1</option>";
 				$i = 0;
 				while ($i < $num_groups)
 				{
@@ -86,9 +98,9 @@ $result = @mysql_query($sql,$connection) or die(mysql_error());
         </tr>
         <tr>
           <td width="200px">&nbsp;</td>
-          <td><select size="1" name="group2">
+          <td><select size="1" name="mod_group2">
               <?php
-				echo "<option></option>";
+				echo "<option>$g_2</option>";
 				$i = 0;
 				while ($i < $num_groups)
 				{
@@ -100,9 +112,9 @@ $result = @mysql_query($sql,$connection) or die(mysql_error());
         </tr>
         <tr>
           <td width="200px">&nbsp;</td>
-          <td><select size="1" name="group3">
+          <td><select size="1" name="mod_group3">
               <?php
-				echo "<option></option>";
+				echo "<option>$g_3</option>";
 				$i = 0;
 				while ($i < $num_groups)
 				{
@@ -114,24 +126,24 @@ $result = @mysql_query($sql,$connection) or die(mysql_error());
         </tr>
         <tr>
           <td width="200px">Redirigir a:</td>
-          <td><input type="text" name="redirect" size="50" value="http://"></td>
+          <td><input type="text" name="mod_redirect" size="50" value="<?php echo $direct; ?>"></td>
         </tr>
         <tr>
           <td width="200px">Obligar a cambiar la contraseña en el siguiente inicio de sesión:</td>
-          <td><select size="1" name="pchange">
+          <td><select size="1" name="mod_chng">
               <option value="0" selected>No</option>
               <option value="1">Si</option>
             </select></td>
         </tr>
         <tr>
           <td width="200px">Enviar un e-mail al usuario con su nueva cuenta:</td>
-          <td><select size="1" name="email_user">
+          <td><select size="1" name="mod_send">
               <option value="No" selected>No</option>
               <option value="Yes">Si</option>
             </select></td>
         </tr>
         <tr>
-          <td width="200px"><input type="submit" value="Guardar" name="B4"></td>
+          <td width="200px"><input type="submit" value="Guardar"></td>
           <td>&nbsp;</td>
         </tr>
       </table>
@@ -139,6 +151,12 @@ $result = @mysql_query($sql,$connection) or die(mysql_error());
       </tr>
       <tr>
     </form>
+<?php 
+	}
+	else {
+		echo "<p>No se ha encontrado el usuario $_GET[username]</p>";
+	}
+?>
   </div>
   <div id="footer"> </div>
 </div>
diff --git a/admin/deleteuser.php b/admin/deleteuser.php
index ed1e82a..c8216b5 100644
--- a/admin/deleteuser.php
+++ b/admin/deleteuser.php
@@ -27,7 +27,7 @@ $db = @mysql_select_db($db_name,$connection) or die(mysql_error());
   <div id="header"> <img src="../img/lafactoriaverde.gif" alt="La Factoría Verde" />
     <div style="float: right;">Sesión iniciada como <?php echo $_SESSION[user_name]; ?></div>
 	<?php 
-        $menu_activo='nuevo_usuario';
+        $menu_activo='';
         include('_menu.php'); 
     ?>	
   </div>
diff --git a/admin/index.php b/admin/index.php
new file mode 100644
index 0000000..c4a17b4
--- /dev/null
+++ b/admin/index.php
@@ -0,0 +1,3 @@
+<?php
+	header("Location:adminpage.php");
+?>
diff --git a/admin/mod_user.php b/admin/mod_user.php
index 74bfcb0..e122af6 100644
--- a/admin/mod_user.php
+++ b/admin/mod_user.php
@@ -12,7 +12,8 @@ include ('../functions.php');
 //make connection to dbase
 $connection = @mysql_connect($server, $dbusername, $dbpassword) or die(mysql_error());
 $db = @mysql_select_db($db_name,$connection) or die(mysql_error());
-		
+
+
 if ($_POST[del_user] != "")
 {
 	$sql = "SELECT * FROM $table_name WHERE username = '$_POST[del_user]'";
@@ -229,25 +230,14 @@ if ($_POST[username] == $_SESSION[user_name])
 ?>
 
 <html>
-
 <head>
-
-<meta http-equiv="refresh" content="3; url=adminpage.php">
-
+<!--<meta http-equiv="refresh" content="3; url=adminpage.php">-->
 <title>Modify User</title>
-
 </head>
-
-
-
 <body>
-
-
-
+<?php echo "$_POST[username] ".$_POST[username];
+?>
 </body>
-
-
-
 </html>
 
 
diff --git a/admin/modifyuser.php b/admin/modifyuser.php
new file mode 100644
index 0000000..4971e15
--- /dev/null
+++ b/admin/modifyuser.php
@@ -0,0 +1,115 @@
+<?php
+//prevents caching
+header("Expires: Sat, 01 Jan 2000 00:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+header("Cache-Control: post-check=0, pre-check=0",false);
+session_cache_limiter();
+session_start();
+
+include ('../config.php');
+include ('../functions.php');
+
+//make connection to dbase
+$connection = @mysql_connect($server, $dbusername, $dbpassword) or die(mysql_error());
+$db = @mysql_select_db($db_name,$connection) or die(mysql_error());
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Language" content="es-ES" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Modificar usuario - La Factoría Verde</title>
+    <link rel="stylesheet" type="text/css" href="estilos.css">
+</head>
+<body>
+<div id="layout">
+  <div id="header"> <img src="../img/lafactoriaverde.gif" alt="La Factoría Verde" />
+    <div style="float: right;">Sesión iniciada como <?php echo $_SESSION[user_name]; ?></div>
+	<?php 
+        $menu_activo='';
+        include('_menu.php'); 
+    ?>	
+  </div>
+  <div id="content">
+<?php
+//check for authority to view this page
+if (allow_access(Administrators) != "yes")
+{
+	echo "<br/><br/><br/><center><p class='error'>No tienes autorización para esta función.</p></center>";
+}
+
+$mod_user = '';
+if (isset($_GET['username'])) {
+	$s_string = $_GET['username'];
+	$explodeit = explode(" ", "$s_string");
+	$c = count($explodeit);
+	if ($c > 1) {
+		for ($i = 0; $i < $c; $i++) {
+			$mod_user = $explodeit[$i] . "+";
+		}
+	}
+	else {
+		$mod_user = $s_string;
+	}
+}
+else {
+	$msg .= "No ha indicado el usuario.<br/>";
+}
+
+if ((mod_user != "") && ($_POST[mod_pass] == "Same as Old"))
+{
+	$sql = "SELECT * FROM $table_name WHERE username = '$mod_user'";
+	$result = @mysql_query($sql,$connection) or die(mysql_error());
+
+	while ($sql = mysql_fetch_object($result))
+	{
+		$pass = $sql -> password;
+		$last = $sql -> last_login;
+	}
+	$sql = "DELETE FROM $table_name WHERE username = '$mod_user'";
+	$result = @mysql_query($sql,$connection) or die(mysql_error());
+
+	$sql = "INSERT INTO $table_name (firstname, lastname, username, password, group1, group2, group3, 
+			pchange, email, redirect, verified, last_login) VALUES ('$_POST[mod_first]', '$_POST[mod_last]', 
+			'$mod_user', '$pass', '$_POST[mod_group1]', '$_POST[mod_group2]', 
+			'$_POST[mod_group3]', '$_POST[mod_chng]', '$_POST[mod_email]', '$_POST[mod_redirect]',
+			'1', '$last')";
+			$result = @mysql_query($sql,$connection) or die(mysql_error());
+	$msg .= "La información del usuario $mod_user ha sido actualizada.<br/>";
+}
+
+if (($mod_user != "") && ($_POST[mod_pass] != "Same as Old"))
+{
+	$sql = "SELECT * FROM $table_name WHERE username = '$mod_user'";
+	$result = @mysql_query($sql,$connection) or die(mysql_error());
+	while ($sql = mysql_fetch_object($result))
+	{
+		$pass = $sql -> password;
+		$last = $sql -> last_login;
+	}
+
+	$sql = "DELETE FROM $table_name WHERE username = '$mod_user'";
+	$result = @mysql_query($sql,$connection) or die(mysql_error());
+	$sql = "INSERT INTO $table_name (firstname, lastname, username, password, group1, group2, group3, 
+			pchange, email, redirect, verified, last_login) VALUES ('$_POST[mod_first]', '$_POST[mod_last]', 
+			'$mod_user', password('$_POST[mod_pass]'), '$_POST[mod_group1]', '$_POST[mod_group2]', 
+			'$_POST[mod_group3]', '$_POST[mod_chng]', '$_POST[mod_email]', '$_POST[mod_redirect]',
+			'1', '$last')";
+
+	$result = @mysql_query($sql,$connection) or die(mysql_error());
+	$msg .= "La información del usuario $mod_user ha sido actualizada.<br/>";
+	
+}
+echo $msg;
+
+?>
+	<br/>
+    <center>
+      <a href="<?php echo "adminpage.php"; ?>">Volver a la lista</a>
+    </center>
+  </div>
+  <div id="footer"> </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/check_login.php b/check_login.php
index 1f3e42f..3d192b1 100644
--- a/check_login.php
+++ b/check_login.php
@@ -1,4 +1,6 @@
 <?php
+require ("config.php");
+
 session_start();
 //check to see if the user already has an open session
 if (($_SESSION[user_name] != "") && ($_SESSION[password] != ""))
@@ -10,11 +12,11 @@ if (($_SESSION[user_name] != "") && ($_SESSION[password] != ""))
 //check to see if cookies have been set previously
 if(($lr_user != "") && ($lr_pass != ""))
 {
-	header("Location:redirect.php");
+	header("Location:$base_dir/redirect.php");
 	exit;
 }
 
 //if neither is true, redirect to login
-	header("Location:login.php");
+	header("Location:$base_dir/login.php");
 ?>
 
diff --git a/estilos.css b/estilos.css
index b3926d1..e0b9751 100644
--- a/estilos.css
+++ b/estilos.css
@@ -142,13 +142,9 @@ input {
 #login {
 	margin-top: 20px;
 	margin-left: 30px;
-	width: 200px;
-	background: url('img/texto-login.gif') 0 0 no-repeat;
-	height: 165px;
-	width: 200px;
 }
+
 	#login h2 {
-		visibility: hidden;
 	}
 	
 	#login p.texto-pass {
@@ -160,6 +156,10 @@ input {
 	  text-indent: -1000em;
 	}
 	
+	form {
+		width: 200px;
+	}
+	
 	form.login-inicio label {
 		line-height: 20px;
 	}
@@ -181,9 +181,6 @@ input {
 		cursor: hand;
 	}
 		
-	form.login-inicio span {
-		visibility: hidden;
-	}
 
 
 #content.inicio {
@@ -193,4 +190,7 @@ input {
 .error {
 	color: #F00;
 	font-weight: bold;
+	font-size: 11px;
+	font-variant:small-caps;
+	line-height: 140%;	
 }
\ No newline at end of file
diff --git a/favorites/edit_links.php b/favorites/edit_links.php
deleted file mode 100644
index 30477c6..0000000
--- a/favorites/edit_links.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-//prevent caching
-header("Expires: Sat, 01 Jan 2000 00:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-header("Cache-Control: post-check=0, pre-check=0",false);
-session_cache_limiter();
-
-//start session
-session_start();
-
-//include config and functions files
-include ("../config.php");
-include ("../functions.php");
-
-//make the connection to the database
-$connection = @mysql_connect($server, $dbusername, $dbpassword) or die(mysql_error());
-$db = @mysql_select_db($db_name,$connection)or die(mysql_error());
-
-//make query to database
-$sql ="SELECT * FROM favorites WHERE username= '$_SESSION[user_name]'";
-$result = @mysql_query($sql,$connection) or die(mysql_error());
-$result1 = @mysql_query($sql,$connection) or die(mysql_error());
-
-?>
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Edit Favorites</title>
-</head>
-
-<body>
-
-<form method="POST" action="edit_links_2.php">
-	<p><font face="Tahoma" size="2"><u><b><font color="#000080">Add a Favorite:</font></b></u><br>
-	Nickname: <br>
-	</font><font face="Tahoma">
-	<input type="text" name="nick" size="20" style="font-family: Tahoma; font-size: 10pt"><br>
-	<font size="2">URL: <br>
-	</font>
-	<input type="text" name="link" size="20" value="http://" style="font-family: Tahoma; font-size: 10pt"></font></p>
-	<p><font face="Tahoma" size="2"><u><b><font color="#000080">Delete a 
-	Favorite:</font></b></u>
-	<br>
-	<select size="1" name="del_fav" style="font-family: Tahoma; font-size: 10pt">
-	<option></option>
-<?php
-while ($sql = mysql_fetch_object($result))
-{
-	$_nickname = $sql -> nickname; 
-	
-	echo "<option value=\"$_nickname\">$_nickname</option>";
-	
-}
-?>	
-	</select></font></p>
-	<p><font face="Tahoma" size="2"><u><font color="#000080"><b>Edit a Favorite:</b></font></u><br>
-	Edit this Favorite:<br>
-	<select size="1" name="this_fav" style="font-family: Tahoma; font-size: 10pt">
-	<option></option>
-<?php
-while ($sql = mysql_fetch_object($result1))
-{
-	$_nick = $sql -> nickname; 
-	
-	echo "<option value=\"$_nick\">$_nick</option>";
-	
-}
-?>
-	</select><br>
-	To this Nickname: <br>
-	</font><font face="Tahoma">
-	<input type="text" name="new_nick" size="20" style="font-family: Tahoma; font-size: 10pt"><br>
-	<font size="2">And this URL: <br>
-	</font>
-	<input type="text" name="new_link" size="20" value="http://" style="font-family: Tahoma; font-size: 10pt"><br>
-	<br>
-	</font>
-	<input type="submit" value="Submit" name="B1" style="font-family: Tahoma; font-size: 10pt"></p>
-</form>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/favorites/edit_links_2.php b/favorites/edit_links_2.php
deleted file mode 100644
index 2104618..0000000
--- a/favorites/edit_links_2.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-//prevent caching
-header("Expires: Sat, 01 Jan 2000 00:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-header("Cache-Control: post-check=0, pre-check=0",false);
-session_cache_limiter();
-
-//start session
-session_start();
-
-//include config and functions files
-include ("../config.php");
-include ("../functions.php");
-
-//make the connection to the database
-$connection = @mysql_connect($server, $dbusername, $dbpassword) or die(mysql_error());
-$db = @mysql_select_db($db_name,$connection)or die(mysql_error());
-
-//make query to database
-$sql ="SELECT * FROM favorites WHERE username= '$_SESSION[user_name]'";
-$result = @mysql_query($sql,$connection) or die(mysql_error());
-
-if ($_POST[nick] != "")
-{
-	//make query to database
-	$sql ="INSERT INTO favorites VALUES ('$_SESSION[user_name]', '$_POST[nick]', '$_POST[link]')";
-	$result = @mysql_query($sql,$connection) or die(mysql_error());
-}
-
-if ($_POST[del_fav] != "")
-{
-	//make query to database
-	$sql ="DELETE FROM favorites WHERE username = '$_SESSION[user_name]' AND nickname = '$_POST[del_fav]'";
-	$result = @mysql_query($sql,$connection) or die(mysql_error());
-}
-
-if ($_POST[this_fav] != "")
-{
-	//make query to database
-	$sql ="DELETE FROM favorites WHERE username = '$_SESSION[user_name]' AND nickname = '$_POST[this_fav]'";
-	$sql2 = "INSERT INTO favorites VALUES ('$_SESSION[user_name]', '$_POST[new_nick]', '$_POST[new_link]')";
-	$result = @mysql_query($sql,$connection) or die(mysql_error());
-	$result2 = @mysql_query($sql2,$connection) or die(mysql_error());
-}
-
-header("Location:links.php");
-
-?>
\ No newline at end of file
diff --git a/favorites/index.htm b/favorites/index.htm
deleted file mode 100644
index c9fb6a4..0000000
--- a/favorites/index.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>New Page 1</title>
-</head>
-
-<body>
-
-<p><iframe name="I1" src="links.php" width="187" height="517">
-Your browser does not support inline frames or is currently configured not to display inline frames.
-</iframe></p>
-
-</body>
-
-</html>
diff --git a/favorites/links.php b/favorites/links.php
deleted file mode 100644
index 7470c9a..0000000
--- a/favorites/links.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-//start session
-session_start();
-
-//include config and functions files
-include ("../config.php");
-include ("../functions.php");
-
-echo "<p><b><font face=\"Tahoma\" size=\"2\"><a href=\"edit_links.php\">Add/Change Favorites</a></font></b></p>";
-
-//make the connection to the database
-$connection = @mysql_connect($server, $dbusername, $dbpassword) or die(mysql_error());
-$db = @mysql_select_db($db_name,$connection)or die(mysql_error());
-
-//make query to database
-$sql ="SELECT * FROM favorites WHERE username= '$_SESSION[user_name]'";
-$result = @mysql_query($sql,$connection) or die(mysql_error());
-
-while ($sql = mysql_fetch_object($result))
-{
-	$_link = $sql -> link;
-	$_nickname = $sql -> nickname; 
-	echo "<font face=\"Tahoma\" size=\"2\"><a target=\"_blank\" href=\"$_link\">$_nickname</a></font><br>";
-}
-
-?>
diff --git a/favorites/make_favorites.php b/favorites/make_favorites.php
deleted file mode 100644
index 4b03caa..0000000
--- a/favorites/make_favorites.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-//prevent caching
-header("Expires: Sat, 01 Jan 2000 00:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-header("Cache-Control: post-check=0, pre-check=0",false);
-session_cache_limiter();
-
-//start session
-session_start();
-
-//include config and functions files
-include ("../config.php");
-include ("../functions.php");
-
-//make the connection to the database
-$connection = @mysql_connect($server, $dbusername, $dbpassword) or die(mysql_error());
-$db = @mysql_select_db($db_name,$connection)or die(mysql_error());
-
-//make query to database
-$sql ="CREATE TABLE IF NOT EXISTS favorites
-(
-	username	VARCHAR(20),
-	nickname	VARCHAR(20),
-	link		VARCHAR(100)
-)";
-$result = @mysql_query($sql,$connection) or die(mysql_error());
-
-if ($result)
-{
-	echo "<font face=\"Tahoma\" size=\"2\">Your Favorites table has been created.</font><br>";
-}
-
-?>
-<html>
-<meta http-equiv="refresh" content="3; url=index.htm">
-</html>
\ No newline at end of file
diff --git a/img/titulo-clientes.gif b/img/titulo-clientes.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a3cdb64b0065bf77800627ced2c40470e8505fa
GIT binary patch
literal 399
zcmZ?wbhEHbv}fRBIKsdnA|mql&!5AG4|jHS`1$!MD=RxVIJ|%NE+;#C*|KF1A3Uh4
zs=9RXqM@PT)-79NV`FDbpUyxEQ2fcl2vV;DB0zRBu>Mz2=u63*m$7P9zk-Fw#&adP
zN{$C)8k7G!Oi`G?U?SANAV@P|4pZ|aZ<iC1ybX>F+zm`^*BBN^9aE}cZ1mBpaPz!u
zSm-c4^Y&ehqy-Ibt2s-Ujcl0t*jdyHRpSaOLOWHW7(ILAlR_9LDl@WYt9PqRQz{JQ
zW?|t~isIs`RCZQgwqg}SZHH4uPyUAf#QZ3JM($}FXNKjoC1iE^sV$D*H+yvwQ|pEq
zMVFP+4|lmRur61+uymGc6a$;(o@2LES&c0AC{O0AJ!jR_`K+;I)k_8yjcL3S7O=7M
zX}s9xFqcU$@`6Rg<3&nL3<3%r0bzj+k~XX?F(QnP;>Wup*mxFrDjYs=Sk)kziGz{B
F8UXwdf7Sp1

literal 0
HcmV?d00001

diff --git a/img/titulo-contrasena.gif b/img/titulo-contrasena.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14c5c87199ff3c776facaeb6ac34a536142aa4f3
GIT binary patch
literal 463
zcmZ?wbhEHb^km>=IKsdnA|mql&!5AG4|jHSI5;@?`S~d;E9Ycq&zL^_;e!WTw`_U;
z?wz5bVO3StrHdD1V`G;sTgE^NQ2fcl2vV;DB0zRBu>Mz2=u63*m$7P{X0S+(&T(Ew
ziI0MBP8<GrU^pUJ;E>dPVBrJ_mib0*&SDNT1gzV66=oE1vNT2{$a2dqHh8DTp)-e}
zC9;IAWjou!Z6Xc*a*VNzTuRnF42-Ni%(=`Njm$355q3_YTuddt%msODter|$VQRIi
z%#2D!t<4<<3@enEEm+UFHij`nIjN?0ixL+%r}{FLjT>fmY}>zKWh*BW_eqveMvDeU
zf$WP(QyaY&vR$p-RHt;jr?n?{{qYW_6;nAlA5G=qnin&B{Z7u)3|2fU3a*Pd_?X%Q
z9!9igFl-Gtd#bQd;m|ccC*=<ZAB1jb=nME!#-n}l7^9t2gN%>Kj#Mrtm-1yL4V)Ji
zFo-b=2+4R9c^p{gCoSCR9FU;eXj7rkk+~slZj&xoje_XZ9&c4fc0QHl1?oQLp~d@d
TywrLy;p)nOORGW!nHa1A;f0tB

literal 0
HcmV?d00001

diff --git a/img/titulo-usuario.gif b/img/titulo-usuario.gif
new file mode 100644
index 0000000000000000000000000000000000000000..608cf1e0a4e6d8100220724ba8bbb4f0e6f9da73
GIT binary patch
literal 359
zcmZ?wbhEHbG-lvsIKsdnA|mql&mTWOzs`;h2M344hYuSX8Y(L*U%Gg4>y|B5RaMKD
zEqnj&U2JS@PImT;>C+!Rc)&mkQ2fcl2vV;DB0zRBus%^x=u63*mr<qG=ONOfb-u`;
z!%5*njs7hQ*#`?Gc=#4IGA8WkoV9q_M#G{vGmb6h<T&wGh|xvi<L#$z%?@j%#q3>J
z)s+J{^5@1mFfb`7d`)9i&U1`!VkpevV&H05iK#4Q^-j(4FRAI`<w@x<uS{2+;Ka_&
z$f(;et%rvtD`z=ledmHc<z%JaaE94DQx|dwWah{5GKS2{X;dra=3DN~%*UQ&&&{yR
zCz<)+DF%VLo$I)-wDZ=p6fgHnTAqJn<Mm#T^DLE_-kl5y@0@x3ELZ}#b{uPMXtHy=
Pp>1KX@UWaB1A{dHZcB0w

literal 0
HcmV?d00001

diff --git a/index.php b/index.php
index 519761a..1fcda8e 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php
-	header("Location:check_login.php");
+<?php 
+	require ("config.php");
+	header("Location:$base_dir/check_login.php");
 ?>
-
diff --git a/login.php b/login.php
index 45d60f4..e54eccb 100644
--- a/login.php
+++ b/login.php
@@ -24,12 +24,18 @@
             </ul>
         </div>
         <div id="login">
-          <h2>Acceso de clientes</h2>        
+          <h2><img src="img/titulo-clientes.gif" alt="Acceso de clientes" /></h2>
+		<?php
+            if (($_GET["errorlogin"] != "")) {
+        ?>
+                    <p class="error">Por favor, vuelve a introducir tus datos de acceso otra vez...</p>
+        <?php } ?>            
+
           <form class="login-inicio" method="post" action="redirect.php">
           	<fieldset>
-          	<label for="username"><span>Usuario:</span></label>
+          	<label for="username"><img src="img/titulo-usuario.gif" alt="Usuario:" /></label>
             <input class="campo" type="text" name="username" size="25" maxlength="25" />
-          	<label for="password"><span>Contraseña:</span></label>
+          	<label for="password"><img src="img/titulo-contrasena.gif" alt="Contraseña:" /></label>
             <input class="campo" type="password" name="password" size="25" maxlength="25" />
         
             <!--<input type="checkbox" name="remember" value="Yes" />-->
@@ -44,11 +50,6 @@
           <a href="emailpass.html"><img src="img/texto-pincha-aqui.gif" alt="Pincha aqui" /></a>
         </div>
         <div id="modulos">
-<?php
-	if (($_GET["errorlogin"] != "")) {
-?>
-        	<p class="error">Por favor, vuelve a introducir tus datos de acceso otra vez...</p>
-<?php } ?>            
         </div>    
     </div>
     <div id="content" class="inicio"></div>
diff --git a/logs/index.php b/logs/index.php
index e6451dc..f4cb44e 100644
--- a/logs/index.php
+++ b/logs/index.php
@@ -1,34 +1,27 @@
-<?php
-
-session_start();
-
-include("../config.php");
-include("../functions.php");
-
-if (allow_access(Administrators) != "yes")
-{
-	header("Location:../login.html");
-}
-
-?>
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Log Viewer</title>
-</head>
-
-<frameset cols="170,*">
-	<frame name="contents" target="main" src="log.html">
-	<frame name="main" src="log.php">
-	<noframes>
-	<body>
-
-	<p>This page uses frames, but your browser doesn't support them.</p>
-
-	</body>
-	</noframes>
-</frameset>
-
-</html>
+<?php
+session_start();
+include("../config.php");
+include("../functions.php");
+if (allow_access(Administrators) != "yes")
+{
+	header("Location:$base_dir/index.php");
+}
+?>
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<title>Registro de accesos - La Factor�a Verde</title>
+</head>
+
+<frameset cols="170,*">
+	<frame name="contents" target="main" src="log.html">
+	<frame name="main" src="log.php">
+	<noframes>
+	<body>
+	<p>This page uses frames, but your browser doesn't support them.</p>
+	</body>
+	</noframes>
+</frameset>
+</html>
+
