Index: trunk/admin/category/addcategory_permissions.php =================================================================== diff -u -N -r3668 -r3830 --- trunk/admin/category/addcategory_permissions.php (.../addcategory_permissions.php) (revision 3668) +++ trunk/admin/category/addcategory_permissions.php (.../addcategory_permissions.php) (revision 3830) @@ -74,7 +74,7 @@ $envar = "env=" . BuildEnv() . "&en=$en"; $section = 'in-portal:editcategory_permissions'; -$sec =& $objSections->GetSection($section); +$sec = $objSections->GetSection($section); if($c->Get("CategoryId")==0) { $sec->Set("left",NULL); Index: trunk/admin/include/sections.php =================================================================== diff -u -N -r3580 -r3830 --- trunk/admin/include/sections.php (.../sections.php) (revision 3580) +++ trunk/admin/include/sections.php (.../sections.php) (revision 3830) @@ -205,17 +205,17 @@ function GetSection($section) { - if(is_array($this->sections) && strlen($section)) - { - if(array_key_exists($section,$this->sections)) - { + if (is_array($this->sections) && strlen($section)) { + if (array_key_exists($section, $this->sections)) { return $this->sections[$section]; } - else - return NULL; + else { + return null; + } } - else - return NULL; + else { + return null; + } } function SetCurrentSection($section) Index: trunk/globals.php =================================================================== diff -u -N -r3736 -r3830 --- trunk/globals.php (.../globals.php) (revision 3736) +++ trunk/globals.php (.../globals.php) (revision 3830) @@ -865,15 +865,15 @@ { global $objSession, $objLanguageCache, $objLanguages; - if($LangId==0) - $LangId = $objSession->Get("Language"); - - if($LangId==0) - $LangId = $objLanguages->GetPrimary(); - - $translation = $objLanguageCache->GetTranslation($phrase,$LangId); - - return $translation; + if ($LangId == 0) { + $LangId = $objSession->Get('Language'); + } + + if ($LangId == 0) { + $LangId = $objLanguages->GetPrimary(); + } + + return $objLanguageCache->GetTranslation($phrase,$LangId); } function admin_language($phrase,$lang=0,$LinkMissing=FALSE) Index: trunk/core/kernel/utility/debugger.php =================================================================== diff -u -N -r3815 -r3830 --- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 3815) +++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 3830) @@ -656,7 +656,7 @@ } .dbg_flat_table TD { - border: 1px solid buttonface; + border: 1px solid #CCCCCC; padding: 4px; } @@ -1053,7 +1053,20 @@ $return .= ' '.$suffix; return $return; } - + + function printConstants($constants) + { + if (!is_array($constants)) { + $constants = explode(',', $constants); + } + $contant_tpl = '%s%s'; + $ret = ''; + foreach ($constants as $constant_name) { + $ret .= sprintf($contant_tpl, $constant_name, constant($constant_name)); + } + $ret .= '
'; + $this->appendHTML($ret); + } } if( !function_exists('memory_get_usage') ) Index: trunk/admin/category/addpermission_modules.php =================================================================== diff -u -N -r2853 -r3830 --- trunk/admin/category/addpermission_modules.php (.../addpermission_modules.php) (revision 2853) +++ trunk/admin/category/addpermission_modules.php (.../addpermission_modules.php) (revision 3830) @@ -157,7 +157,7 @@ $objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('category','CatEditStatus','$admin/category/addcategory_permissions.php',0);",$imagesURL."/toolbar/tool_select.gif"); $objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('category','CatEditStatus','".$admin."/category/addcategory_permissions.php',-1);", $imagesURL."/toolbar/tool_cancel.gif"); -$sec =& $objSections->GetSection($section); +$sec = $objSections->GetSection($section); if($c->Get("CategoryId")==0) { $sec->Set("left",NULL); Index: trunk/kernel/startup.php =================================================================== diff -u -N -r3522 -r3830 --- trunk/kernel/startup.php (.../startup.php) (revision 3522) +++ trunk/kernel/startup.php (.../startup.php) (revision 3830) @@ -15,13 +15,19 @@ # New path detection method: end // KENEL4 INIT: BEGIN - if($FrontEnd != 1 && !defined('ADMIN') ) define('ADMIN', 1); + if ($FrontEnd != 1 && !defined('ADMIN') ) { + define('ADMIN', 1); + } - if( !defined('APPLICATION_CLASS') ) define('APPLICATION_CLASS', 'MyApplication'); + if ( !defined('APPLICATION_CLASS') ) { + define('APPLICATION_CLASS', 'MyApplication'); + } include_once(FULL_PATH.'/kernel/kernel4/startup.php'); // just to make sure that this is correctly detected - if( IsDebugMode() ) $debugger->appendHTML('FULL_PATH: '.FULL_PATH.''); + if ( IsDebugMode() ) { + $debugger->printConstants('FULL_PATH,SQL_DB'); + } $application =& kApplication::Instance(); $application->Init(); Index: trunk/admin/category/addpermission.php =================================================================== diff -u -N -r2853 -r3830 --- trunk/admin/category/addpermission.php (.../addpermission.php) (revision 2853) +++ trunk/admin/category/addpermission.php (.../addpermission.php) (revision 3830) @@ -125,7 +125,7 @@ $objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('category','CatEditStatus','".$admin."/category/addpermission_modules.php',0);",$imagesURL."/toolbar/tool_select.gif"); //$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('category','admin/category/addpermission_modules.php',-1);", $imagesURL."/toolbar/tool_cancel.gif"); $objListToolBar->Add("img_cancel", "la_Cancel",$back_url,"swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","", $imagesURL."/toolbar/tool_cancel.gif"); -$sec =& $objSections->GetSection($section); +$sec = $objSections->GetSection($section); if($c->Get("CategoryId")==0) {