Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1245)
+++ branches/2.8.x/CHANGELOG (revision 1246)
@@ -12,6 +12,8 @@
------------------------------------- 2.8.1 -------------------------------------
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
14-Jan-2010 Dietmar Woellbrink (Luisehahne)
# Ticket #911 2. 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 1245)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1246)
@@ -69,9 +69,8 @@
exit(0);
}
-$tmp_revision = $Revision;
// 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', $tmp_revision);
+if(!defined('REVISION')) define('REVISION', '1246');
?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/users/users.php
===================================================================
--- branches/2.8.x/wb/admin/users/users.php (revision 1245)
+++ branches/2.8.x/wb/admin/users/users.php (revision 1246)
@@ -1,29 +1,64 @@
+* 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 users
+ * @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
-
-*/
-
-// Include config file and admin class file
+ // Include config file and admin class file
require('../../config.php');
require_once(WB_PATH.'/framework/class.admin.php');
@@ -137,7 +172,7 @@
// Work-out if home folder should be shown
if(!HOME_FOLDERS) {
- $template->set_var('DISPLAY_HOME_FOLDERS', 'none');
+ $template->set_var('DISPLAY_HOME_FOLDERS', 'display:none;');
}
// Include the WB functions file
@@ -145,7 +180,8 @@
// Add media folders to home folder list
$template->set_block('main_block', 'folder_list_block', 'folder_list');
- foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) {
+ foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name)
+ {
$template->set_var('NAME', str_replace(WB_PATH, '', $name));
$template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name));
if($user['home_folder'] == str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)) {
Index: branches/2.8.x/wb/admin/users/index.php
===================================================================
--- branches/2.8.x/wb/admin/users/index.php (revision 1245)
+++ branches/2.8.x/wb/admin/users/index.php (revision 1246)
@@ -1,208 +1,244 @@
-
- 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('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Access', 'users');
-
-// Create new template object for the modify/remove menu
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'users.htt');
-$template->set_block('page', 'main_block', 'main');
-$template->set_block("main_block", "manage_groups_block", "groups");
-$template->set_var('ADMIN_URL', ADMIN_URL);
-
-// Get existing value from database
-$database = new database();
-$query = "SELECT user_id, username, display_name FROM ".TABLE_PREFIX."users WHERE user_id != '1' ORDER BY username";
-$results = $database->query($query);
-if($database->is_error()) {
- $admin->print_error($database->get_error(), 'index.php');
-}
-
-// Insert values into the modify/remove menu
-$template->set_block('main_block', 'list_block', 'list');
-if($results->numRows() > 0) {
- // Insert first value to say please select
- $template->set_var('VALUE', '');
- $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
- $template->parse('list', 'list_block', true);
- // Loop through users
- while($user = $results->fetchRow()) {
- $template->set_var('VALUE', $user['user_id']);
- $template->set_var('NAME', $user['display_name'].' ('.$user['username'].')');
- $template->parse('list', 'list_block', true);
- }
-} else {
- // Insert single value to say no users were found
- $template->set_var('NAME', $TEXT['NONE_FOUND']);
- $template->parse('list', 'list_block', true);
-}
-
-// Insert permissions values
-if($admin->get_permission('users_add') != true) {
- $template->set_var('DISPLAY_ADD', 'hide');
-}
-if($admin->get_permission('users_modify') != true) {
- $template->set_var('DISPLAY_MODIFY', 'hide');
-}
-if($admin->get_permission('users_delete') != true) {
- $template->set_var('DISPLAY_DELETE', 'hide');
-}
-
-// Insert language headings
-$template->set_var(array(
- 'HEADING_MODIFY_DELETE_USER' => $HEADING['MODIFY_DELETE_USER'],
- 'HEADING_ADD_USER' => $HEADING['ADD_USER']
- )
-);
-// insert urls
-$template->set_var(array(
- 'ADMIN_URL' => ADMIN_URL,
- 'WB_URL' => WB_URL,
- 'WB_PATH' => WB_PATH,
- 'THEME_URL' => THEME_URL
- )
-);
-// Insert language text and messages
-$template->set_var(array(
- 'TEXT_MODIFY' => $TEXT['MODIFY'],
- 'TEXT_DELETE' => $TEXT['DELETE'],
- 'TEXT_MANAGE_GROUPS' => ( $admin->get_permission('groups') == true ) ? $TEXT['MANAGE_GROUPS'] : "**",
- 'CONFIRM_DELETE' => $MESSAGE['USERS']['CONFIRM_DELETE']
- )
-);
-if ( $admin->get_permission('groups') == true ) $template->parse("groups", "manage_groups_block", true);
-// Parse template object
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-// Setup template for add user form
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'users_form.htt');
-$template->set_block('page', 'main_block', 'main');
-$template->set_var('DISPLAY_EXTRA', 'none');
-$template->set_var('ACTIVE_CHECKED', ' checked="checked"');
-$template->set_var('ACTION_URL', ADMIN_URL.'/users/add.php');
-$template->set_var('SUBMIT_TITLE', $TEXT['ADD']);
-// insert urls
-$template->set_var(array(
- 'ADMIN_URL' => ADMIN_URL,
- 'WB_URL' => WB_URL,
- 'WB_PATH' => WB_PATH,
- 'THEME_URL' => THEME_URL
- )
-);
-
-// Add groups to list
-$template->set_block('main_block', 'group_list_block', 'group_list');
-$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
-if($results->numRows() > 0) {
- $template->set_var('ID', '');
- $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
- $template->set_var('SELECTED', ' selected="selected"');
- $template->parse('group_list', 'group_list_block', true);
- while($group = $results->fetchRow()) {
- $template->set_var('ID', $group['group_id']);
- $template->set_var('NAME', $group['name']);
- $template->set_var('SELECTED', '');
- $template->parse('group_list', 'group_list_block', true);
- }
-}
-// Only allow the user to add a user to the Administrators group if they belong to it
-if(in_array(1, $admin->get_groups_id())) {
- $users_groups = $admin->get_groups_name();
- $template->set_var('ID', '1');
- $template->set_var('NAME', $users_groups[1]);
- $template->set_var('SELECTED', '');
- $template->parse('group_list', 'group_list_block', true);
-} else {
- if($results->numRows() == 0) {
- $template->set_var('ID', '');
- $template->set_var('NAME', $TEXT['NONE_FOUND']);
- $template->parse('group_list', 'group_list_block', true);
- }
-}
-
-// Insert permissions values
-if($admin->get_permission('users_add') != true) {
- $template->set_var('DISPLAY_ADD', 'hide');
-}
-
-// Generate username field name
-$username_fieldname = 'username_';
-$salt = "abchefghjkmnpqrstuvwxyz0123456789";
-srand((double)microtime()*1000000);
-$i = 0;
-while ($i <= 7) {
- $num = rand() % 33;
- $tmp = substr($salt, $num, 1);
- $username_fieldname = $username_fieldname . $tmp;
- $i++;
-}
-
-// Work-out if home folder should be shown
-if(!HOME_FOLDERS) {
- $template->set_var('DISPLAY_HOME_FOLDERS', 'none');
-}
-
-// Include the WB functions file
-require_once(WB_PATH.'/framework/functions.php');
-
-// Add media folders to home folder list
-$template->set_block('main_block', 'folder_list_block', 'folder_list');
-foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) {
- $template->set_var('NAME', str_replace(WB_PATH, '', $name));
- $template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name));
- $template->set_var('SELECTED', ' ');
- $template->parse('folder_list', 'folder_list_block', true);
-}
-
-// Insert language text and messages
-$template->set_var(array(
- 'TEXT_RESET' => $TEXT['RESET'],
- 'TEXT_ACTIVE' => $TEXT['ACTIVE'],
- 'TEXT_DISABLED' => $TEXT['DISABLED'],
- 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
- 'TEXT_USERNAME' => $TEXT['USERNAME'],
- 'TEXT_PASSWORD' => $TEXT['PASSWORD'],
- 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
- 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
- 'TEXT_EMAIL' => $TEXT['EMAIL'],
- 'TEXT_GROUP' => $TEXT['GROUP'],
- 'TEXT_NONE' => $TEXT['NONE'],
- 'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],
- 'USERNAME_FIELDNAME' => $username_fieldname,
- 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD']
- )
- );
-
-// Parse template for add user form
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-$admin->print_footer();
-
+
+* 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 users
+ * @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
+ *
+ */
+
+
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Access', 'users');
+
+// Create new template object for the modify/remove menu
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'users.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_block("main_block", "manage_groups_block", "groups");
+$template->set_var('ADMIN_URL', ADMIN_URL);
+
+// Get existing value from database
+$database = new database();
+$query = "SELECT user_id, username, display_name FROM ".TABLE_PREFIX."users WHERE user_id != '1' ORDER BY username";
+$results = $database->query($query);
+if($database->is_error()) {
+ $admin->print_error($database->get_error(), 'index.php');
+}
+
+// Insert values into the modify/remove menu
+$template->set_block('main_block', 'list_block', 'list');
+if($results->numRows() > 0) {
+ // Insert first value to say please select
+ $template->set_var('VALUE', '');
+ $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
+ $template->parse('list', 'list_block', true);
+ // Loop through users
+ while($user = $results->fetchRow()) {
+ $template->set_var('VALUE', $user['user_id']);
+ $template->set_var('NAME', $user['display_name'].' ('.$user['username'].')');
+ $template->parse('list', 'list_block', true);
+ }
+} else {
+ // Insert single value to say no users were found
+ $template->set_var('NAME', $TEXT['NONE_FOUND']);
+ $template->parse('list', 'list_block', true);
+}
+
+// Insert permissions values
+if($admin->get_permission('users_add') != true) {
+ $template->set_var('DISPLAY_ADD', 'hide');
+}
+if($admin->get_permission('users_modify') != true) {
+ $template->set_var('DISPLAY_MODIFY', 'hide');
+}
+if($admin->get_permission('users_delete') != true) {
+ $template->set_var('DISPLAY_DELETE', 'hide');
+}
+
+// Insert language headings
+$template->set_var(array(
+ 'HEADING_MODIFY_DELETE_USER' => $HEADING['MODIFY_DELETE_USER'],
+ 'HEADING_ADD_USER' => $HEADING['ADD_USER']
+ )
+);
+// insert urls
+$template->set_var(array(
+ 'ADMIN_URL' => ADMIN_URL,
+ 'WB_URL' => WB_URL,
+ 'WB_PATH' => WB_PATH,
+ 'THEME_URL' => THEME_URL
+ )
+);
+// Insert language text and messages
+$template->set_var(array(
+ 'TEXT_MODIFY' => $TEXT['MODIFY'],
+ 'TEXT_DELETE' => $TEXT['DELETE'],
+ 'TEXT_MANAGE_GROUPS' => ( $admin->get_permission('groups') == true ) ? $TEXT['MANAGE_GROUPS'] : "**",
+ 'CONFIRM_DELETE' => $MESSAGE['USERS']['CONFIRM_DELETE']
+ )
+);
+if ( $admin->get_permission('groups') == true ) $template->parse("groups", "manage_groups_block", true);
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Setup template for add user form
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'users_form.htt');
+$template->set_block('page', 'main_block', 'main');
+$template->set_var('DISPLAY_EXTRA', 'display:none;');
+$template->set_var('ACTIVE_CHECKED', ' checked="checked"');
+$template->set_var('ACTION_URL', ADMIN_URL.'/users/add.php');
+$template->set_var('SUBMIT_TITLE', $TEXT['ADD']);
+// insert urls
+$template->set_var(array(
+ 'ADMIN_URL' => ADMIN_URL,
+ 'WB_URL' => WB_URL,
+ 'WB_PATH' => WB_PATH,
+ 'THEME_URL' => THEME_URL
+ )
+);
+
+// Add groups to list
+$template->set_block('main_block', 'group_list_block', 'group_list');
+$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
+if($results->numRows() > 0) {
+ $template->set_var('ID', '');
+ $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...');
+ $template->set_var('SELECTED', ' selected="selected"');
+ $template->parse('group_list', 'group_list_block', true);
+ while($group = $results->fetchRow()) {
+ $template->set_var('ID', $group['group_id']);
+ $template->set_var('NAME', $group['name']);
+ $template->set_var('SELECTED', '');
+ $template->parse('group_list', 'group_list_block', true);
+ }
+}
+// Only allow the user to add a user to the Administrators group if they belong to it
+if(in_array(1, $admin->get_groups_id())) {
+ $users_groups = $admin->get_groups_name();
+ $template->set_var('ID', '1');
+ $template->set_var('NAME', $users_groups[1]);
+ $template->set_var('SELECTED', '');
+ $template->parse('group_list', 'group_list_block', true);
+} else {
+ if($results->numRows() == 0) {
+ $template->set_var('ID', '');
+ $template->set_var('NAME', $TEXT['NONE_FOUND']);
+ $template->parse('group_list', 'group_list_block', true);
+ }
+}
+
+// Insert permissions values
+if($admin->get_permission('users_add') != true) {
+ $template->set_var('DISPLAY_ADD', 'hide');
+}
+
+// Generate username field name
+$username_fieldname = 'username_';
+$salt = "abchefghjkmnpqrstuvwxyz0123456789";
+srand((double)microtime()*1000000);
+$i = 0;
+while ($i <= 7) {
+ $num = rand() % 33;
+ $tmp = substr($salt, $num, 1);
+ $username_fieldname = $username_fieldname . $tmp;
+ $i++;
+}
+
+// Work-out if home folder should be shown
+if(!HOME_FOLDERS) {
+ $template->set_var('DISPLAY_HOME_FOLDERS', 'display:none;');
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+// Add media folders to home folder list
+$template->set_block('main_block', 'folder_list_block', 'folder_list');
+foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) {
+ $template->set_var('NAME', str_replace(WB_PATH, '', $name));
+ $template->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name));
+ $template->set_var('SELECTED', ' ');
+ $template->parse('folder_list', 'folder_list_block', true);
+}
+
+// Insert language text and messages
+$template->set_var(array(
+ 'TEXT_RESET' => $TEXT['RESET'],
+ 'TEXT_ACTIVE' => $TEXT['ACTIVE'],
+ 'TEXT_DISABLED' => $TEXT['DISABLED'],
+ 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+ 'TEXT_USERNAME' => $TEXT['USERNAME'],
+ 'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+ 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'],
+ 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'],
+ 'TEXT_EMAIL' => $TEXT['EMAIL'],
+ 'TEXT_GROUP' => $TEXT['GROUP'],
+ 'TEXT_NONE' => $TEXT['NONE'],
+ 'TEXT_HOME_FOLDER' => $TEXT['HOME_FOLDER'],
+ 'USERNAME_FIELDNAME' => $username_fieldname,
+ 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD']
+ )
+ );
+
+// Parse template for add user form
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+$admin->print_footer();
+
?>
\ No newline at end of file
Index: branches/2.8.x/wb/templates/classic_theme/templates/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/classic_theme/templates/users_form.htt (revision 1245)
+++ branches/2.8.x/wb/templates/classic_theme/templates/users_form.htt (revision 1246)
@@ -1,94 +1,94 @@
-
-
-
-
-
{HEADING_MODIFY_USER}
-
-
-
+
+
+
+
+
{HEADING_MODIFY_USER}
+
+
+
\ No newline at end of file
Index: branches/2.8.x/wb/templates/wb_theme/templates/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/users_form.htt (revision 1245)
+++ branches/2.8.x/wb/templates/wb_theme/templates/users_form.htt (revision 1246)
@@ -1,94 +1,94 @@
-
-
-
-
-
{HEADING_MODIFY_USER}
-
-
-
+
+
+
+
+
{HEADING_MODIFY_USER}
+
+
+
\ No newline at end of file
Index: branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt (revision 1245)
+++ branches/2.8.x/wb/templates/argos_theme/templates/users_form.htt (revision 1246)
@@ -1,94 +1,94 @@
-
-
-
-
-