Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1769) +++ branches/2.8.x/CHANGELOG (revision 1770) @@ -13,6 +13,13 @@ +24 Sep-2012 Build 1770 Dietmar Woellbrink (Luisehahne) +# fixed issues with database names + WbDatabase::getTableEngine() changed SQL statement to strikt. +! remove empty warning box if you aren't sysadmin +! change order errorhandling in installation save.php +# typofix in news/upgrade.php $MESSAGE +! Framework/frontend.functions.php change file_exists to is_readable 23 Sep-2012 Build 1769 Dietmar Woellbrink (Luisehahne) # typofix in upgrade-script, fixed wrong count for language and modules folder 23 Sep-2012 Build 1768 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/start/index.php =================================================================== --- branches/2.8.x/wb/admin/start/index.php (revision 1769) +++ branches/2.8.x/wb/admin/start/index.php (revision 1770) @@ -85,8 +85,7 @@ // workout to upgrade the groups system_permissions // --------------------------------------- if( ($admin->get_user_id()==1) && - file_exists(ADMIN_PATH.'/groups/upgradePermissions.php') && - !defined('GROUPS_UPDATED') ) + 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\''; @@ -235,7 +234,7 @@ // Check if installation directory still exists if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) { // Check if user is part of Adminstrators group - if(in_array(1, $admin->get_groups_id())) + if($admin->get_user_id()==1) { $oTpl->set_var('WARNING', $msg ); } else { Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1769) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1770) @@ -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', '1769'); +if(!defined('REVISION')) define('REVISION', '1770'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/WbDatabase.php =================================================================== --- branches/2.8.x/wb/framework/WbDatabase.php (revision 1769) +++ branches/2.8.x/wb/framework/WbDatabase.php (revision 1770) @@ -396,7 +396,7 @@ $retVal = false; $mysqlVersion = mysql_get_server_info($this->_db_handle); $engineValue = (version_compare($mysqlVersion, '5.0') < 0) ? 'Type' : 'Engine'; - $sql = "SHOW TABLE STATUS FROM " . $this->_db_name . " LIKE '" . $table . "'"; + $sql = 'SHOW TABLE STATUS FROM `' . $this->_db_name . '` LIKE \'' . $table . '\''; if(($result = $this->query($sql, $this->_db_handle))) { if(($row = $result->fetchRow(MYSQL_ASSOC))) { $retVal = $row[$engineValue]; Index: branches/2.8.x/wb/framework/frontend.functions.php =================================================================== --- branches/2.8.x/wb/framework/frontend.functions.php (revision 1769) +++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1770) @@ -39,21 +39,22 @@ if(($resSnippets = $database->query($sql))) { while($recSnippet = $resSnippets->fetchRow()) { $module_dir = $recSnippet['directory']; - if (file_exists(WB_PATH.'/modules/'.$module_dir.'/include.php')) { + if (is_readable(WB_PATH.'/modules/'.$module_dir.'/include.php')) { include(WB_PATH.'/modules/'.$module_dir.'/include.php'); // check if frontend.css file needs to be included into the of index.php - if( file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend.css')) { + + if( is_readable(WB_PATH .'/modules/'.$module_dir.'/frontend.css')) { $include_head_link_css .= ' of index.php - if(file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend.js')) { + if(is_readable(WB_PATH .'/modules/'.$module_dir.'/frontend.js')) { $include_head_links .= ''."\n"; $include_head_file = 'frontend.js'; } // check if frontend_body.js file needs to be included into the of index.php - if(file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend_body.js')) { + if(is_readable(WB_PATH .'/modules/'.$module_dir.'/frontend_body.js')) { $include_body_links .= ''."\n"; $include_body_file = 'frontend_body.js'; } @@ -468,12 +469,12 @@ $jquery_links .= ''."\n"; /* workout to insert ui.css and theme */ $jquery_theme = WB_PATH.'/modules/jquery/jquery_theme.js'; - $jquery_links .= file_exists($jquery_theme) + $jquery_links .= is_readable($jquery_theme) ? ''."\n" : ''."\n"; /* workout to insert plugins functions, set in templatedir */ $jquery_frontend_file = TEMPLATE_DIR.'/jquery_frontend.js'; - $jquery_links .= file_exists(str_replace( WB_URL, WB_PATH, $jquery_frontend_file)) + $jquery_links .= is_readable(str_replace( WB_URL, WB_PATH, $jquery_frontend_file)) ? ''."\n" : ''; } @@ -525,7 +526,7 @@ while($row = $query_modules->fetchRow()) { // check if page module directory contains a frontend_body.js file - if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) + if(is_readable(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) { // create link with frontend_body.js source for the current module $tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link); @@ -603,7 +604,7 @@ while($row = $query_modules->fetchRow()) { // check if page module directory contains a frontend.js or frontend.css file - if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) + if(is_readable(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) { // create link with frontend.js or frontend.css source for the current module $tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link); @@ -637,25 +638,3 @@ print $head_links; } } -/* - function moveCssToHead($content) { - // move css definitions into head section - $pattern1 = '/(?:]*?\"text\/css\".*?\/>)/si'; - $pattern2 = '/(?:]*?\"text\/css\"[^>]* ?>.*?<\/style>)/si'; - while(preg_match($pattern1, $content, $matches)==1) { - // loop through all linked CSS - $insert = $matches[1]; - $content = str_replace($insert, '', $content); - $insert = "\n".$insert."\n\n.*?\n.*?print_error($MESSAGE['RECORD_MODIFIED_FAILED']); - $msg[] = $$MESSAGE['RECORD_MODIFIED_FAILED']; + $msg[] = $MESSAGE['RECORD_MODIFIED_FAILED']; return $msg; } } @@ -100,7 +100,7 @@ return; }else { // $admin->print_error($MESSAGE['RECORD_MODIFIED_FAILED']); - $msg[] = $$MESSAGE['RECORD_MODIFIED_FAILED']; + $msg[] = $MESSAGE['RECORD_MODIFIED_FAILED']; return $msg; } }