Index: trunk/kernel/admin_templates/incs/footer.tpl =================================================================== diff -u -N -r1566 -r1715 --- trunk/kernel/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 1566) +++ trunk/kernel/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 1715) @@ -1,3 +1,4 @@ +

Index: trunk/kernel/admin_templates/img/icons/icon46_list_in-commerce.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/admin_templates/img/icons/icon24_in-commerce.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/admin/include/summary/root.php =================================================================== diff -u -N -r23 -r1715 --- trunk/kernel/admin/include/summary/root.php (.../root.php) (revision 23) +++ trunk/kernel/admin/include/summary/root.php (.../root.php) (revision 1715) @@ -90,9 +90,13 @@ $pending_col_2 = ''; foreach($pending_source as $module_name => $pending_items) +{ foreach($pending_items as $p_item) + { $all_pending[] = $p_item; - + } +} + if( count($all_pending) % 2 ) $all_pending[] = 'empty'; $ItemCount = count($all_pending); @@ -130,7 +134,23 @@ function PendingCell($params, $class, &$pending_count) { - $pending_count = $GLOBALS[ $params['list_var_name'] ]->CountPending(); + $list_name = getArrayValue($params, 'list_var_name'); + + $prefix_pos = strpos($list_name, ':'); + if( $prefix_pos !== false) + { + global $application; + $prefix = substr($list_name, $prefix_pos+1, strlen($list_name) ); + $table =& $application->getUnitOption($prefix, 'TableName'); + $sql = 'SELECT COUNT(*) FROM %s WHERE Status = 2'; + + $pending_count = $application->DB->GetOne( sprintf($sql, $table) ); + } + else + { + $pending_count = $GLOBALS[ $params['list_var_name'] ]->CountPending(); + } + $o = ''."\n"; $o .= ''."\n"; $o .= ''."\n"; Index: trunk/kernel/admin_templates/img/icons/icon46_in-commerce.gif =================================================================== diff -u -N Binary files differ Index: trunk/admin/subitems.php =================================================================== diff -u -N -r1706 -r1715 --- trunk/admin/subitems.php (.../subitems.php) (revision 1706) +++ trunk/admin/subitems.php (.../subitems.php) (revision 1715) @@ -1,104 +1,51 @@ Init(); + // KERNEL4 INI: END -require_once($pathtoroot."kernel/startup.php"); + // IN-PORTAL INIT: BEGIN + $g_TablePrefix = TABLE_PREFIX; + $pathtoroot = DOC_ROOT.BASE_PATH.'/'; + require_once DOC_ROOT.BASE_PATH.'/kernel/startup.php'; + // IN-PORTAL INIT: END -$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path"); + $rootURL = $application->BaseURL(); + $admin = ADMIN_DIR; + $localURL = $rootURL.'kernel/'; + $adminURL = $rootURL.$admin; + $imagesURL = $adminURL.'/images'; -$admin = $objConfig->Get("AdminDirectory"); -//echo "Admin: $admin
\n"; -if(!strlen($admin)) - $admin = "admin"; + $cssURL = $adminURL.'/include'; + $jsURL = $adminURL.'/include/subitems'; + + //admin only util + $pathtolocal = $pathtoroot.'kernel/'; + require_once ($pathtoroot.$admin.'/include/elements.php'); + require_once($pathtoroot.$admin.'/toolbar.php'); + $section = $application->GetVar('section'); + + $sectionname = explode(":", $section); + $sectionname = $sectionname[sizeof($sectionname)-1]; -$localURL=$rootURL."kernel/"; -$adminURL=$rootURL.$admin; -$imagesURL = $adminURL."/images"; + $incs = Array(); -$cssURL = $adminURL."/include"; -$jsURL = $adminURL."/include/subitems"; -//admin only util + $m = GetModuleArray(); + foreach($m as $key => $value) + { + $inc = $pathtoroot.$value."admin/include/summary/".$sectionname.".php"; +// echo "
". $inc ."

"; + if( file_exists($inc) ) $incs[] = $inc; + } -$pathtolocal = $pathtoroot."kernel/"; -require_once ($pathtoroot.$admin."/include/elements.php"); -//require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -//require_once ($pathtolocal."admin/include/navmenu.php"); -require_once($pathtoroot.$admin."/toolbar.php"); -$section = $_GET["section"]; - -$sectionname = explode(":", $section); -$sectionname = $sectionname[sizeof($sectionname)-1]; - -$incs = array(); - -$m = GetModuleArray(); -foreach($m as $key=>$value) -{ - $inc = $pathtoroot.$value."admin/include/summary/".$sectionname.".php"; - //echo "
". $inc ."

"; - if(file_exists($inc)) - $incs[] = $inc; -} - -$envar = BuildEnv(); -$charset = GetRegionalOption('Charset'); + $envar = BuildEnv(); + $charset = GetRegionalOption('Charset'); + print << @@ -193,4 +140,7 @@ - +Done(); +?> \ No newline at end of file