[Phpgroupware-cvs] CVS: phpgwapi/inc class.Template.inc.php,1.21,1.22 class.common.inc.php,1.135,1.136 functions.inc.php,1.137,1.138

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv20291/phpgwapi/inc

Modified Files:
        class.Template.inc.php class.common.inc.php functions.inc.php 
Log Message:
added msgbox and now have templates class auto add the navbar values

Index: class.Template.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.Template.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.Template.inc.php      24 May 2002 10:38:02 -0000      1.21
--- class.Template.inc.php      24 May 2002 19:15:24 -0000      1.22
***************
*** 50,56 ****
                 * unknowns: how to handle unknown variables.
                 */
!               function Template($root = '.', $unknowns = 'remove', $print = 
False)
                {
!                       if ($print)
                        {
                                $this->print = True;
--- 50,56 ----
                 * unknowns: how to handle unknown variables.
                 */
!               function Template($root = '.', $unknowns = 'remove')
                {
!                       if(@isset($GLOBALS['phpgw_info']['flags']['printview']) 
&& $GLOBALS['phpgw_info']['flags']['printview'] == True)
                        {
                                $this->print = True;
***************
*** 63,66 ****
--- 63,80 ----
                        }
  
+                       /* This covers setting the theme values so that each 
app doesnt have to */
+                       $theme_data = $GLOBALS['phpgw_info']['theme'];
+                       unset($theme_data['css']);
+                       $this->set_var($theme_data);
+                       unset($theme_data);
+                       $this->update_css();
+ 
+                       /* Now move on to loading up the requested template set 
*/
+                       $this->set_root($root);
+                       $this->set_unknowns($unknowns);
+               }
+               
+               function update_css()
+               {
                        if(@is_array($GLOBALS['phpgw_info']['theme']['css']))
                        {
***************
*** 75,84 ****
                                $this->set_var('phpgw_css',$css_string);
                        }
- 
-                       /* Now move on to loading up the requested template set 
*/
-                       $this->set_root($root);
-                       $this->set_unknowns($unknowns);
                }
! 
                /* public: setroot(pathname $root)
                 * root:   new template directory.
--- 89,94 ----
                                $this->set_var('phpgw_css',$css_string);
                        }
                }
!               
                /* public: setroot(pathname $root)
                 * root:   new template directory.

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -r1.135 -r1.136
*** class.common.inc.php        24 May 2002 10:38:02 -0000      1.135
--- class.common.inc.php        24 May 2002 19:15:24 -0000      1.136
***************
*** 968,971 ****
--- 968,1057 ----
  
                /*!
+               @function msgbox
+               @abstract Generate a consistant msgbox for app apps to use
+               @discussion makes it easier and more consistant to generate 
message boxes
+               */
+ 
+               function msgbox($text='',$type=True,$output='return')
+               {
+                       if ($text=='' && 
@isset($GLOBALS['phpgw_info']['flags']['msgbox_data']))
+                       {
+                               $text = 
$GLOBALS['phpgw_info']['flags']['msgbox_data'];
+                               
unset($GLOBALS['phpgw_info']['flags']['msgbox_data']);
+                       }
+                       elseif($text=='')
+                       {
+                               return;
+                       }
+                       
$GLOBALS['phpgw']->template->set_block('common','msgbox_start');
+                       
$GLOBALS['phpgw']->template->set_block('common','msgbox_row');
+                       
$GLOBALS['phpgw']->template->set_block('common','msgbox_end');
+                       
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_start');
+                       
+                       if (is_array($text))
+                       {
+                               reset($text);
+                               $row = 1;
+                               while (list($key,$value) = each($text))
+                               {
+                                       if ($value == True)
+                                       {
+                                               $type_img = 'good';
+                                               $type_img_alt = 'O';
+                                       }
+                                       else
+                                       {
+                                               $type_img = 'bad';
+                                               $type_img_alt = 'X';
+                                       }
+                                       if ($row == 1)
+                                       {
+                                               
$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
+                                               $row = 2;
+                                       }
+                                       else
+                                       {
+                                               
$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_off']);
+                                               $row = 1;
+                                       }
+ 
+                                       
$GLOBALS['phpgw']->template->set_var('msgbox_text',$key);
+                                       
$GLOBALS['phpgw']->template->set_var('msgbox_img',$type_img);
+                                       
$GLOBALS['phpgw']->template->set_var('msgbox_img_alt',$type_img_alt);
+                                       
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row',True);
+                               }
+                       }
+                       else
+                       {
+                               if ($type == True)
+                               {
+                                       $type_img = 'good';
+                                       $type_img_alt = 'O';
+                               }
+                               else
+                               {
+                                       $type_img = 'bad';
+                                       $type_img_alt = 'X';
+                               }
+                               
$GLOBALS['phpgw']->template->set_var('msgbox_row_color',$GLOBALS['phpgw_info']['theme']['row_on']);
+                               
$GLOBALS['phpgw']->template->set_var('msgbox_text',$text);
+                               
$GLOBALS['phpgw']->template->set_var('msgbox_img',$type_img);
+                               
$GLOBALS['phpgw']->template->set_var('msgbox_img_alt',$type_img_alt);
+                               
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_row',True);
+                       }
+                       
$GLOBALS['phpgw']->template->fp('msgbox','msgbox_end',True);
+ 
+                       if($output == 'out')
+                       {
+                               $GLOBALS['phpgw']->template->pfp('out', 
'msgbox');
+                               return;
+                       }
+                       else /* covers the default of 'return' */
+                       {
+                               return 
$GLOBALS['phpgw']->template->varvals['msgbox'];
+                       }
+               }
+               
+               /*!
                @function navbar
                @abstract Build the application navigation bar based on user's 
accessible applications
***************
*** 1101,1106 ****
                        if (address@hidden'phpgw_info']['flags']['noheader'] && 
address@hidden'phpgw_info']['flags']['nonavbar'])
                        {
                                
$GLOBALS['phpgw']->hooks->process('after_navbar');
-                               //echo '<table><tr><td>msgbox goes 
here</td></tr></table>';
                        }
                }
--- 1187,1192 ----
                        if (address@hidden'phpgw_info']['flags']['noheader'] && 
address@hidden'phpgw_info']['flags']['nonavbar'])
                        {
+                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Access not permitted']=False;
                                
$GLOBALS['phpgw']->hooks->process('after_navbar');
                        }
                }

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -r1.137 -r1.138
*** functions.inc.php   24 May 2002 10:38:02 -0000      1.137
--- functions.inc.php   24 May 2002 19:15:24 -0000      1.138
***************
*** 441,449 ****
                                ! 
$GLOBALS['phpgw_info']['user']['apps']['admin']))
                        {
-                               $GLOBALS['phpgw']->common->phpgw_header(False, 
False);
- 
                                
$GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access 
%1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));
  
!                               echo '<p><center><b>'.lang('Access not 
permitted').'</b></center>';
                                $GLOBALS['phpgw']->common->phpgw_exit(True);
                        }
--- 441,448 ----
                                ! 
$GLOBALS['phpgw_info']['user']['apps']['admin']))
                        {
                                
$GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access 
%1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));
  
!                               
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Access not permitted']=False;
!                               $GLOBALS['phpgw']->common->phpgw_header();
                                $GLOBALS['phpgw']->common->phpgw_exit(True);
                        }