[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/07/09 11:46:11

Modified files:
        inc            : class.common.inc.php 

Log message:
        fix issue with apps with no icon disappearing and tip another table

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.common.inc.php?cvsroot=phpgwapi&r1=1.234&r2=1.235

Patches:
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -b -r1.234 -r1.235
--- class.common.inc.php        27 Jun 2006 13:03:03 -0000      1.234
+++ class.common.inc.php        9 Jul 2006 11:46:11 -0000       1.235
@@ -8,20 +8,9 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: class.common.inc.php,v 1.234 2006/06/27 13:03:03 
sigurdne Exp $
+       * @version $Id: class.common.inc.php,v 1.235 2006/07/09 11:46:11 
skwashd Exp $
        */
 
-       $d1 = strtolower(@substr(PHPGW_API_INC,0,3));
-       $d2 = strtolower(@substr(PHPGW_SERVER_ROOT,0,3));
-       $d3 = strtolower(@substr(PHPGW_APP_INC,0,3));
-       if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3 
== 'htt' || $d3 == 'ftp')
-       {
-               echo 'Failed attempt to break in via an old Security 
Hole!<br>'."\n";
-               exit;
-       }
-       unset($d1);unset($d2);unset($d3);
-
-
        /**
        * Commononly used functions
        *
@@ -452,7 +441,7 @@
                        {
                                $icon = 
$this->image($appname,'navbar','',($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']=='funkwerk'?True:False));
 
-                               if ( is_array($file) && count($file) )
+                               if ( count($file) )
                                {
                                        foreach ( $file as $text => $url )
                                        {
@@ -464,16 +453,7 @@
                                        }
                                }
 
-                               if ($icon)
-                               {
-                                       $pref = 'app_row_icon';
-                               }
-                               else
-                               {
-                                       $pref = 'app_row_noicon';
-                               }
-
-                               $this->output[$pref][] = array
+                               $this->output['app_row_icon'][] = array
                                (
                                        'layout'        => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'],
                                        'app_title'     => lang($appname),