[Fmsystem-commits] [13936] Syncromind: Merge 13933:13934 from trunk

[Sigurd Nes]

Revision: 13936
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13936
Author:   sigurdne
Date:     2015-09-16 13:12:37 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
Syncromind: Merge 13933:13934 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
    branches/dev-syncromind/property/inc/class.boXport.inc.php
    branches/dev-syncromind/property/inc/class.boadmin.inc.php
    branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
    branches/dev-syncromind/property/inc/class.boagreement.inc.php
    branches/dev-syncromind/property/inc/class.boalarm.inc.php
    branches/dev-syncromind/property/inc/class.boasync.inc.php
    branches/dev-syncromind/property/inc/class.bobudget.inc.php
    branches/dev-syncromind/property/inc/class.bocustom.inc.php
    branches/dev-syncromind/property/inc/class.bodocument.inc.php
    branches/dev-syncromind/property/inc/class.boifc.inc.php
    branches/dev-syncromind/property/inc/class.boinvestment.inc.php
    branches/dev-syncromind/property/inc/class.boinvoice.inc.php
    branches/dev-syncromind/property/inc/class.bopricebook.inc.php
    branches/dev-syncromind/property/inc/class.borequest.inc.php
    branches/dev-syncromind/property/inc/class.bos_agreement.inc.php
    branches/dev-syncromind/property/inc/class.botemplate.inc.php
    branches/dev-syncromind/property/inc/class.botenant_claim.inc.php
    branches/dev-syncromind/property/inc/class.bowo_hour.inc.php
    branches/dev-syncromind/property/inc/class.boworkorder.inc.php
    branches/dev-syncromind/property/inc/class.db_oci8.inc.php
    branches/dev-syncromind/property/inc/class.uiXport.inc.php
    branches/dev-syncromind/property/inc/class.uiadmin.inc.php
    branches/dev-syncromind/property/inc/class.uidocument.inc.php
    branches/dev-syncromind/property/inc/class.uiifc.inc.php

Property Changed:
----------------
    branches/dev-syncromind/


Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791,13793-13800,13802-13811,13816-13880,13882-13931
   + /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791,13793-13800,13802-13811,13816-13880,13882-13931,13934

Modified: branches/dev-syncromind/property/inc/class.XmlToArray.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.XmlToArray.inc.php       
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.XmlToArray.inc.php       
2015-09-16 13:12:37 UTC (rev 13936)
@@ -154,7 +154,7 @@
                 * @param   bool        $includeEmptyValues (optional) Defaults 
to no/false
                 * @return  object  XmlToArray instance
                 */
-               function XmlToArray( $encoding = NULL, $stripLinebreaks = NULL,
+               function __construct( $encoding = NULL, $stripLinebreaks = NULL,
                                           $includeRootElement = NULL, 
$automaticUtf8Decoding = NULL,
                                           $includeEmptyValues = NULL )
                {

Modified: branches/dev-syncromind/property/inc/class.boXport.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boXport.inc.php  2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boXport.inc.php  2015-09-16 
13:12:37 UTC (rev 13936)
@@ -48,7 +48,7 @@
                var $cat_id;
                var $use_session                 = false;
 
-               function property_boXport($session = false)
+               function __construct($session = false)
                {
 
                        $GLOBALS['phpgw_info']['flags']['currentapp'] = 
'property';

Modified: branches/dev-syncromind/property/inc/class.boadmin.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin.inc.php  2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boadmin.inc.php  2015-09-16 
13:12:37 UTC (rev 13936)
@@ -42,7 +42,7 @@
                var $offset;
                var $acl_app;
 
-               function property_boadmin($session = '')
+               function __construct($session = '')
                {
                        //      $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->so                = 
CreateObject('property.soadmin');

Modified: branches/dev-syncromind/property/inc/class.boadmin_location.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boadmin_location.inc.php 
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boadmin_location.inc.php 
2015-09-16 13:12:37 UTC (rev 13936)
@@ -54,7 +54,7 @@
                        'check_perms'    => true
                );
 
-               function property_boadmin_location( $session = false )
+               function __construct( $session = false )
                {
                        $this->so                = CreateObject( 
'property.soadmin_location' );
                        $this->bocommon  = CreateObject( 'property.bocommon' );

Modified: branches/dev-syncromind/property/inc/class.boagreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boagreement.inc.php      
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boagreement.inc.php      
2015-09-16 13:12:37 UTC (rev 13936)
@@ -57,7 +57,7 @@
                        'check_perms'    => true
                );
 
-               function property_boagreement( $session = false )
+               function __construct( $session = false )
                {
                        $this->so                = CreateObject( 
'property.soagreement' );
                        $this->bocommon  = CreateObject( 'property.bocommon' );

Modified: branches/dev-syncromind/property/inc/class.boalarm.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boalarm.inc.php  2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boalarm.inc.php  2015-09-16 
13:12:37 UTC (rev 13936)
@@ -37,7 +37,7 @@
                public $allrows;
                public $method_id;
 
-               function property_boalarm($session = '')
+               function __construct($session = '')
                {
                        $GLOBALS['phpgw_info']['flags']['currentapp']   =       
'property';
                        if (!is_object($GLOBALS['phpgw']->asyncservice))

Modified: branches/dev-syncromind/property/inc/class.boasync.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boasync.inc.php  2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boasync.inc.php  2015-09-16 
13:12:37 UTC (rev 13936)
@@ -51,7 +51,7 @@
                                'check_perms'           => true
                        );
 
-               function property_boasync($session=false)
+               function __construct($session=false)
                {
                        $this->so               = 
CreateObject('property.soasync');
                        $this->socommon = CreateObject('property.socommon');

Modified: branches/dev-syncromind/property/inc/class.bobudget.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-09-16 
13:12:37 UTC (rev 13936)
@@ -62,7 +62,7 @@
                                'check_perms'           => true
                        );
 
-               function property_bobudget($session=false)
+               function __construct($session=false)
                {
                        $this->so                               = 
CreateObject('property.sobudget');
                        $this->bocommon                 = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.bocustom.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bocustom.inc.php 2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.bocustom.inc.php 2015-09-16 
13:12:37 UTC (rev 13936)
@@ -50,7 +50,7 @@
                                'check_perms'           => true
                        );
 
-               function property_bocustom($session=false)
+               function __construct($session=false)
                {
                        $this->so = CreateObject('property.socustom');
 

Modified: branches/dev-syncromind/property/inc/class.bodocument.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bodocument.inc.php       
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.bodocument.inc.php       
2015-09-16 13:12:37 UTC (rev 13936)
@@ -55,7 +55,7 @@
                                'check_perms'           => true
                        );
 
-               function property_bodocument($session=false)
+               function __construct($session=false)
                {
                        $this->so                               = 
CreateObject('property.sodocument');
                        $this->bocommon                 = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.boifc.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boifc.inc.php    2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boifc.inc.php    2015-09-16 
13:12:37 UTC (rev 13936)
@@ -57,7 +57,7 @@
                                'check_perms'   => true
                        );
 
-               function boifc($session=false)
+               function __construct($session=false)
                {
        //              $this->so                       = 
CreateObject('property.soifc');
                        $this->bocommon         = 
createObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.boinvestment.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boinvestment.inc.php     
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boinvestment.inc.php     
2015-09-16 13:12:37 UTC (rev 13936)
@@ -53,7 +53,7 @@
                        );
 
 
-               function property_boinvestment($session=false)
+               function __construct($session=false)
                {
                        $this->so               = 
CreateObject('property.soinvestment');
                        $this->bocommon = CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boinvoice.inc.php        
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boinvoice.inc.php        
2015-09-16 13:12:37 UTC (rev 13936)
@@ -46,7 +46,7 @@
                 */
                public $supertransaction = false;
 
-               function property_boinvoice($session=false)
+               function __construct($session=false)
                {
                        $this->so                       = 
CreateObject('property.soinvoice',true);
                        $this->bocommon         = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.bopricebook.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bopricebook.inc.php      
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.bopricebook.inc.php      
2015-09-16 13:12:37 UTC (rev 13936)
@@ -51,7 +51,7 @@
                                'check_perms'           => true
                        );
 
-               function property_bopricebook($session=false)
+               function __construct($session=false)
                {
                        //      $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->so               = 
CreateObject('property.sopricebook');

Modified: branches/dev-syncromind/property/inc/class.borequest.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.borequest.inc.php        
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.borequest.inc.php        
2015-09-16 13:12:37 UTC (rev 13936)
@@ -57,7 +57,7 @@
                                'check_perms'           => true
                        );
 
-               function property_borequest($session=false)
+               function __construct($session=false)
                {
                        $this->so                                       = 
CreateObject('property.sorequest');
                        $this->bocommon                         = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.bos_agreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bos_agreement.inc.php    
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.bos_agreement.inc.php    
2015-09-16 13:12:37 UTC (rev 13936)
@@ -59,7 +59,7 @@
                                'check_perms'           => true
                        );
 
-               function property_bos_agreement($session=false)
+               function __construct($session=false)
                {
                        $this->so                                       = 
CreateObject('property.sos_agreement');
                        $this->bocommon                         = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.botemplate.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.botemplate.inc.php       
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.botemplate.inc.php       
2015-09-16 13:12:37 UTC (rev 13936)
@@ -50,7 +50,7 @@
                                'check_perms'           => true
                        );
 
-               function property_botemplate($session=false)
+               function __construct($session=false)
                {
                        $this->so               = 
CreateObject('property.sotemplate');
                        $this->bocommon         = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.botenant_claim.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.botenant_claim.inc.php   
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.botenant_claim.inc.php   
2015-09-16 13:12:37 UTC (rev 13936)
@@ -43,7 +43,7 @@
                var $order;
                var $cat_id;
 
-               function property_botenant_claim($session=false)
+               function __construct($session=false)
                {
                        $this->bocommon = CreateObject('property.bocommon');
                        $this->so = CreateObject('property.sotenant_claim');

Modified: branches/dev-syncromind/property/inc/class.bowo_hour.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bowo_hour.inc.php        
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.bowo_hour.inc.php        
2015-09-16 13:12:37 UTC (rev 13936)
@@ -50,7 +50,7 @@
                                'check_perms'           => true
                        );
 
-               function property_bowo_hour($session=false)
+               function __construct($session=false)
                {
                        $this->so                       = 
CreateObject('property.sowo_hour');
                        $this->bocommon         = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boworkorder.inc.php      
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.boworkorder.inc.php      
2015-09-16 13:12:37 UTC (rev 13936)
@@ -54,7 +54,7 @@
                                'get_category'  => true
                        );
 
-               function property_boworkorder($session=false)
+               function __construct($session=false)
                {
                        $this->so                       = 
CreateObject('property.soworkorder');
                        $this->bocommon         = 
CreateObject('property.bocommon');

Modified: branches/dev-syncromind/property/inc/class.db_oci8.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.db_oci8.inc.php  2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.db_oci8.inc.php  2015-09-16 
13:12:37 UTC (rev 13936)
@@ -45,7 +45,7 @@
                var $persistent = false;
                
                /* public: constructor */
-               function DB_OCI8($query = "")
+               function __construct($query = "")
                {
                        if($query)
                        {

Modified: branches/dev-syncromind/property/inc/class.uiXport.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiXport.inc.php  2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.uiXport.inc.php  2015-09-16 
13:12:37 UTC (rev 13936)
@@ -48,7 +48,7 @@
                var $filter;
                var $cat_id;
 
-               function property_uiXport()
+               function __construct()
                {
 
                        $GLOBALS['phpgw_info']['flags']['xslt_app']             
         = true;

Modified: branches/dev-syncromind/property/inc/class.uiadmin.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiadmin.inc.php  2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.uiadmin.inc.php  2015-09-16 
13:12:37 UTC (rev 13936)
@@ -54,7 +54,7 @@
                                'contact_info'  => true
                        );
 
-               function property_uiadmin()
+               function __construct()
                {
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'admin::property';

Modified: branches/dev-syncromind/property/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uidocument.inc.php       
2015-09-16 12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.uidocument.inc.php       
2015-09-16 13:12:37 UTC (rev 13936)
@@ -57,7 +57,7 @@
                                'delete'        => true
                        );
 
-               function property_uidocument()
+               function __construct()
                {
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"property::documentation";

Modified: branches/dev-syncromind/property/inc/class.uiifc.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiifc.inc.php    2015-09-16 
12:04:13 UTC (rev 13935)
+++ branches/dev-syncromind/property/inc/class.uiifc.inc.php    2015-09-16 
13:12:37 UTC (rev 13936)
@@ -52,7 +52,7 @@
                        'no_access'     => true
                );
 
-               function uiifc()
+               function __construct()
                {
                        $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'property::ifc';