Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2067) +++ branches/2.8.x/CHANGELOG (revision 2068) @@ -11,6 +11,9 @@ ! = Update/Change =============================================================================== +03 Jan-2014 Build 2068 Manuela v.d.Decken(DarkViper) +# admin/users/user_list corrected multibyte handling +# Droplet - iEditThisPage: copy/past error fixed (object reference) 02 Jan-2014 Build 2067 Dietmar Woellbrink (Luisehahne) + /admin/users/languages/ 20 Language Files added (Tks To jacobi22) 02 Jan-2014 Build 2066 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2067) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2068) @@ -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', '2067'); +if(!defined('REVISION')) define('REVISION', '2068'); 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 2067) +++ branches/2.8.x/wb/admin/users/user_list.php (revision 2068) @@ -54,7 +54,8 @@ $UserStatusActive = 'url('.THEME_URL.'/images/user.png)'; $UserStatusInactive = 'url('.THEME_URL.'/images/user_red.png)'; - $sUserTitle = ($iUserStatus == 0) ? $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_ACTIVE) : $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_DELETED) ; + $sUserTitle = ($iUserStatus == 0) ? $mLang->MENU_USERS.' '.mb_strtolower($mLang->TEXT_ACTIVE, 'UTF-8') + : $mLang->MENU_USERS.' '.mb_strtolower($mLang->TEXT_DELETED, 'UTF-8') ; $oTpl->set_var('TEXT_USERS', $sUserTitle.' '.$mLang->TEXT_SHOW ); $oTpl->set_var('STATUS_ICON', ( ($iUserStatus==0) ? $UserStatusActive : $UserStatusInactive) ); @@ -73,7 +74,8 @@ } $sUserList = $mLang->TEXT_LIST_OPTIONS.' '; - $sUserList .= ($iUserStatus == 1) ? $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_ACTIVE) : $mLang->MENU_USERS.' '.strtolower($mLang->TEXT_DELETED) ; + $sUserList .= ($iUserStatus == 1) ? $mLang->MENU_USERS.' '.mb_strtolower($mLang->TEXT_ACTIVE, 'UTF-8') + : $mLang->MENU_USERS.' '.mb_strtolower($mLang->TEXT_DELETED, 'UTF-8') ; // Insert values into the modify/remove menu $oTpl->set_block('main_block', 'list_block', 'list'); if($oRes->numRows() > 0) { @@ -106,7 +108,8 @@ $oTpl->set_var('DISPLAY_DELETE', 'hide'); } $HeaderTitle = (($iUserStatus == 1) ? $mLang->HEADING_MODIFY_ACTIVE_USER : $mLang->HEADING_MODIFY_DELETE_USER ).' '; - $HeaderTitle .= (($iUserStatus == 1) ? strtolower($mLang->TEXT_ACTIVE) : strtolower($mLang->TEXT_INACTIVE)); + $HeaderTitle .= (($iUserStatus == 1) ? mb_strtolower($mLang->TEXT_ACTIVE, 'UTF-8') + : mb_strtolower($mLang->TEXT_INACTIVE, 'UTF-8')); // Insert language headings $oTpl->set_var(array( 'HEADING_MODIFY_DELETE_USER' => $HeaderTitle, @@ -144,7 +147,7 @@ // $oTpl->set_var('NAME', 'User waiting for activation'); // $oTpl->set_var('STATUS', '' ); // Loop through users - if($nNumRows = $oRes->numRows()) { + if(($nNumRows = $oRes->numRows())) { while($aUser = $oRes->fetchRow(MYSQL_ASSOC)) { $oTpl->set_var('CVALUE',$admin->getIDKEY($aUser['user_id'])); $oTpl->set_var('CSTATUS', '') ; Index: branches/2.8.x/wb/modules/droplets/example/iEditThisPage.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/iEditThisPage.php (revision 2067) +++ branches/2.8.x/wb/modules/droplets/example/iEditThisPage.php (revision 2068) @@ -2,47 +2,43 @@ //:Use: [[iEditThisPage?show=7]]. You can format the appearance using CSS-class 'div.iEditThisPage' in your basic-css file // @author: Werner von der Decken - global $wb, $database, $HEADING; + global $wb; + $oReg = WbAdaptor::getInstance(); + $oDb = WbDatabase::getInstance(); + $oTrans = Translate::getInstance(); $returnvalue = ''; - if($wb->is_authenticated() ) - { + if ($wb->is_authenticated()) { $is_admin = false; $page_id = PAGE_ID == 0 ? $wb->default_page_id : PAGE_ID; $user_id = $wb->get_user_id(); - $sql = 'SELECT `admin_users`, `admin_groups` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; - if(($rset = $database->query($sql)) != null) - { - if(($rec = $rset->fetchRow()) != null) - { + $sql = 'SELECT `admin_users`, `admin_groups` ' + . 'FROM `'.$oDb->TablePrefix.'pages` ' + . 'WHERE `page_id` = '.$page_id; + if (($rset = $oDb->doQuery($sql)) != null) { + if (($rec = $rset->fetchRow(MYSQL_ASSOC)) != null) { $is_admin = ($wb->ami_group_member($rec['admin_groups']) || - ($this->is_group_match($user_id, $rec['admin_users'])) ); + ($wb->is_group_match($user_id, $rec['admin_users'])) ); } } - if($is_admin) - { - $tpl = ''; - $tpl .= '%2$s'; + if ($is_admin) { + $tpl = '' + . '%2$s'; $show = ((!isset($show) || $show == '') ? 1 : (int)$show); $show = ($show > 7 ? 7 : (int)$show); $show = ($show < 2 ? 1 : (int)$show ); - if($show & 1) - { - $returnvalue .= sprintf($tpl, 'modify', $HEADING['MODIFY_PAGE'], 'edit'); + if ($show & 1) { + $returnvalue .= sprintf($tpl, 'modify', $oTrans->HEADING_MODIFY_PAGE, 'edit'); } $sys_perm = $wb->get_session('SYSTEM_PERMISSIONS'); - if(@is_array($sys_perm)) - { - if(($show & 2) && (array_search('pages_settings', $sys_perm)!==false)) - { - $returnvalue .= sprintf($tpl, 'settings', $HEADING['MODIFY_PAGE_SETTINGS'], 'modify'); + if (@is_array($sys_perm)) { + if (($show & 2) && (array_search('pages_settings', $sys_perm)!==false)) { + $returnvalue .= sprintf($tpl, 'settings', $oTrans->HEADING_MODIFY_PAGE_SETTINGS, 'modify'); } - if(($show & 4) && (array_search('pages_modify', $sys_perm)!==false)) - { - $returnvalue .= sprintf($tpl, 'sections', $HEADING['MANAGE_SECTIONS'], 'sections'); + if (($show & 4) && (array_search('pages_modify', $sys_perm)!==false)) { + $returnvalue .= sprintf($tpl, 'sections', $oTrans->HEADING_MANAGE_SECTIONS, 'sections'); } } - if($returnvalue != '') - { + if ($returnvalue != '') { $returnvalue = '
'.$returnvalue.'
'; } }