Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1246)
+++ branches/2.8.x/CHANGELOG (revision 1247)
@@ -12,6 +12,8 @@
------------------------------------- 2.8.1 -------------------------------------
14-Jan-2010 Dietmar Woellbrink (Luisehahne)
+# Ticket #911 5. continue to fix CSS-errors in WB backend
+14-Jan-2010 Dietmar Woellbrink (Luisehahne)
# Ticket #911 4. continue to fix CSS-errors in WB backend
14-Jan-2010 Dietmar Woellbrink (Luisehahne)
# Ticket #911 3. continue to fix CSS-errors in WB backend
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1246)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1247)
@@ -71,6 +71,6 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.1');
-if(!defined('REVISION')) define('REVISION', '1246');
+if(!defined('REVISION')) define('REVISION', '1247');
?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/login/forgot/index.php
===================================================================
--- branches/2.8.x/wb/admin/login/forgot/index.php (revision 1246)
+++ branches/2.8.x/wb/admin/login/forgot/index.php (revision 1247)
@@ -1,171 +1,206 @@
-
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-// Include the configuration file
-require('../../../config.php');
-// Include the language file
-require(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php');
-// Include the database class file and initiate an object
-require(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Start', 'start', false, false);
-$database = new database();
-
-// Get the website title
-$results = $database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name = 'title'");
-$results = $results->fetchRow();
-$website_title = $results['value'];
-
-// Check if the user has already submitted the form, otherwise show it
-if(isset($_POST['email']) AND $_POST['email'] != "") {
-
- $email = htmlspecialchars($_POST['email'],ENT_QUOTES);
-
- // Check if the email exists in the database
- $query = "SELECT user_id,username,display_name,email,last_reset,password FROM ".TABLE_PREFIX."users WHERE email = '".$admin->add_slashes($_POST['email'])."'";
- $results = $database->query($query);
- if($results->numRows() > 0) {
-
- // Get the id, username, email, and last_reset from the above db query
- $results_array = $results->fetchRow();
-
- // Check if the password has been reset in the last 2 hours
- $last_reset = $results_array['last_reset'];
- $time_diff = time()-$last_reset; // Time since last reset in seconds
- $time_diff = $time_diff/60/60; // Time since last reset in hours
- if($time_diff < 2) {
-
- // Tell the user that their password cannot be reset more than once per hour
- $message = $MESSAGE['FORGOT_PASS']['ALREADY_RESET'];
-
- } else {
-
- $old_pass = $results_array['password'];
-
- // Generate a random password then update the database with it
- $new_pass = '';
- $salt = "abchefghjkmnpqrstuvwxyz0123456789";
- srand((double)microtime()*1000000);
- $i = 0;
- while ($i <= 7) {
- $num = rand() % 33;
- $tmp = substr($salt, $num, 1);
- $new_pass = $new_pass . $tmp;
- $i++;
- }
-
- $database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".time()."' WHERE user_id = '".$results_array['user_id']."'");
-
- if($database->is_error()) {
- // Error updating database
- $message = $database->get_error();
- } else {
- // Setup email to send
- $mail_to = $email;
- $mail_subject = $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'];
-
- // Replace placeholders from language variable with values
- $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}');
- $replace = array($results_array['display_name'], WEBSITE_TITLE, $results_array['username'], $new_pass);
- $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO']);
-
- // Try sending the email
- if($admin->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) {
- $message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET'];
- $display_form = false;
- } else {
- $database->query("UPDATE ".TABLE_PREFIX."users SET password = '".$old_pass."' WHERE user_id = '".$results_array['user_id']."'");
- $message = $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'];
- }
- }
-
- }
-
- } else {
- // Email doesn't exist, so tell the user
- $message = $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'];
- // and delete the wrong Email
- $email = '';
- }
-
-} else {
- $email = '';
-}
-
-if(!isset($message)) {
- $message = $MESSAGE['FORGOT_PASS']['NO_DATA'];
- $message_color = '000000';
-} else {
- $message_color = 'FF0000';
-}
-
-// Setup the template
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'login_forgot.htt');
-$template->set_block('page', 'main_block', 'main');
-if(defined('FRONTEND')) {
- $template->set_var('ACTION_URL', 'forgot.php');
-} else {
- $template->set_var('ACTION_URL', 'index.php');
-}
-$template->set_var('EMAIL', $email);
-
-if(isset($display_form)) {
- $template->set_var('DISPLAY_FORM', 'none');
-}
-
-$template->set_var(array(
- 'SECTION_FORGOT' => $MENU['FORGOT'],
- 'MESSAGE_COLOR' => $message_color,
- 'MESSAGE' => $message,
- 'WB_URL' => WB_URL,
- 'ADMIN_URL' => ADMIN_URL,
- 'THEME_URL' => THEME_URL,
- 'LANGUAGE' => strtolower(LANGUAGE),
- 'TEXT_EMAIL' => $TEXT['EMAIL'],
- 'TEXT_SEND_DETAILS' => $TEXT['SEND_DETAILS'],
- 'TEXT_HOME' => $TEXT['HOME'],
- 'TEXT_NEED_TO_LOGIN' => $TEXT['NEED_TO_LOGIN']
- )
- );
-
-if(defined('FRONTEND')) {
- $template->set_var('LOGIN_URL', WB_URL.'/account/login.php');
-} else {
- $template->set_var('LOGIN_URL', ADMIN_URL);
-}
-$template->set_var('INTERFACE_URL', ADMIN_URL.'/interface');
-
-if(defined('DEFAULT_CHARSET')) {
- $charset=DEFAULT_CHARSET;
-} else {
- $charset='utf-8';
-}
-
-$template->set_var('CHARSET', $charset);
-
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
+
+* Copyright (C) 2009, Website Baker Org. e.V.
+* http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+* About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+* LICENSE INFORMATION
+*
+* WebsiteBaker is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+****************************************************************************
+*
+*****************************************************************************
+* WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ * @category admin
+ * @package login
+ * @author Ryan Djurovich
+ * @copyright 2004-2009, Ryan Djurovich
+ * @copyright 2009-2010, Website Baker Org. e.V.
+ * @version $Id$
+ * @platform WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+// Include the configuration file
+require('../../../config.php');
+// Include the language file
+require(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php');
+// Include the database class file and initiate an object
+require(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Start', 'start', false, false);
+$database = new database();
+
+// Get the website title
+$results = $database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name = 'title'");
+$results = $results->fetchRow();
+$website_title = $results['value'];
+
+// Check if the user has already submitted the form, otherwise show it
+if(isset($_POST['email']) AND $_POST['email'] != "") {
+
+ $email = htmlspecialchars($_POST['email'],ENT_QUOTES);
+
+ // Check if the email exists in the database
+ $query = "SELECT user_id,username,display_name,email,last_reset,password FROM ".TABLE_PREFIX."users WHERE email = '".$admin->add_slashes($_POST['email'])."'";
+ $results = $database->query($query);
+ if($results->numRows() > 0) {
+
+ // Get the id, username, email, and last_reset from the above db query
+ $results_array = $results->fetchRow();
+
+ // Check if the password has been reset in the last 2 hours
+ $last_reset = $results_array['last_reset'];
+ $time_diff = time()-$last_reset; // Time since last reset in seconds
+ $time_diff = $time_diff/60/60; // Time since last reset in hours
+ if($time_diff < 2) {
+
+ // Tell the user that their password cannot be reset more than once per hour
+ $message = $MESSAGE['FORGOT_PASS']['ALREADY_RESET'];
+
+ } else {
+
+ $old_pass = $results_array['password'];
+
+ // Generate a random password then update the database with it
+ $new_pass = '';
+ $salt = "abchefghjkmnpqrstuvwxyz0123456789";
+ srand((double)microtime()*1000000);
+ $i = 0;
+ while ($i <= 7) {
+ $num = rand() % 33;
+ $tmp = substr($salt, $num, 1);
+ $new_pass = $new_pass . $tmp;
+ $i++;
+ }
+
+ $database->query("UPDATE ".TABLE_PREFIX."users SET password = '".md5($new_pass)."', last_reset = '".time()."' WHERE user_id = '".$results_array['user_id']."'");
+
+ if($database->is_error()) {
+ // Error updating database
+ $message = $database->get_error();
+ } else {
+ // Setup email to send
+ $mail_to = $email;
+ $mail_subject = $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'];
+
+ // Replace placeholders from language variable with values
+ $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}');
+ $replace = array($results_array['display_name'], WEBSITE_TITLE, $results_array['username'], $new_pass);
+ $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO']);
+
+ // Try sending the email
+ if($admin->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) {
+ $message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET'];
+ $display_form = false;
+ } else {
+ $database->query("UPDATE ".TABLE_PREFIX."users SET password = '".$old_pass."' WHERE user_id = '".$results_array['user_id']."'");
+ $message = $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'];
+ }
+ }
+
+ }
+
+ } else {
+ // Email doesn't exist, so tell the user
+ $message = $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'];
+ // and delete the wrong Email
+ $email = '';
+ }
+
+} else {
+ $email = '';
+}
+
+if(!isset($message)) {
+ $message = $MESSAGE['FORGOT_PASS']['NO_DATA'];
+ $message_color = '000000';
+} else {
+ $message_color = 'FF0000';
+}
+
+// Setup the template
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'login_forgot.htt');
+$template->set_block('page', 'main_block', 'main');
+if(defined('FRONTEND')) {
+ $template->set_var('ACTION_URL', 'forgot.php');
+} else {
+ $template->set_var('ACTION_URL', 'index.php');
+}
+$template->set_var('EMAIL', $email);
+
+if(isset($display_form)) {
+ $template->set_var('DISPLAY_FORM', 'display:none;');
+}
+
+$template->set_var(array(
+ 'SECTION_FORGOT' => $MENU['FORGOT'],
+ 'MESSAGE_COLOR' => $message_color,
+ 'MESSAGE' => $message,
+ 'WB_URL' => WB_URL,
+ 'ADMIN_URL' => ADMIN_URL,
+ 'THEME_URL' => THEME_URL,
+ 'LANGUAGE' => strtolower(LANGUAGE),
+ 'TEXT_EMAIL' => $TEXT['EMAIL'],
+ 'TEXT_SEND_DETAILS' => $TEXT['SEND_DETAILS'],
+ 'TEXT_HOME' => $TEXT['HOME'],
+ 'TEXT_NEED_TO_LOGIN' => $TEXT['NEED_TO_LOGIN']
+ )
+ );
+
+if(defined('FRONTEND')) {
+ $template->set_var('LOGIN_URL', WB_URL.'/account/login.php');
+} else {
+ $template->set_var('LOGIN_URL', ADMIN_URL);
+}
+$template->set_var('INTERFACE_URL', ADMIN_URL.'/interface');
+
+if(defined('DEFAULT_CHARSET')) {
+ $charset=DEFAULT_CHARSET;
+} else {
+ $charset='utf-8';
+}
+
+$template->set_var('CHARSET', $charset);
+
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/login/index.php
===================================================================
--- branches/2.8.x/wb/admin/login/index.php (revision 1246)
+++ branches/2.8.x/wb/admin/login/index.php (revision 1247)
@@ -1,28 +1,63 @@
+* Copyright (C) 2009, Website Baker Org. e.V.
+* http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+* About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+* LICENSE INFORMATION
+*
+* WebsiteBaker is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+****************************************************************************
+*
+*****************************************************************************
+* WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ * @category admin
+ * @package login
+ * @author Ryan Djurovich
+ * @copyright 2004-2009, Ryan Djurovich
+ * @copyright 2009-2010, Website Baker Org. e.V.
+ * @version $Id$
+ * @platform WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license http://www.gnu.org/licenses/gpl.html
+ *
+ */
-// $Id$
-
-/*
-
- Website Baker Project
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
require_once("../../config.php");
require_once(WB_PATH."/framework/class.login.php");
Index: branches/2.8.x/wb/templates/classic_theme/templates/login_forgot.htt
===================================================================
--- branches/2.8.x/wb/templates/classic_theme/templates/login_forgot.htt (revision 1246)
+++ branches/2.8.x/wb/templates/classic_theme/templates/login_forgot.htt (revision 1247)
@@ -33,18 +33,18 @@