Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2098) +++ branches/2.8.x/CHANGELOG (revision 2099) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +11 Feb-2014 Build 2099 Manuela v.d.Decken(DarkViper) +# first fixes from rev.2098 11 Feb-2014 Build 2098 Manuela v.d.Decken(DarkViper) ! activate class Translate for all addons in admin/ (except pages/) ! class.admin >> add translation of the current theme to Translate Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 2098) +++ branches/2.8.x/wb/upgrade-script.php (revision 2099) @@ -89,7 +89,7 @@ // --- set DEFAULT_THEME and restart if needed ------------------------------------------- if (isset($oReg->DefaultTheme) && $oReg->DefaultTheme != 'WbTheme') { db_update_key_value('settings', 'default_theme', 'WbTheme'); - $sLocation = 'Location: '.$oReg->AppUrl.filename(__FILE__); + $sLocation = 'Location: '.$oReg->AppUrl.basename(__FILE__); header($sLocation); exit; } Index: branches/2.8.x/wb/admin/start/index.php =================================================================== --- branches/2.8.x/wb/admin/start/index.php (revision 2098) +++ branches/2.8.x/wb/admin/start/index.php (revision 2099) @@ -72,7 +72,7 @@ // --------------------------------------- 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 `'.$oDb-TablePrefix.'settings` WHERE `name`=\'wb_revision\''; + $sql = 'SELECT `value` FROM `'.$oDb->TablePrefix.'settings` WHERE `name`=\'wb_revision\''; $wb_revision = $oDb->getOne($sql); if (version_compare($wb_revision, REVISION ) < 0) { echo "

If the upgrade script could not be start automatically.\n" . @@ -133,13 +133,13 @@ /** * delete Outdated Confirmations */ -$sql = 'DELETE FROM `'.$oDb-TablePrefix.'users` WHERE `confirm_timeout` BETWEEN 1 AND '.time(); +$sql = 'DELETE FROM `'.$oDb->TablePrefix.'users` WHERE `confirm_timeout` BETWEEN 1 AND '.time(); $oDb->doQuery($sql); /** * delete stored ip adresses default after 60 days */ -$sql = 'UPDATE `'.$oDb-TablePrefix.'users` SET `login_ip` = \'\' WHERE `login_when` < '.(time()-(60*84600)); +$sql = 'UPDATE `'.$oDb->TablePrefix.'users` SET `login_ip` = \'\' WHERE `login_when` < '.(time()-(60*84600)); $oDb->doQuery($sql); // --------------------------------------- Index: branches/2.8.x/wb/admin/skel/themes/htt/users.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/users.htt (revision 2098) +++ branches/2.8.x/wb/admin/skel/themes/htt/users.htt (revision 2099) @@ -4,7 +4,7 @@

{HEADING_MODIFY_DELETE_USER}

-
+ {FTAN}
Index: branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt (revision 2098) +++ branches/2.8.x/wb/admin/skel/themes/htt/users_form.htt (revision 2099) @@ -69,7 +69,7 @@ Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2098) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2099) @@ -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.4'); -if(!defined('REVISION')) define('REVISION', '2098'); +if(!defined('REVISION')) define('REVISION', '2099'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/users/user_list.php =================================================================== --- branches/2.8.x/wb/admin/users/user_list.php (revision 2098) +++ branches/2.8.x/wb/admin/users/user_list.php (revision 2099) @@ -26,9 +26,9 @@ function show_userlist($admin, &$aActionRequest) { + $oReg = WbAdaptor::getInstance(); $oDb = WbDatabase::getInstance(); $oTrans = Translate::getInstance(); - $oTrans->enableAddon('admin\\users'); $iUserStatus = (($admin->get_get('status') == 1) ? 0 : 1); unset($_GET); @@ -43,7 +43,7 @@ $oTpl->set_block("main_block", "manage_groups_block", "groups"); $oTpl->set_var($oTrans->getLangArray()); - $oTpl->set_var('ADMIN_URL', ADMIN_URL); + $oTpl->set_var('ADMIN_URL', $oReg->AcpUrl); $oTpl->set_var('FTAN', $admin->getFTAN()); $oTpl->set_var('USER_STATUS', $iUserStatus ); $oTpl->set_var('groups', ''); @@ -53,8 +53,8 @@ $oTpl->set_var('HEADING_MODIFY_USER', ''); $oTpl->set_var('DISPLAY_HOME_FOLDERS', ''); - $UserStatusActive = 'url('.THEME_URL.'/images/user.png)'; - $UserStatusInactive = 'url('.THEME_URL.'/images/user_red.png)'; + $UserStatusActive = 'url('.$oReg->ThemeUrl.'images/user.png)'; + $UserStatusInactive = 'url('.$oReg->ThemeUrl.'images/user_red.png)'; $sUserTitle = ($iUserStatus == 0) ? $oTrans->MENU_USERS.' '.mb_strtolower($oTrans->TEXT_ACTIVE, 'UTF-8') : $oTrans->MENU_USERS.' '.mb_strtolower($oTrans->TEXT_DELETED, 'UTF-8') ; @@ -117,9 +117,9 @@ ); // insert urls $oTpl->set_var(array( - 'ADMIN_URL' => ADMIN_URL, - 'WB_URL' => WB_URL, - 'THEME_URL' => THEME_URL + 'ADMIN_URL' => $oReg->AcpUrl, + 'WB_URL' => $oReg->AppUrl, + 'THEME_URL' => $oReg->ThemeUrl ) ); // Insert language text and messages @@ -179,12 +179,15 @@ $oTpl->set_block('main_block', 'show_add_loginname_block', 'show_add_loginname'); $oTpl->set_block('main_block', 'show_change_group_list_block', 'show_change_group_list'); - + $oTpl->se_var($oTrans->getLangArray()); $oTpl->parse('show_change_group_list', ''); // $oTpl->parse('show_change_group_list', 'show_change_group_list_block', true); $oTpl->set_var( array( - 'ACTION_URL' => ADMIN_URL.'/users/index.php', + 'ADMIN_URL' => $oReg->AcpUrl, + 'WB_URL' => $oReg->AppUrl, + 'THEME_URL' => $oReg->ThemeUrl, + 'ACTION_URL' => $oReg->AcpUrl.'users/index.php', 'FTAN' => $admin->getFTAN(), 'DISPLAY_EXTRA' => 'display:none;', 'ACTIVE_CHECKED' => ' checked="checked"', @@ -207,11 +210,8 @@ 'USERNAME' => '', 'DISPLAY_NAME' => '', 'EMAIL' => '', - 'ADMIN_URL' => ADMIN_URL, - 'WB_URL' => WB_URL, 'SUB_ACTION' => 'add', - 'CANCEL_URL' => $aActionRequest['cancel_url'], - 'THEME_URL' => THEME_URL + 'CANCEL_URL' => $aActionRequest['cancel_url'] ) ); @@ -261,13 +261,13 @@ } // Include the WB functions file - if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); } + if(!function_exists('directory_list')) { require($oReg->AppUrl.'framework/functions.php'); } // Add media folders to home folder list $oTpl->set_block('main_block', 'folder_list_block', 'folder_list'); - foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) { - $oTpl->set_var('NAME', str_replace(WB_PATH, '', $name)); - $oTpl->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)); + foreach(directory_list($oReg->AppPath.$oReg->MediaDir) AS $name) { + $oTpl->set_var('NAME', str_replace($oReg->AppPath, '', $name)); + $oTpl->set_var('FOLDER', str_replace($oReg->AppPath.$oReg->MediaDir, '', $name)); $oTpl->set_var('SELECTED', ' '); $oTpl->parse('folder_list', 'folder_list_block', true); } Index: branches/2.8.x/wb/admin/users/user_form.php =================================================================== --- branches/2.8.x/wb/admin/users/user_form.php (revision 2098) +++ branches/2.8.x/wb/admin/users/user_form.php (revision 2099) @@ -26,6 +26,7 @@ function show_usermask($admin, &$aActionRequest) { + $oReg = WbAdaptor::getInstance(); $oDb = WbDatabase::getInstance(); $oTrans = Translate::getInstance(); $oTrans->enableAddon('admin\\users'); @@ -61,7 +62,7 @@ $oTpl->parse('show_change_group_list', ''); } $oTpl->set_var( array( - 'ACTION_URL' => ADMIN_URL.'/users/index.php', + 'ACTION_URL' => $oReg->AcpUrl.'users/index.php', 'SUB_ACTION' => 'save', 'BACK_LINK' => (isset($aActionRequest['BackLink'])) ? $aActionRequest['BackLink'] : '', 'CANCEL_URL' => $aActionRequest['cancel_url'], @@ -72,9 +73,9 @@ 'USERNAME' => $user['username'], 'DISPLAY_NAME' => $user['display_name'], 'EMAIL' => $user['email'], - 'ADMIN_URL' => ADMIN_URL, - 'WB_URL' => WB_URL, - 'THEME_URL' => THEME_URL + 'ADMIN_URL' => $oReg->AcpUrl, + 'WB_URL' => $oReg->AppUrl, + 'THEME_URL' => $oReg->ThemeUrl ) ); @@ -146,20 +147,20 @@ // Generate username field name $username_fieldname = 'username_'.substr(base_convert(microtime(), 16, 36), 0, 8); // Work-out if home folder should be shown - if(!HOME_FOLDERS) { + if(!$oReg->HomeFolders) { $oTpl->set_var('DISPLAY_HOME_FOLDERS', 'display:none;'); } // Include the WB functions file - if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); } + if(!function_exists('directory_list')) { require($oReg->AppPath.'framework/functions.php'); } // Add media folders to home folder list $oTpl->set_block('main_block', 'folder_list_block', 'folder_list'); - foreach(directory_list(WB_PATH.MEDIA_DIRECTORY) AS $name) + foreach(directory_list($oReg->AppPath.$oReg->MediaDir) AS $name) { - $oTpl->set_var('NAME', str_replace(WB_PATH, '', $name)); - $oTpl->set_var('FOLDER', str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)); - if($user['home_folder'] == str_replace(WB_PATH.MEDIA_DIRECTORY, '', $name)) { + $oTpl->set_var('NAME', str_replace($oReg->AppPath, '', $name)); + $oTpl->set_var('FOLDER', str_replace($oReg->AppPath.$oReg->MediaDir, '', $name)); + if($user['home_folder'] == str_replace($oReg->AppPath.$oReg->MediaDir, '', $name)) { $oTpl->set_var('SELECTED', ' selected="selected"'); } else { $oTpl->set_var('SELECTED', ' '); Index: branches/2.8.x/wb/admin/users/delete.php =================================================================== --- branches/2.8.x/wb/admin/users/delete.php (revision 2098) +++ branches/2.8.x/wb/admin/users/delete.php (revision 2099) @@ -27,7 +27,6 @@ { $oDb = WbDatabase::getInstance(); $oTrans = Translate::getInstance(); - $oTrans->enableAddon('admin\\users'); $aUserID = array(); $bRetVal = false; Index: branches/2.8.x/wb/admin/users/index.php =================================================================== --- branches/2.8.x/wb/admin/users/index.php (revision 2098) +++ branches/2.8.x/wb/admin/users/index.php (revision 2099) @@ -33,12 +33,13 @@ function admin_users_index($aActionRequest) { + $oReg = WbAdaptor::getInstance(); $oDb = WbDatabase::getInstance(); $oTrans = Translate::getInstance(); $oTrans->enableAddon('admin\\users'); - $sAdminPath = dirname(str_replace('\\', '/', __FILE__)); - $sAdminName = basename($sAdminPath); + $sModulePath = rtrim(dirname(str_replace('\\', '/', __FILE__)), '/').'/'; + $sAdminName = basename($sModulePath); $output = ''; $aActionRequest['requestMethod'] = '_'.strtoupper($_SERVER['REQUEST_METHOD']); $action = 'show'; @@ -56,20 +57,20 @@ case 'delete_outdated': // delete Users awaiting activation case 'enable_outdated': // enable Users awaiting activation $admin = new admin('Access', 'users_delete',false); - include($sAdminPath.'/delete.php'); + include($sModulePath.'delete.php'); delete_user($admin,$aActionRequest); - $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php'; + $aActionRequest['cancel_url'] = $oReg->AcpUrl.'access/index.php'; $admin = new admin('Access', 'users'); - include($sAdminPath.'/user_list.php'); + include($sModulePath.'user_list.php'); $output .= show_userlist($admin, $aActionRequest); break; case 'add': // insert/update user $admin = new admin('Access', 'users_add',false); - include($sAdminPath.'/add.php'); + include($sModulePath.'add.php'); add_user($admin,$aActionRequest); - $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php'; + $aActionRequest['cancel_url'] = $oReg->AcpUrl.'access/index.php'; $admin = new admin('Access', 'users'); - include($sAdminPath.'/user_list.php'); + include($sModulePath.'user_list.php'); $output .= show_userlist($admin, $aActionRequest); break; case 'save': // insert/update user @@ -80,10 +81,10 @@ $aActionRequest['cancel_url'] = $sBackLink; $aActionRequest['BackLink'] = $sBackLink; } - include($sAdminPath.'/save.php'); + include($sModulePath.'save.php'); $user_id = save_user($admin, $aActionRequest); $admin = new admin('Access', 'users_modify'); - include($sAdminPath.'/user_form.php'); + include($sModulePath.'user_form.php'); $aActionRequest['user_id'] = $user_id; $output = show_usermask($admin,$aActionRequest); break; @@ -98,8 +99,8 @@ msgQueue::clear(); msgQueue::add($oTrans->MESSAGE_GENERIC_FORGOT_OPTIONS ); $aActionRequest['user_id'] = $user_id; - $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php'; - include($sAdminPath.'/user_list.php'); + $aActionRequest['cancel_url'] = $oReg->AcpUrl.'access/index.php'; + include($sModulePath.'user_list.php'); $output = show_userlist($admin, $aActionRequest); break; } @@ -107,7 +108,7 @@ if( ($user_id == $admin->get_user_id() ) ) { $sQueryString = (isset($_SERVER['QUERY_STRING'])&& ($_SERVER['QUERY_STRING']!='')) ? $_SERVER['QUERY_STRING'] : 'tool=uaerat'; - $admin->send_header(ADMIN_URL.'/preferences/index.php?'.$sQueryString); + $admin->send_header($oReg->AcpUrl.'preferences/index.php?'.$sQueryString); } $admin = new admin('Access', 'users_modify'); @@ -127,7 +128,7 @@ $aActionRequest['cancel_url'] = $sBackLink; $aActionRequest['BackLink'] = $sBackLink; } - include($sAdminPath.'/user_form.php'); + include($sModulePath.'user_form.php'); $output = show_usermask($admin,$aActionRequest); break; default: // show userlist with empty modify mask @@ -136,13 +137,13 @@ $user_id = intval($admin->checkIDKEY('user_id', 0, $_SERVER['REQUEST_METHOD'])); // Check if user id is a valid number and doesnt equal 1 $aActionRequest['user_id'] = $user_id; - $aActionRequest['cancel_url'] = ADMIN_URL.'/access/index.php'; + $aActionRequest['cancel_url'] = $oReg->AcpUrl.'access/index.php'; if($user_id > 1) // prevent 'admin' [ID 1] from modify { - include($sAdminPath.'/user_form.php'); + include($sModulePath.'user_form.php'); $output .= show_usermask($admin, $aActionRequest); } elseif($user_id == 0) { // if invalid UserID is called, fall back to 'show-mode' - include($sAdminPath.'/user_list.php'); + include($sModulePath.'user_list.php'); $output = show_userlist($admin, $aActionRequest); } endswitch; // end of switch