Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1710) +++ branches/2.8.x/CHANGELOG (revision 1711) @@ -13,6 +13,8 @@ +29 Aug-2012 Build 1711 Dietmar Woellbrink (Luisehahne) +! update folder admin/start, admin/admintools, admin/skel/htt 29 Aug-2012 Build 1710 Dietmar Woellbrink (Luisehahne) ! update folder admin/groups, admin/users, admin/skel/htt 29 Aug-2012 Build 1709 Dietmar Woellbrink (Luisehahne) Property changes on: branches/2.8.x/CHANGELOG ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: branches/2.8.x/wb/admin/start/index.php =================================================================== --- branches/2.8.x/wb/admin/start/index.php (revision 1710) +++ branches/2.8.x/wb/admin/start/index.php (revision 1711) @@ -4,7 +4,7 @@ * @category admin * @package start * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -13,12 +13,17 @@ * @filesource $HeadURL$ * @lastmodified $Date$ * -*/ - + */ +//$string = "pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools +//media,media_create,media_upload,media_view,preferences,preferences_view,pages,pages_modify,pages_view"; +//$regex = "/(pages)+[a-z]*[_]([a-z_0-9]+)[^,]/im"; +//preg_match_all ($regex, $string, $output); +// require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('Start','start'); // --------------------------------------- +// $database = WbDatabase::getInstance(); if(defined('FINALIZE_SETUP')) { require_once(WB_PATH.'/framework/functions.php'); @@ -52,8 +57,12 @@ if($database->query($sql)) { } } // --------------------------------------- -$msg = '
'; // check if it is neccessary to start the uograde-script +$msg = ''; + +// --------------------------------------- +// check if it is neccessary to start the uograde-script +// --------------------------------------- if(($admin->get_user_id()==1) && file_exists(WB_PATH.'/upgrade-script.php')) { // check if it is neccessary to start the uograde-script $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'wb_revision\''; @@ -72,52 +81,155 @@ } $msg .= ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'
'; } +// --------------------------------------- +// workout to upgrade the groups system_permissions +// --------------------------------------- +if( ($admin->get_user_id()==1) && + file_exists(ADMIN_PATH.'/groups/upgradePermissions.php') && + !defined('GROUPS_UPDATED') ) +{ + // check if it is neccessary to start the uograde-script + $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'wb_revision\''; + if($wb_revision = $database->get_one($sql)) { + } + if (version_compare($wb_revision, '1691' ) < 0) { + require_once (ADMIN_PATH.'/groups/upgradePermissions.php'); + // build new or changed $sTempPermissions + if(upgrade_group_system_permissions()){ + $cfg = array( + 'groups_updated' => time() + ); + if(db_update_key_value( 'settings', $cfg )) { + echo "

Hello Systemadministrator!

". + "

". + "The Administrator Groups Rights were updated automatically.\n" . + "Please click on this link to login again!

\n". + "

Upgrading only start, if groups rights are not up to date!

"; + // Print admin footer + $admin->print_footer(); + exit(0); + + } + } + } +} + +// --------------------------------------- // Setup template object, parse vars to it, then parse it // Create new template object -$template = new Template(dirname($admin->correct_theme_source('start.htt'))); -$template->set_file('page', 'start.htt'); -$template->set_block('page', 'main_block', 'main'); +$oTpl = new Template(dirname($admin->correct_theme_source('start.htt')),'keep'); +$oTpl->set_file('page', 'start.htt'); +$oTpl->set_block('page', 'main_block', 'main'); // Insert values into the template object -$template->set_var(array( - 'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'], - 'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'], +$oTpl->set_var(array( + 'WELCOME_MESSAGE' => $MESSAGE['START_WELCOME_MESSAGE'], + 'CURRENT_USER' => $MESSAGE['START_CURRENT_USER'], 'DISPLAY_NAME' => $admin->get_display_name(), 'ADMIN_URL' => ADMIN_URL, 'WB_URL' => WB_URL, 'THEME_URL' => THEME_URL, - 'WB_VERSION' => WB_VERSION + 'WB_VERSION' => WB_VERSION, + 'NO_CONTENT' => '' ) ); + // Insert permission values into the template object +$oTpl->set_block('main_block', 'show_pages_block', 'show_pages'); if($admin->get_permission('pages') != true) { - $template->set_var('DISPLAY_PAGES', 'display:none;'); + $oTpl->set_block('show_pages', ''); +} else { + $oTpl->parse('show_pages', 'show_pages_block', true); } + +$oTpl->set_block('main_block', 'show_addons_block', 'show_addons'); +if($admin->get_permission('addons') != true) +{ + $oTpl->set_block('show_addons', ''); +} else { + $oTpl->parse('show_addons', 'show_addons_block', true); +} + +$oTpl->set_block('main_block', 'show_settings_block', 'show_settings'); +if($admin->get_permission('settings') != true) +{ + $oTpl->set_block('show_settings', ''); +} else { + $oTpl->parse('show_settings', 'show_settings_block', true); +} + +$oTpl->set_block('main_block', 'show_access_block', 'show_access'); +if($admin->get_permission('access') != true) +{ + $oTpl->set_block('show_access', ''); +} else { + $oTpl->parse('show_access', 'show_access_block', true); +} + +$oTpl->set_block('main_block', 'show_media_block', 'show_media'); if($admin->get_permission('media') != true) { - $template->set_var('DISPLAY_MEDIA', 'display:none;'); + $oTpl->set_block('show_media', ''); +} else { + $oTpl->parse('show_media', 'show_media_block', true); } + +$oTpl->set_block('main_block', 'show_admintools_block', 'show_admintools'); +if($admin->get_permission('admintools') != true) +{ + $oTpl->set_block('show_admintools', ''); +} else { + $oTpl->parse('show_admintools', 'show_admintools_block', true); +} + +$oTpl->set_block('main_block', 'show_preferences_block', 'show_preferences'); +if($admin->get_permission('preferences') != true) +{ + $oTpl->set_block('show_preferences', ''); +} else { + $oTpl->parse('show_preferences', 'show_preferences_block', true); +} + +$oTpl->set_block('main_block', 'show_install_block', 'show_install'); +if($admin->ami_group_member('1') != true) +{ + $oTpl->set_block('show_install', ''); +} else { + $oTpl->parse('show_install', 'show_install_block', true); +} + +/* +if($admin->get_permission('pages') != true) +{ + $oTpl->set_var('DISPLAY_PAGES', 'display:none;'); +} +if($admin->get_permission('media') != true) +{ + $oTpl->set_var('DISPLAY_MEDIA', 'display:none;'); +} if($admin->get_permission('addons') != true) { - $template->set_var('DISPLAY_ADDONS', 'display:none;'); + $oTpl->set_var('DISPLAY_ADDONS', 'display:none;'); } if($admin->get_permission('access') != true) { - $template->set_var('DISPLAY_ACCESS', 'display:none;'); + $oTpl->set_var('DISPLAY_ACCESS', 'display:none;'); } if($admin->get_permission('settings') != true) { - $template->set_var('DISPLAY_SETTINGS', 'display:none;'); + $oTpl->set_var('DISPLAY_SETTINGS', 'display:none;'); } if($admin->get_permission('admintools') != true) { - $template->set_var('DISPLAY_ADMINTOOLS', 'display:none;'); + $oTpl->set_var('DISPLAY_ADMINTOOLS', 'display:none;'); } +*/ -$msg .= (file_exists(WB_PATH.'/install/')) ? $MESSAGE['START']['INSTALL_DIR_EXISTS'] : ''; +$msg .= (file_exists(WB_PATH.'/install/')) ? $MESSAGE['START_INSTALL_DIR_EXISTS'] : ''; // Check if installation directory still exists if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) { @@ -124,12 +236,12 @@ // Check if user is part of Adminstrators group if(in_array(1, $admin->get_groups_id())) { - $template->set_var('WARNING', $msg ); + $oTpl->set_var('WARNING', $msg ); } else { - $template->set_var('DISPLAY_WARNING', 'display:none;'); + $oTpl->set_var('DISPLAY_WARNING', 'display:none;'); } } else { - $template->set_var('DISPLAY_WARNING', 'display:none;'); + $oTpl->set_var('DISPLAY_WARNING', 'display:none;'); } // Insert "Add-ons" section overview (pretty complex compared to normal) @@ -166,7 +278,7 @@ } // Insert section names and descriptions -$template->set_var(array( +$oTpl->set_var(array( 'PAGES' => $MENU['PAGES'], 'MEDIA' => $MENU['MEDIA'], 'ADDONS' => $MENU['ADDONS'], @@ -186,8 +298,8 @@ ); // Parse template object -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); +$oTpl->parse('main', 'main_block', false); +$oTpl->pparse('output', 'page'); // Print admin footer $admin->print_footer(); Index: branches/2.8.x/wb/admin/skel/themes/htt/admintools.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/admintools.htt (revision 1710) +++ branches/2.8.x/wb/admin/skel/themes/htt/admintools.htt (revision 1711) @@ -1,23 +1,19 @@ -

{HEADING_ADMINISTRATION_TOOLS}

-
- - {TOOL_LIST} -
+
+

{HEADING_ADMINISTRATION_TOOLS}

+ +
\ No newline at end of file Index: branches/2.8.x/wb/admin/skel/themes/htt/start.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/start.htt (revision 1710) +++ branches/2.8.x/wb/admin/skel/themes/htt/start.htt (revision 1711) @@ -1,75 +1,86 @@ - - - - - - - - - - - - - -
{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}.
{WARNING}
- - - - - - -
{PAGES} {PAGES} - {PAGES_OVERVIEW} -
- - - - - -
{ADDONS} {ADDONS} - {ADDONS_OVERVIEW} -
- - - - - -
{SETTINGS} {SETTINGS} - {SETTINGS_OVERVIEW} -
- - - - - -
{ACCESS} {ACCESS} - {ACCESS_OVERVIEW} -
- 		  - - - - - -
{MEDIA} {MEDIA} - {MEDIA_OVERVIEW} -
- - - - - -
{PREFERENCES} {PREFERENCES} - {PREFERENCES_OVERVIEW} -
- - - - - -
{ADMINTOOLS} {ADMINTOOLS} - {ADMINTOOLS_OVERVIEW} -
-
+
+

{WELCOME_MESSAGE}. {CURRENT_USER} {DISPLAY_NAME}

+ +

{WARNING}

+ +
+
+ + +
\ No newline at end of file Index: branches/2.8.x/wb/admin/skel/themes/htt/media_browse.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/media_browse.htt (revision 1710) +++ branches/2.8.x/wb/admin/skel/themes/htt/media_browse.htt (revision 1711) @@ -3,13 +3,13 @@ Browse Media - + - + Index: branches/2.8.x/wb/admin/skel/themes/htt/preferences.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/preferences.htt (revision 1710) +++ branches/2.8.x/wb/admin/skel/themes/htt/preferences.htt (revision 1711) @@ -1,65 +1,44 @@ -

{HEADING_MY_SETTINGS}

-
-
+ {FTAN} -
-
-
-
-
-
{USERNAME}

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
+
+ {HEADING_MY_SETTINGS} +
+ + +
+ +
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
- -
-
-
+
+ +
-
-
+
+ +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ +
-
-
-
-
-
-
+
-
 
-
- -
- +
+ Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1710) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1711) @@ -51,5 +51,5 @@ // 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.3'); -if(!defined('REVISION')) define('REVISION', '1710'); +if(!defined('REVISION')) define('REVISION', '1711'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/admintools/tool.php =================================================================== --- branches/2.8.x/wb/admin/admintools/tool.php (revision 1710) +++ branches/2.8.x/wb/admin/admintools/tool.php (revision 1711) @@ -4,7 +4,7 @@ * @category admin * @package admintools * @author WB-Project, Werner v.d. Decken - * @copyright 2011, Website Baker Org. e.V. + * @copyright 2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.2 @@ -40,13 +40,15 @@ // include modules tool.php require(WB_PATH.'/modules/'.$toolDir.'/tool.php'); $admin->print_footer(); - }else { + } else { // no installed module found, jump to index.php of admintools - header('location: '.ADMIN_URL.'/admintools/index.php'); - exit(0); +// header('location: '.ADMIN_URL.'/admintools/index.php'); +// exit(0); + $admin->send_header(ADMIN_URL.'/admintools/index.php'); } }else { // invalid module name requested, jump to index.php of admintools - header('location: '.ADMIN_URL.'/admintools/index.php'); - exit(0); +// header('location: '.ADMIN_URL.'/admintools/index.php'); +// exit(0); + $admin->send_header(ADMIN_URL.'/admintools/index.php'); } Index: branches/2.8.x/wb/admin/admintools/index.php =================================================================== --- branches/2.8.x/wb/admin/admintools/index.php (revision 1710) +++ branches/2.8.x/wb/admin/admintools/index.php (revision 1711) @@ -4,7 +4,7 @@ * @category admin * @package admintools * @author WB-Project, Werner v.d. Decken - * @copyright 2011, Website Baker Org. e.V. + * @copyright 2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -24,7 +24,7 @@ // Setup template object, parse vars to it, then parse it // Create new template object -$template = new Template(dirname($admin->correct_theme_source('admintools.htt'))); +$template = new Template(dirname($admin->correct_theme_source('admintools.htt')),'keep'); // $template->debug = true; $template->set_file('page', 'admintools.htt'); $template->set_block('page', 'main_block', 'main'); @@ -36,32 +36,43 @@ // Insert tools into tool list $template->set_block('main_block', 'tool_list_block', 'tool_list'); +$template->set_var('TOOL_NAME', ''); +$template->set_var('TOOL_DIR', ''); +$template->set_var('TOOL_DESCRIPTION', ''); +$template->set_var('NO_CONTENT', ''); + $results = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'tool' order by name"); if($results->numRows() > 0) { - while($tool = $results->fetchRow()) { - $template->set_var('TOOL_NAME', $tool['name']); - $template->set_var('TOOL_DIR', $tool['directory']); + while( $tool = $results->fetchRow() ) { + + if( $admin->get_permission($tool['directory'],'module' ) ) + { + $template->set_var('TOOL_NAME', $tool['name']); + $template->set_var('TOOL_DIR', $tool['directory']); // /icons/admintools.png // check if a module description exists for the displayed backend language - $tool_description = false; - if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) { - // read contents of the module language file into string - $data = @file_get_contents(WB_PATH .'/modules/' .$tool['directory'] .'/languages/' .LANGUAGE .'.php'); - $tool_description = get_variable_content('module_description', $data, true, false); - } - if(file_exists(WB_PATH .'/modules/' .$tool['directory'].'/tool_icon.png')) - { - $template->set_var('TOOL_ICON', WB_URL.'/modules/' .$tool['directory'].'/tool_icon.png'); - } else { - $template->set_var('TOOL_ICON', THEME_URL.'/icons/admintools.png'); + $tool_description = false; + if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$tool['directory'].'/languages/'.LANGUAGE .'.php')) { + // read contents of the module language file into string + $data = @file_get_contents(WB_PATH .'/modules/' .$tool['directory'] .'/languages/' .LANGUAGE .'.php'); + $tool_description = get_variable_content('module_description', $data, true, false); + } + if(file_exists(WB_PATH .'/modules/' .$tool['directory'].'/tool_icon.png')) + { + $template->set_var('TOOL_ICON', WB_URL.'/modules/' .$tool['directory'].'/tool_icon.png'); + } else { + $template->set_var('TOOL_ICON', THEME_URL.'/icons/admintools.png'); + } + $template->set_var('TOOL_DESCRIPTION', ($tool_description === False)? $tool['description'] :$tool_description); + $template->parse('tool_list', 'tool_list_block', true); } - $template->set_var('TOOL_DESCRIPTION', ($tool_description === False)? $tool['description'] :$tool_description); - $template->parse('tool_list', 'tool_list_block', true); } + } else { - $template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']); + $template->set_var('TOOL_LIST', $TEXT['NONE_FOUND']); } +$template->set_var('TOOL_LIST', '
  •  
    • '); // Parse template objects output $template->parse('main', 'main_block', false); $template->pparse('output', 'page');