[Phpgroupware-cvs] calendar/templates/default header.inc.php,1.29

[skwashd]

Update of calendar/templates/default

Modified Files:
     Branch: MAIN
            header.inc.php lines: +23 -29

Log Message:
fix bug #15168 and remove useless probiz header.inc.php

====================================================
Index: calendar/templates/default/header.inc.php
diff -u calendar/templates/default/header.inc.php:1.28 
calendar/templates/default/header.inc.php:1.29
--- calendar/templates/default/header.inc.php:1.28      Sun Oct 23 12:57:16 2005
+++ calendar/templates/default/header.inc.php   Thu Dec  8 09:57:41 2005
@@ -59,11 +59,8 @@

        add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('year','&date='.$today),'year',lang('This
 Year')).'</td>');

-       if(floor(phpversion()) >= 4)
-       {
-               add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
-               $col_width += 2;
-       }
+       add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
+       $col_width += 2;

        add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily 
Matrix View')).'</td>');

@@ -166,33 +163,30 @@
                        $tpl->parse('header_column','head_col',True);
                }

-               
if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || 
!$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && 
count($this->bo->grants) > 0)
+               $form_options = '';
+               $drop_down = $this->bo->list_cals();
+               foreach($drop_down as $key => $grant)
                {
-                       $form_options = '';
-                       $drop_down = $this->bo->list_cals();
-                       foreach($drop_down as $key => $grant)
+                       if ( $grant['value'] && $grant['name'] )//stop empties 
showing up
                        {
-                               if ( $grant['value'] && $grant['name'] )//stop 
empties showing up
-                               {
-                                       $form_options .= "<option 
value=\"{$grant['value']}\" "
-                                                               . 
($grant['value'] == $this->bo->owner ? 'selected="selected"' : '') . '>'
-                                                               . 
"{$grant['name']}</option>\n";
-                               }
+                               $form_options .= "<option 
value=\"{$grant['value']}\" "
+                                                       . ($grant['value'] == 
$this->bo->owner || $grant['value'] == "g_{$this->bo->owner}" ? 
'selected="selected"' : '') . '>'
+                                                       . 
"{$grant['name']}</option>\n";
                        }
-
-                       $var = array(
-                               'form_width' => $remainder,
-                               'form_link'     => $this->page($referrer),
-                               'form_name'     => 'owner',
-                               'title' => lang('User'),
-                               'hidden_vars'   => $base_hidden_vars,
-                               'form_options'  => $form_options,
-                               'button_value'  => lang('Go!')
-                       );
-                       $tpl->set_var($var);
-                       
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
-                       $tpl->parse('header_column','head_col',True);
                }
+
+               $var = array(
+                       'form_width' => $remainder,
+                       'form_link'     => $this->page($referrer),
+                       'form_name'     => 'owner',
+                       'title' => lang('User'),
+                       'hidden_vars'   => $base_hidden_vars,
+                       'form_options'  => $form_options,
+                       'button_value'  => lang('Go!')
+               );
+               $tpl->set_var($var);
+               $tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+               $tpl->parse('header_column','head_col',True);
        }

        $hidden_vars = '    <input type="hidden" name="from" 
value="'.$_GET['menuaction'].'">'."\n";