[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.uipro...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/09/27 11:20:53

Modified files:
        inc            : class.bocommon.inc.php class.uiproject.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35

Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- class.bocommon.inc.php      27 Sep 2006 10:51:08 -0000      1.40
+++ class.bocommon.inc.php      27 Sep 2006 11:20:52 -0000      1.41
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.bocommon.inc.php,v 1.40 2006/09/27 10:51:08 
sigurdne Exp $
+       * @version $Id: class.bocommon.inc.php,v 1.41 2006/09/27 11:20:52 
sigurdne Exp $
        */
 
        /**
@@ -98,28 +98,6 @@
                                        break;
                        }
 
-       /*              if 
($GLOBALS['phpgw_info']['server']['db_type']=='mssql')
-                       {
-                               $this->dateformat               = "M d Y";
-                               $this->datetimeformat   = "M d Y g:iA";
-                       }
-                       else
-                       {
-                               $this->dateformat               = "Y-m-d";
-                               $this->datetimeformat   = "Y-m-d G:i:s";
-                       }
-
-
-                       if(!$GLOBALS['phpgw_info']['flags']['css'])
-                       {
-                               $GLOBALS['phpgw_info']['flags']['css'] .= 
"-->\n</style>\n"
-                                       . '<link rel="stylesheet" 
type="text/css" media="all" href="'
-                                       . 
$GLOBALS['phpgw_info']['server']['webserver_url'].'/' . $this->currentapp . 
'/templates/'
-                                       . 
$GLOBALS['phpgw_info']['server']['template_set']
-                                       . 
'/css/'.$GLOBALS['phpgw_info']['server']['template_set'].'.css" 
title="'.$GLOBALS['phpgw_info']['server']['template_set'].'" />'
-                                       . "\n<style type=\"text/css\">\n<!--\n";
-                       }
-*/
                }
 
                function jscalendar()
@@ -130,7 +108,6 @@
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
                        $jsDateFormat = str_replace(array('d', 'm', 'M', 'Y'), 
array('%d', '%m', '%b', '%Y'), $dateformat);
 
-                       
                        $java_script ='</script>
                        <link rel="stylesheet" type="text/css" media="all" 
href="'.$phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css" 
title="win2k-cold-1" >
                        <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/calendar.js"></script>
@@ -147,14 +124,7 @@
                                $GLOBALS['phpgw_info']['flags']['java_script'] 
= $java_script;
                        }
 
-
-//                     <script type="text/javascript" 
src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['phpgw']->link('/phpgwapi/js/jscalendar/jscalendar-setup.php')).'"></script>
-
                        $cal_info=array(
-//                             'stylesheet'                                    
=> $phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css',
-//                             'calendar_source'                               
=> $phpgw_js_url.'/jscalendar/calendar.js',
-//                             'calendar_setup_source'                 => 
$phpgw_js_url.'/jscalendar/calendar-setup.js',
-//                             'calendar_lang'                                 
=> 
$phpgw_js_url.'/jscalendar/lang/calendar-'.substr($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],0,2)
 .'.js',
                                'jsDateFormat'                                  
=> $jsDateFormat,
                                'img'                                           
        => $img,
                                );
@@ -163,7 +133,6 @@
 
                function check_perms($rights, $required)
                {
-       //              return (!!($rights & $required) == True);
                        return ($rights & $required);
                }
 

Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.uiproject.inc.php     26 Sep 2006 18:29:27 -0000      1.34
+++ class.uiproject.inc.php     27 Sep 2006 11:20:52 -0000      1.35
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage project
-       * @version $Id: class.uiproject.inc.php,v 1.34 2006/09/26 18:29:27 
sigurdne Exp $
+       * @version $Id: class.uiproject.inc.php,v 1.35 2006/09/27 11:20:52 
sigurdne Exp $
        */
 
        /**
@@ -478,14 +478,12 @@
                                'value_end_date'                => 
$values['end_date'],
 
                                'dateformat'                    => $dateformat,
-                       //      'form_action'                   => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
                                'lang_submit_statustext'        => lang('Select 
this dates'),
                                'lang_submit'                   => 
lang('Submit')
                        );
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('date_search' => $data));
-               //      $GLOBALS['phpgw']->xslttpl->pp();
                }
 
                function edit()