phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Sigurd Nes
Subject: [Phpgroupware-cvs] property/inc class.bocommon.inc.php class.uiact...
Date: Thu, 04 Jan 2007 12:04:02 +0000

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/01/04 12:04:02

Modified files:
        inc            : class.bocommon.inc.php class.uiactor.inc.php 
                         class.uiagreement.inc.php 
                         class.uibudget.inc.php class.uicustom.inc.php 
                         class.uientity.inc.php class.uigab.inc.php 
                         class.uiinvestment.inc.php 
                         class.uiinvoice.inc.php 
                         class.uilocation.inc.php 
                         class.uipricebook.inc.php 
                         class.uiproject.inc.php 
                         class.uir_agreement.inc.php 
                         class.uirequest.inc.php 
                         class.uis_agreement.inc.php class.uitts.inc.php 
                         class.uiwo_hour.inc.php 
                         class.uiworkorder.inc.php 

Log message:
        simplify

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiactor.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiagreement.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uibudget.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uicustom.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uigab.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiinvestment.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiinvoice.inc.php?cvsroot=phpgroupware&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uipricebook.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uir_agreement.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uirequest.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uis_agreement.inc.php?cvsroot=phpgroupware&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiwo_hour.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiworkorder.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38

Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- class.bocommon.inc.php      3 Jan 2007 14:38:14 -0000       1.55
+++ class.bocommon.inc.php      4 Jan 2007 12:04:02 -0000       1.56
@@ -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.55 2007/01/03 14:38:14 
sigurdne Exp $
+       * @version $Id: class.bocommon.inc.php,v 1.56 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -72,6 +72,11 @@
                        }
                        $this->async = &$GLOBALS['phpgw']->asyncservice;
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+
                        $this->join             = $this->socommon->join;
                        $this->left_join        = $this->socommon->left_join;
                        $this->like             = $this->socommon->like;

Index: class.uiactor.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiactor.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- class.uiactor.inc.php       27 Dec 2006 10:37:59 -0000      1.28
+++ class.uiactor.inc.php       4 Jan 2007 12:04:02 -0000       1.29
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.uiactor.inc.php,v 1.28 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uiactor.inc.php,v 1.29 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -314,10 +314,6 @@
 
                        $member_of_data = 
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals' 
=> True, 'link_data' =>$link_data));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array
@@ -487,10 +483,6 @@
 
                        $member_of_data = 
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals' 
=> True, 'link_data' =>array()));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
 //_debug_array($member_of_data);

Index: class.uiagreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiagreement.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.uiagreement.inc.php   27 Dec 2006 10:37:59 -0000      1.31
+++ class.uiagreement.inc.php   4 Jan 2007 12:04:02 -0000       1.32
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uiagreement.inc.php,v 1.31 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uiagreement.inc.php,v 1.32 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -342,10 +342,6 @@
 
                        $member_of_data = 
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals' 
=> True,link_data =>$link_data));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array
@@ -530,10 +526,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
@@ -957,10 +949,6 @@
                                $record_limit   = $this->bo->total_records;
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
@@ -1273,10 +1261,6 @@
                                'lang_update_statustext'        => lang('update 
selected investments')
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
@@ -1387,10 +1371,6 @@
                        $content        = $list['content'];
                        $table_header=$list['table_header'];
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array

Index: class.uibudget.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uibudget.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.uibudget.inc.php      27 Dec 2006 10:37:59 -0000      1.23
+++ class.uibudget.inc.php      4 Jan 2007 12:04:02 -0000       1.24
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage budget
-       * @version $Id: class.uibudget.inc.php,v 1.23 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uibudget.inc.php,v 1.24 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -1090,10 +1090,6 @@
                                'allrows'       => $this->allrows
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array

Index: class.uicustom.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uicustom.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uicustom.inc.php      27 Dec 2006 10:37:59 -0000      1.17
+++ class.uicustom.inc.php      4 Jan 2007 12:04:02 -0000       1.18
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage custom
-       * @version $Id: class.uicustom.inc.php,v 1.17 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uicustom.inc.php,v 1.18 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -517,10 +517,6 @@
                                'allrows'       => $this->allrows
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array

Index: class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- class.uientity.inc.php      27 Dec 2006 10:37:59 -0000      1.38
+++ class.uientity.inc.php      4 Jan 2007 12:04:02 -0000       1.39
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage entity
-       * @version $Id: class.uientity.inc.php,v 1.38 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uientity.inc.php,v 1.39 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -470,10 +470,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array
@@ -965,10 +961,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
@@ -1278,10 +1270,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array

Index: class.uigab.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.uigab.inc.php 27 Dec 2006 10:37:59 -0000      1.24
+++ class.uigab.inc.php 4 Jan 2007 12:04:02 -0000       1.25
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uigab.inc.php,v 1.24 2006/12/27 10:37:59 sigurdne 
Exp $
+       * @version $Id: class.uigab.inc.php,v 1.25 2007/01/04 12:04:02 sigurdne 
Exp $
        */
 
        /**
@@ -407,10 +407,6 @@
                                $record_limit   = $this->bo->total_records;
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array

Index: class.uiinvestment.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uiinvestment.inc.php  27 Dec 2006 10:37:59 -0000      1.17
+++ class.uiinvestment.inc.php  4 Jan 2007 12:04:02 -0000       1.18
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage eco
-       * @version $Id: class.uiinvestment.inc.php,v 1.17 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uiinvestment.inc.php,v 1.18 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -231,10 +231,6 @@
 
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array

Index: class.uiinvoice.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- class.uiinvoice.inc.php     3 Jan 2007 10:40:16 -0000       1.45
+++ class.uiinvoice.inc.php     4 Jan 2007 12:04:02 -0000       1.46
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage eco
-       * @version $Id: class.uiinvoice.inc.php,v 1.45 2007/01/03 10:40:16 
sigurdne Exp $
+       * @version $Id: class.uiinvoice.inc.php,v 1.46 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -389,10 +389,6 @@
                                'district_id'           => $this->district_id
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
@@ -662,10 +658,6 @@
                                'paid'          => $paid
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
@@ -883,10 +875,6 @@
                                'filter'                => $this->filter
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data['lang_sum']                               = 
lang('Sum');

Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- class.uilocation.inc.php    27 Dec 2006 20:39:09 -0000      1.48
+++ class.uilocation.inc.php    4 Jan 2007 12:04:02 -0000       1.49
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uilocation.inc.php,v 1.48 2006/12/27 20:39:09 
sigurdne Exp $
+       * @version $Id: class.uilocation.inc.php,v 1.49 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -140,10 +140,6 @@
                        $lookup_name    = 
get_var('lookup_name',array('POST','GET'));
                        $lookup_tenant  = 
get_var('lookup_tenant',array('POST','GET'));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        if(!$type_id)
@@ -1011,10 +1007,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
                        $data = array
@@ -1583,10 +1575,6 @@
 
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('location','menu'));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $summary_list= $this->bo->read_summary();

Index: class.uipricebook.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- class.uipricebook.inc.php   27 Dec 2006 10:37:59 -0000      1.22
+++ class.uipricebook.inc.php   4 Jan 2007 12:04:02 -0000       1.23
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uipricebook.inc.php,v 1.22 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uipricebook.inc.php,v 1.23 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -266,10 +266,6 @@
                                'start'         => $this->start
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
@@ -394,10 +390,6 @@
                                $record_limit   = $this->bo->total_records;
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array

Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- class.uiproject.inc.php     3 Jan 2007 13:45:12 -0000       1.46
+++ class.uiproject.inc.php     4 Jan 2007 12:04:02 -0000       1.47
@@ -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.46 2007/01/03 13:45:12 
sigurdne Exp $
+       * @version $Id: class.uiproject.inc.php,v 1.47 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -363,10 +363,6 @@
                                                'wo_hour_cat_id'        
=>$this->wo_hour_cat_id,
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array
@@ -948,11 +944,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
-
                        $data = array
                        (
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),

Index: class.uir_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uir_agreement.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.uir_agreement.inc.php 27 Dec 2006 10:37:59 -0000      1.24
+++ class.uir_agreement.inc.php 4 Jan 2007 12:04:02 -0000       1.25
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uir_agreement.inc.php,v 1.24 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uir_agreement.inc.php,v 1.25 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -347,10 +347,6 @@
 
                        $member_of_data = 
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals' 
=> True,link_data => $link_data));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
 //_debug_array($member_of_data);
@@ -903,10 +899,6 @@
                                'id'            =>$id
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
@@ -1272,10 +1264,6 @@
                                                'entity_data'   => 
False,//$values['p']
                                                ));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
@@ -1409,10 +1397,6 @@
                                                'type'          => 'view')
                                                );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
@@ -2157,10 +2141,6 @@
                                                'b_account_name'        => 
$values['b_account_name'],
                                                'type'                  
=>$lookup_type));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
                        $data = array

Index: class.uirequest.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- class.uirequest.inc.php     27 Dec 2006 10:37:59 -0000      1.28
+++ class.uirequest.inc.php     4 Jan 2007 12:04:02 -0000       1.29
@@ -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.uirequest.inc.php,v 1.28 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uirequest.inc.php,v 1.29 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -409,10 +409,6 @@
                                $record_limit   = $this->bo->total_records;
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array

Index: class.uis_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uis_agreement.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- class.uis_agreement.inc.php 27 Dec 2006 10:37:59 -0000      1.36
+++ class.uis_agreement.inc.php 4 Jan 2007 12:04:02 -0000       1.37
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uis_agreement.inc.php,v 1.36 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uis_agreement.inc.php,v 1.37 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -341,10 +341,6 @@
 
                        $member_of_data = 
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals' 
=> True,link_data => $link_data));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
 //_debug_array($member_of_data);
@@ -791,10 +787,6 @@
                                'id'            => $id
                        );
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
@@ -1123,10 +1115,6 @@
                                                'entity_data'   => $values['p']
                                                ));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
@@ -1239,10 +1227,6 @@
                                                'entity_data'   => $values['p']
                                                ));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array

Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- class.uitts.inc.php 27 Dec 2006 10:37:59 -0000      1.52
+++ class.uitts.inc.php 4 Jan 2007 12:04:02 -0000       1.53
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage helpdesk
-       * @version $Id: class.uitts.inc.php,v 1.52 2006/12/27 10:37:59 sigurdne 
Exp $
+       * @version $Id: class.uitts.inc.php,v 1.53 2007/01/04 12:04:02 sigurdne 
Exp $
        */
 
        /**
@@ -526,10 +526,6 @@
                                
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field'));
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array
@@ -884,10 +880,6 @@
 
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field'));
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array
@@ -1101,10 +1093,6 @@
 
                        $msgbox_data = 
(isset($receipt)?$this->bocommon->msgbox_data($receipt):'');
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
                        $data = array
@@ -1332,10 +1320,6 @@
 
                        $msgbox_data = 
(isset($receipt)?$this->bocommon->msgbox_data($receipt):'');
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
                        $data = array
@@ -1605,10 +1589,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
                        $data = array
@@ -1866,10 +1846,6 @@
                                }
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
 
                        $data = array

Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.uiwo_hour.inc.php     27 Dec 2006 10:37:59 -0000      1.31
+++ class.uiwo_hour.inc.php     4 Jan 2007 12:04:02 -0000       1.32
@@ -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.uiwo_hour.inc.php,v 1.31 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uiwo_hour.inc.php,v 1.32 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -1412,10 +1412,6 @@
 
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array

Index: class.uiworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- class.uiworkorder.inc.php   27 Dec 2006 10:37:59 -0000      1.37
+++ class.uiworkorder.inc.php   4 Jan 2007 12:04:02 -0000       1.38
@@ -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.uiworkorder.inc.php,v 1.37 2006/12/27 10:37:59 
sigurdne Exp $
+       * @version $Id: class.uiworkorder.inc.php,v 1.38 2007/01/04 12:04:02 
sigurdne Exp $
        */
 
        /**
@@ -405,10 +405,6 @@
                                
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour_cat_filter'));
                        }
 
-                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
-                       {
-                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
-                       }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
 
                        $data = array




reply via email to

[Prev in Thread] Current Thread [Next in Thread]