[Phpgroupware-cvs] preferences preferences.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    preferences
Changes by:     Dave Hall <skwashd>     06/09/25 13:08:19

Modified files:
        .              : preferences.php 

Log message:
        some but not all notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/preferences/preferences.php?cvsroot=phpgroupware&r1=1.40&r2=1.41

Patches:
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- preferences.php     19 Sep 2006 13:21:32 -0000      1.40
+++ preferences.php     25 Sep 2006 13:08:19 -0000      1.41
@@ -2,10 +2,10 @@
        /**
        * Preferences
        *
-       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @copyright Copyright (C) 2000-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package preferences
-       * @version $Id: preferences.php,v 1.40 2006/09/19 13:21:32 skwashd Exp $
+       * @version $Id: preferences.php,v 1.41 2006/09/25 13:08:19 skwashd Exp $
        */
 
        $GLOBALS['phpgw_info']['flags'] = array
@@ -14,13 +14,13 @@
                'noappheader'             => true,
                'nonavbar'                => true,
                'currentapp'              => isset($_GET['appname']) ? 
$_GET['appname'] : '',
-               'enable_nextmatchs_class' => true
+               'enable_nextmatchs'             => true
        );
        
        /**
         * Include phpgroupware header
         */
-       include('../header.inc.php');
+       include_once('../header.inc.php');
        
        if ( isset($_POST['cancel']) && $_POST['cancel'] )
        {
@@ -67,7 +67,7 @@
        }
 
        /**
-        * 
+        * Is the current value forced
         * 
         * @param $_appname
         * @param $preference_name
@@ -283,10 +283,11 @@
                                break;
                }
                $s .= create_option_string($default,$values);
-               if ($GLOBALS['type'] == 'user')
+               $def_text = '';
+               if ($GLOBALS['type'] == 'user' && 
isset($GLOBALS['phpgw']->preferences->default[$_appname][$name]) )
                {
                        $def_text = 
$GLOBALS['phpgw']->preferences->default[$_appname][$name];
-                       $def_text = $def_text != '' ? ' <i><font 
size="-1">'.lang('default').':&nbsp;'.$values[$def_text].'</font></i>' : '';
+                       $def_text = $def_text != '' ? ' 
<i>'.lang('default').':&nbsp;'.$values[$def_text].'</i>' : '';
                }
                $t->set_var('row_value',"<select 
name=\"${GLOBALS['type']}[$name]\">$s</select>$def_text");
                $t->set_var('row_name',lang($label));
@@ -331,7 +332,7 @@
                        }
                        $help .= "</p>\n";
                }
-               if ($row == 1)
+               if ($rows == 1)
                {
                        
create_input_box($label,$name,$help,$default,$cols,'','',False);
                }
@@ -584,8 +585,6 @@
 
        $t->set_var('messages',$error);
        
$t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php',
 array('appname'=> $_GET['appname'])));
-       $t->set_var('th_bg',  $GLOBALS['phpgw_info']['theme']['th_bg']);
-       $t->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
 
        switch ($GLOBALS['type'])       // set up some globals to be used by 
the hooks
        {
@@ -668,5 +667,5 @@
        
        //echo '<pre style="text-align: left;">'; 
print_r($GLOBALS['phpgw']->preferences->data); echo "</pre>\n";
        
-       $GLOBALS['phpgw']->common->phpgw_footer();
+       $GLOBALS['phpgw']->common->phpgw_footer(true);
 ?>