diff --git a/activate.html b/activate.html deleted file mode 100644 index b00abb3..0000000 --- a/activate.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Activar cuenta - - - - -

Activar tu cuenta

- -
-

Usuario:

- -

Contraseña:

- -

-
- - \ No newline at end of file diff --git a/admin/changeuser.php b/admin/changeuser.php index 2a8634a..4e86319 100644 --- a/admin/changeuser.php +++ b/admin/changeuser.php @@ -42,7 +42,7 @@ $db = @mysql_select_db($db_name,$connection) ?>
-

Modificación de usuario

+

Modificación del usuario ''


Contraseña: - + E-Mail: - + + Grupo: - - + + +   diff --git a/admin/estilos.css b/admin/estilos.css index fdc4c40..c8fc7b9 100644 --- a/admin/estilos.css +++ b/admin/estilos.css @@ -15,6 +15,20 @@ body { text-align: center; } +h1 { + font-size: 140%; + color: #3fa116; + margin: 2px 0 8px 0px; +} + +p { + margin: 6px 0; +} + +form { + margin: 6px 0; +} + a:link { color: #718ABE; text-decoration: none; diff --git a/admin/mail_all.php b/admin/mail_all.php index 387464e..8239fec 100644 --- a/admin/mail_all.php +++ b/admin/mail_all.php @@ -21,16 +21,19 @@ ?>
+

E-mail masivo

+

Rellenando este formulario, podrá enviar un correo electrónico a todos los usuarios de La Factoría Verde.

-

Asunto:
-
- Remitente:
-
- Mensaje:
+

+ Remitente:
+

+ + Asunto:
+

+ Mensaje:

-

+

+

-

Dar de alta un nuevo usuario

+

Dar de alta un nuevo usuario


"> @@ -117,7 +117,7 @@ $result = @mysql_query($sql,$connection) or die(mysql_error()); - + diff --git a/banned.html b/banned.html index ba7b418..64ed82e 100644 --- a/banned.html +++ b/banned.html @@ -6,10 +6,10 @@ - No autorizado + No autorizado - La Factoría Verde -

TU CUENTA ESTÁ BANEADA

+

TU CUENTA ESTÁ SUSPENDIDA

diff --git a/check_login.php b/check_login.php index 3d192b1..8f68145 100644 --- a/check_login.php +++ b/check_login.php @@ -5,7 +5,7 @@ session_start(); //check to see if the user already has an open session if (($_SESSION[user_name] != "") && ($_SESSION[password] != "")) { - header("Location:$_SESSION[redirect]"); + header("Location:$base_dir/$_SESSION[redirect]"); exit; } diff --git a/estilos.css b/estilos.css index e0b9751..9591bf3 100644 --- a/estilos.css +++ b/estilos.css @@ -71,11 +71,12 @@ input { left: 0; top: 32px; width: 762px; - height: 518px; + height: 518px; + background-color: #b6cfa0; } #menu { - margin-top: 100px; + margin-top: 88px; margin-left: 30px; width: 200px; } @@ -129,6 +130,9 @@ input { } +#datos-cliente { +} + #modulos { margin-top: 8px; margin-left: 30px; @@ -140,7 +144,7 @@ input { } #login { - margin-top: 20px; + margin-top: 10px; margin-left: 30px; } @@ -184,7 +188,7 @@ input { #content.inicio { - background: #fff url('img/fondo-inicio.jpg') no-repeat; + background: url('img/fondo-inicio.jpg') no-repeat; } .error { @@ -193,4 +197,11 @@ input { font-size: 11px; font-variant:small-caps; line-height: 140%; +} + +#eltiempo { + float: right; + position: absolute; + right: 10px; + bottom: 10px; } \ No newline at end of file diff --git a/install/install.html b/install/install.html index 6cd15a5..f064245 100644 --- a/install/install.html +++ b/install/install.html @@ -1,148 +1,296 @@ - - - - - -Login - Redirect Installation - - - - -

Por ejemplo: /jardines/casonadesuesa
 
- - - - - - - - - - -
- - -
- - -
- - - - - - - - - - -
-

Database Name:
-

-

Server:
- -

-

Database Username:
-

-

Database Password:
-

-

Installation - Directory:
-

-

Administrator's - Email:
-
- Time Zone:
-

- 		-

Domain Name:
- www.. - - if other than that listed: -

-

Verify New User's - Through Email?
-

-

Default URL:
-

-

Minimum Password - Length:
-

-

Maximum Password - Length:
-

-

Log Logins?
-

-

Number of Groups:
-

- -  
-
-

 

- - - - + + + + + + + + + + +Login - Redirect Installation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + +
+ +

Database Name:
+ +

+ +

Server:
+ + + +

+ +

Database Username:
+ +

+ +

Database Password:
+ +

+ +

Installation + + Directory:
+ +

+ +

Administrator's + + Email:
+ +
+ + Time Zone:
+ +

+ + 		+ +

Domain Name:
+ + www.. + + - if other than that listed: + +

+ +

Verify New User's + + Through Email?
+ +

+ +

Default URL:
+ +

+ +

Minimum Password + + Length:
+ +

+ +

Maximum Password + + Length:
+ +

+ +

Log Logins?
+ +

+ +

Number of Groups:
+ +

+ +   + +
+ +
+ +

 

+ + + + + + + + + diff --git a/install/install_1.php b/install/install_1.php index 51d562c..0f0de6c 100644 --- a/install/install_1.php +++ b/install/install_1.php @@ -1,70 +1,139 @@ -"; -include ('header.html'); - -if (!$_POST[dbase_name] || !$_POST[dbase_server] || !$_POST[dbase_username] || !$_POST[dbase_password] || - !$_POST[install_dir] || !$_POST[time_zone] || - !$_POST[default_url] || !$_POST[min_pass_len] || !$_POST[max_pass_len] || !$_POST[dom_name] || !$_POST[admin_email]) -{ - echo "

You must complete all of the fields, please Go Back and complete all of the fields.

"; - exit; -} - - -?> - - - - - - - -Login - Redirect Installation - - - - -Enter the names of your Groups:
-(Do not use Administrators or Users as a Group Name as there are pre-configured groups)
-
-Group $i

"; -$i++; -} -?> - -

-
- - - - +"; + +include ('header.html'); + + + +if (!$_POST[dbase_name] || !$_POST[dbase_server] || !$_POST[dbase_username] || !$_POST[dbase_password] || + + !$_POST[install_dir] || !$_POST[time_zone] || + + !$_POST[default_url] || !$_POST[min_pass_len] || !$_POST[max_pass_len] || !$_POST[dom_name] || !$_POST[admin_email]) + +{ + + echo "

You must complete all of the fields, please Go Back and complete all of the fields.

"; + + exit; + +} + + + + + +?> + + + + + + + + + + + + + + + +Login - Redirect Installation + + + + + + + + + +Enter the names of your Groups:
+ +(Do not use Administrators or Users as a Group Name as there are pre-configured groups)
+ +
+ +Group $i

"; + +$i++; + +} + +?> + + + +

+ +
+ + + + + + + + + \ No newline at end of file diff --git a/install/install_2.php b/install/install_2.php index f3b84ab..6f1f484 100644 --- a/install/install_2.php +++ b/install/install_2.php @@ -1,233 +1,466 @@ -"; - -include ('header.html'); - -$group_array = array(); - -$i = 1; -while ($i <= $_SESSION[group_number]) -{ - $group = "group$i"; - array_push($group_array, "$_POST[$group]"); - $i++; -} - -$i = 1; - -//test connection to dbase verifing dbase name, server, username and password - -$connection = @mysql_connect($_SESSION[dbase_server], $_SESSION[dbase_username], $_SESSION[dbase_password]) - or die(mysql_error()); - -$db = @mysql_select_db($_SESSION[dbase_name],$connection) - or die(mysql_error()); - -//create a message to be displayed at the end of the installation -if ($db) -{ - echo "Connection to Database $_SESSION[dbase_name] Successful.
"; -}else{ - echo "

There was an error connecting to the database.

"; - echo "

Please go back and check your Database information.

"; - exit; -} - -//create a table in that dbase -$sql =" -CREATE TABLE IF NOT EXISTS $_SESSION[table_name] -( - firstname VARCHAR(20), - lastname VARCHAR(20), - username VARCHAR(20), - password VARCHAR(50), - group1 VARCHAR(20), - group2 VARCHAR(20), - group3 VARCHAR(20), - pchange VARCHAR(1), - email VARCHAR(100), - redirect VARCHAR(100), - verified VARCHAR(1), - last_login DATE -)"; - -$result = @mysql_query($sql,$connection) - or die(mysql_error()); - -if ($result) -{ - echo "Table $_SESSION[table_name] has been created.
"; -}else{ - echo "

There was an error creating the table.

"; - echo "

Please go back and check your information.

"; - exit; -} - -//create a table in that dbase -$sql_log =" -CREATE TABLE IF NOT EXISTS log_login -( - username VARCHAR(20), - date VARCHAR(20), - time VARCHAR(20), - ip_addr VARCHAR(20), - oper_sys VARCHAR(20), - brow VARCHAR(20) -) -"; - -$result_log = @mysql_query($sql_log,$connection) - or die(mysql_error()); - -if ($result_log) -{ - echo "Table log_login has been created.
"; -}else{ - echo "

There was an error creating the table.

"; - echo "

Please go back and check your information.

"; - exit; -} - -//create a table in that dbase -$sql_ban =" -CREATE TABLE IF NOT EXISTS banned -( - no_access VARCHAR(30), - type VARCHAR(10) -) -"; - -$result_ban = @mysql_query($sql_ban,$connection) - or die(mysql_error()); - -if ($result_ban) -{ - echo "Table banned has been created.
"; -}else{ - echo "

There was an error creating the table.

"; - echo "

Please go back and check your information.

"; - exit; -} - -//create a table in that dbase -$sql_trash =" -CREATE TABLE IF NOT EXISTS trash -( - firstname VARCHAR(20), - lastname VARCHAR(20), - username VARCHAR(20), - password VARCHAR(50), - group1 VARCHAR(20), - group2 VARCHAR(20), - group3 VARCHAR(20), - pchange VARCHAR(1), - email VARCHAR(100), - redirect VARCHAR(100), - verified VARCHAR(1), - last_login DATE, - del_date DATE - ) -"; - -$result_trash = @mysql_query($sql_trash,$connection) - or die(mysql_error()); - -if ($result_trash) -{ - echo "Table trash has been created.
"; -}else{ - echo "

There was an error creating the table.

"; - echo "

Please go back and check your information.

"; - exit; -} - - -?> - - - - - - -Login - Redirect Installation - - - - - - - - -
- -"; - -include ('create_admin.php'); - -?>
- - - - - - - +"; + + + +include ('header.html'); + + + +$group_array = array(); + + + +$i = 1; + +while ($i <= $_SESSION[group_number]) + +{ + + $group = "group$i"; + + array_push($group_array, "$_POST[$group]"); + + $i++; + +} + + + +$i = 1; + + + +//test connection to dbase verifing dbase name, server, username and password + + + +$connection = @mysql_connect($_SESSION[dbase_server], $_SESSION[dbase_username], $_SESSION[dbase_password]) + + or die(mysql_error()); + + + +$db = @mysql_select_db($_SESSION[dbase_name],$connection) + + or die(mysql_error()); + + + +//create a message to be displayed at the end of the installation + +if ($db) + +{ + + echo "Connection to Database $_SESSION[dbase_name] Successful.
"; + +}else{ + + echo "

There was an error connecting to the database.

"; + + echo "

Please go back and check your Database information.

"; + + exit; + +} + + + +//create a table in that dbase + +$sql =" + +CREATE TABLE IF NOT EXISTS $_SESSION[table_name] + +( + + firstname VARCHAR(20), + + lastname VARCHAR(20), + + username VARCHAR(20), + + password VARCHAR(50), + + group1 VARCHAR(20), + + group2 VARCHAR(20), + + group3 VARCHAR(20), + + pchange VARCHAR(1), + + email VARCHAR(100), + + redirect VARCHAR(100), + + verified VARCHAR(1), + + last_login DATE + +)"; + + + +$result = @mysql_query($sql,$connection) + + or die(mysql_error()); + + + +if ($result) + +{ + + echo "Table $_SESSION[table_name] has been created.
"; + +}else{ + + echo "

There was an error creating the table.

"; + + echo "

Please go back and check your information.

"; + + exit; + +} + + + +//create a table in that dbase + +$sql_log =" + +CREATE TABLE IF NOT EXISTS log_login + +( + + username VARCHAR(20), + + date VARCHAR(20), + + time VARCHAR(20), + + ip_addr VARCHAR(20), + + oper_sys VARCHAR(20), + + brow VARCHAR(20) + +) + +"; + + + +$result_log = @mysql_query($sql_log,$connection) + + or die(mysql_error()); + + + +if ($result_log) + +{ + + echo "Table log_login has been created.
"; + +}else{ + + echo "

There was an error creating the table.

"; + + echo "

Please go back and check your information.

"; + + exit; + +} + + + +//create a table in that dbase + +$sql_ban =" + +CREATE TABLE IF NOT EXISTS banned + +( + + no_access VARCHAR(30), + + type VARCHAR(10) + +) + +"; + + + +$result_ban = @mysql_query($sql_ban,$connection) + + or die(mysql_error()); + + + +if ($result_ban) + +{ + + echo "Table banned has been created.
"; + +}else{ + + echo "

There was an error creating the table.

"; + + echo "

Please go back and check your information.

"; + + exit; + +} + + + +//create a table in that dbase + +$sql_trash =" + +CREATE TABLE IF NOT EXISTS trash + +( + + firstname VARCHAR(20), + + lastname VARCHAR(20), + + username VARCHAR(20), + + password VARCHAR(50), + + group1 VARCHAR(20), + + group2 VARCHAR(20), + + group3 VARCHAR(20), + + pchange VARCHAR(1), + + email VARCHAR(100), + + redirect VARCHAR(100), + + verified VARCHAR(1), + + last_login DATE, + + del_date DATE + + ) + +"; + + + +$result_trash = @mysql_query($sql_trash,$connection) + + or die(mysql_error()); + + + +if ($result_trash) + +{ + + echo "Table trash has been created.
"; + +}else{ + + echo "

There was an error creating the table.

"; + + echo "

Please go back and check your information.

"; + + exit; + +} + + + + + +?> + + + + + + + + + + + + + +Login - Redirect Installation + + + + + + + + + + + + + + + + + +
+ + + +"; + + + +include ('create_admin.php'); + + + +?>
+ + + + + + + + + + + + + + + diff --git a/install/install_3.php b/install/install_3.php index 5f2b8ee..8cf89bb 100644 --- a/install/install_3.php +++ b/install/install_3.php @@ -1,81 +1,161 @@ -You must complete all of the fields, please Go Back and complete all of the fields.

"; - exit; -} - - - -$pass_len = password_check($_SESSION[min_pass_len], $_SESSION[max_pass_len], $_POST[password]); -if ($pass_len == "no") -{ - echo "

You must use a password between $_SESSION[min_pass_len] and $_SESSION[max_pass_len] characters in length, please Go Back and try again.

"; - exit; -} - -//make connection to dbase -$connection = @mysql_connect($_SESSION[dbase_server], $_SESSION[dbase_username], $_SESSION[dbase_password]) - or die(mysql_error()); - -$db = @mysql_select_db($_SESSION[dbase_name],$connection) - or die(mysql_error()); - -$check_name = "SELECT * FROM $_SESSION[table_name] WHERE username = '$_POST[user_name]'"; -$name_result = @mysql_query($check_name,$connection) or die(mysql_error()); - -//get the number of rows in the result set -$num = mysql_num_rows($name_result); - -if ($num != 0) -{ - echo "

That username already exists. Please Go Back and enter a different username.

"; - exit; -} - -$date = last_login(); - -//enter information into table -$sql = "INSERT INTO $_SESSION[table_name] VALUES - ('$_POST[first_name]', '$_POST[last_name]', '$_POST[user_name]', - password('$_POST[password]'), 'Administrators', '', '', '0', '$_SESSION[admin_email]', - '$_POST[redirect_to]', '1', '$date')"; - -$result = @mysql_query($sql,$connection) or die(mysql_error()); - -if($result) -{ -?> - - - - - -Login - Redirect Installation - - - -The Administrators Account has been Successfully Created.

"; - echo "

The last step is to create a file named config.php.
"; - echo "Copy and paste the below into this file and upload to $_SESSION[install_dir].

"; - echo "

"; - echo "

For a sample of the header of each secure page, please Click Here

"; - echo "

Should you have any difficulties, please visit the Help Forum:"; - echo "
MPDolan.com Help Forum

"; - echo "

Please login as with the Adminstrator's Account to complete testing."; - echo "
Login Now


"; -} - - -?> - +You must complete all of the fields, please Go Back and complete all of the fields.

"; + + exit; + +} + + + + + + + +$pass_len = password_check($_SESSION[min_pass_len], $_SESSION[max_pass_len], $_POST[password]); + +if ($pass_len == "no") + +{ + + echo "

You must use a password between $_SESSION[min_pass_len] and $_SESSION[max_pass_len] characters in length, please Go Back and try again.

"; + + exit; + +} + + + +//make connection to dbase + +$connection = @mysql_connect($_SESSION[dbase_server], $_SESSION[dbase_username], $_SESSION[dbase_password]) + + or die(mysql_error()); + + + +$db = @mysql_select_db($_SESSION[dbase_name],$connection) + + or die(mysql_error()); + + + +$check_name = "SELECT * FROM $_SESSION[table_name] WHERE username = '$_POST[user_name]'"; + +$name_result = @mysql_query($check_name,$connection) or die(mysql_error()); + + + +//get the number of rows in the result set + +$num = mysql_num_rows($name_result); + + + +if ($num != 0) + +{ + + echo "

That username already exists. Please Go Back and enter a different username.

"; + + exit; + +} + + + +$date = last_login(); + + + +//enter information into table + +$sql = "INSERT INTO $_SESSION[table_name] VALUES + + ('$_POST[first_name]', '$_POST[last_name]', '$_POST[user_name]', + + password('$_POST[password]'), 'Administrators', '', '', '0', '$_SESSION[admin_email]', + + '$_POST[redirect_to]', '1', '$date')"; + + + +$result = @mysql_query($sql,$connection) or die(mysql_error()); + + + +if($result) + +{ + +?> + + + + + + + + + + + +Login - Redirect Installation + + + + + + + +The Administrators Account has been Successfully Created.

"; + + echo "

The last step is to create a file named config.php.
"; + + echo "Copy and paste the below into this file and upload to $_SESSION[install_dir].

"; + + echo "

"; + + echo "

For a sample of the header of each secure page, please Click Here

"; + + echo "

Should you have any difficulties, please visit the Help Forum:"; + + echo "
MPDolan.com Help Forum

"; + + echo "

Please login as with the Adminstrator's Account to complete testing."; + + echo "
Login Now


"; + +} + + + + + +?> + + + \ No newline at end of file diff --git a/style.css b/install/style.css similarity index 100% rename from style.css rename to install/style.css diff --git a/jardines/plantilla/index.html b/jardines/plantilla/index.html new file mode 100644 index 0000000..4040f29 --- /dev/null +++ b/jardines/plantilla/index.html @@ -0,0 +1,44 @@ + + + + + + Jardín Pedreña - La Factoría Verde + + + + +
+ +
+ + +
+
+ lkajlka sjdaldjaljdlajsdlj +
+ +
+ + diff --git a/login.php b/login.php index e54eccb..1cf6128 100644 --- a/login.php +++ b/login.php @@ -49,7 +49,8 @@

¿Olvidaste tu contraseña?

Pincha aqui
-
+
+
diff --git a/logs/log.html b/logs/log.html index b22b888..69f0876 100644 --- a/logs/log.html +++ b/logs/log.html @@ -22,20 +22,6 @@

-


-
-
-
-ARIN WhoIs

-

-
- -

Buscar:
-
- -
-

-


diff --git a/pass_change.html b/pass_change.html index a99bf10..193d415 100644 --- a/pass_change.html +++ b/pass_change.html @@ -10,7 +10,7 @@ { if (theForm.p_word.value != theForm.password2.value) { - alert("The two passwords are not the same."); + alert("Las dos contraseñas introducidas no coinciden. Revíselo."); theForm.password2.focus(); return (false); } @@ -29,9 +29,8 @@ -

-

Cambio de contraseña

+

Cambio de la contraseña

+

Nueva contraseña:
diff --git a/redirect.php b/redirect.php index e16d276..8cd3b62 100644 --- a/redirect.php +++ b/redirect.php @@ -93,7 +93,7 @@ if (($_SESSION[redirect] != "$base_dir/login.php") && ($log_login == "1")) } //redirects the user -header("Location:$_SESSION[redirect]"); +header("Location:$base_dir/$_SESSION[redirect]"); ?> diff --git a/register.html b/register.html deleted file mode 100644 index 1444eb4..0000000 --- a/register.html +++ /dev/null @@ -1,133 +0,0 @@ - - - - -Página de registro - - - - -

Registro

- -

Nombre:
- - -

-

Apellidos:
- - -
- Usuario:
- -

-

Contraseña:
- - -
- Confirmar la contraseña:
- -

-

Dirección de e-mail:
- - -

-

- -

- - - diff --git a/register.php b/register.php deleted file mode 100644 index 6052112..0000000 --- a/register.php +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - -Registration - - - - - - - - -Sorry, that username already exists.

"; -echo "

Try Another Username.

"; -exit; - -}else{ -$sql = "INSERT INTO $table_name VALUES -('$_POST[firstname]', '$_POST[lastname]', '$_POST[username]', password('$_POST[password]'), 'Users', '', '', '$pchange', -'$_POST[email]', '$default_url', '$verify', '')"; - -$result = @mysql_query($sql,$connection) or die(mysql_error()); -} - -//checks to see if the user needs to verify their email address before accessing the site -if ($verify == "0") -{ - $mailheaders = "From: www$domain\n"; - $mailheaders .= "Your account has been created.\n"; - $mailheaders .= "Please activate your account now by visiting this page:\n"; - $mailheaders .= "$base_dir/activate.html\n"; - - - $to = "$_POST[email]"; - $subject = "Please activate your account"; - -mail($to, $subject, $mailheaders, "From: No Reply <$adminemail>\n"); - -}else{ - header('Location:login.html'); -} - - - -?> - - - -Add a User - - -

Please check your email to activate your account.

- - \ No newline at end of file