[Fmsystem-commits] [7065] rental: missing reference to config

[Sigurd Nes]

Revision: 7065
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7065
Author:   sigurdne
Date:     2011-03-03 12:43:51 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
rental: missing reference to config

Modified Paths:
--------------
    trunk/frontend/inc/class.uicontract.inc.php
    trunk/frontend/inc/class.uidelegates.inc.php
    trunk/rental/inc/class.uidelegate.inc.php
    trunk/rental/inc/class.uiparty.inc.php
    trunk/rental/inc/class.uiresultunit.inc.php

Modified: trunk/frontend/inc/class.uicontract.inc.php
===================================================================
--- trunk/frontend/inc/class.uicontract.inc.php 2011-03-02 16:51:36 UTC (rev 
7064)
+++ trunk/frontend/inc/class.uicontract.inc.php 2011-03-03 12:43:51 UTC (rev 
7065)
@@ -55,8 +55,11 @@
                {
                        $contract_id = phpgw::get_var('contract_id');
                        $contract_message = phpgw::get_var('contract_message');
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();
                        $use_fellesdata = 
$config->config_data['use_fellesdata'];
-                       if($use_fellesdata){
+                       if($use_fellesdata)
+                       {
                                $user_data = 
frontend_bofellesdata::get_instance()->get_user($GLOBALS['phpgw_info']['user']['account_lid']);
                                        
                                if($user_data['email'])

Modified: trunk/frontend/inc/class.uidelegates.inc.php
===================================================================
--- trunk/frontend/inc/class.uidelegates.inc.php        2011-03-02 16:51:36 UTC 
(rev 7064)
+++ trunk/frontend/inc/class.uidelegates.inc.php        2011-03-03 12:43:51 UTC 
(rev 7065)
@@ -19,6 +19,8 @@
 
                public function index()
                {               
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();
                        $use_fellesdata = 
$config->config_data['use_fellesdata'];       
                        if(isset($_POST['search']))
                        {
@@ -204,6 +206,9 @@
                
                public function add_delegate(int $account_id, $org_unit_id, 
$org_name)
                {
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();
+
                        $use_fellesdata = 
$config->config_data['use_fellesdata'];
                        if(!$use_fellesdata)
                        {

Modified: trunk/rental/inc/class.uidelegate.inc.php
===================================================================
--- trunk/rental/inc/class.uidelegate.inc.php   2011-03-02 16:51:36 UTC (rev 
7064)
+++ trunk/rental/inc/class.uidelegate.inc.php   2011-03-03 12:43:51 UTC (rev 
7065)
@@ -50,6 +50,9 @@
                
                public function add_actions(&$value, $key, $params)
                {                       
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();
+
                        $use_fellesdata = 
$config->config_data['use_fellesdata'];
                        if(($this->isExecutiveOfficer() || 
$this->isAdministrator()) && $use_fellesdata)
                        {
@@ -60,4 +63,4 @@
                                $value['labels'][] = lang('remove');
                        }
                }
-       }
\ No newline at end of file
+       }

Modified: trunk/rental/inc/class.uiparty.inc.php
===================================================================
--- trunk/rental/inc/class.uiparty.inc.php      2011-03-02 16:51:36 UTC (rev 
7064)
+++ trunk/rental/inc/class.uiparty.inc.php      2011-03-03 12:43:51 UTC (rev 
7065)
@@ -76,6 +76,9 @@
                
                //Retrieve the type of query and perform type specific logic
                $type = phpgw::get_var('type');
+
+               $config = CreateObject('phpgwapi.config','rental');
+               $config->read();
                $use_fellesdata = $config->config_data['use_fellesdata'];       
                switch($type)
                {
@@ -178,6 +181,9 @@
         */
        public function update_all_org_enhet_id()
        {
+               $config = CreateObject('phpgwapi.config','rental');
+               $config->read();
+
                $use_fellesdata = $config->config_data['use_fellesdata'];       
                if(!$use_fellesdata){
                        return;

Modified: trunk/rental/inc/class.uiresultunit.inc.php
===================================================================
--- trunk/rental/inc/class.uiresultunit.inc.php 2011-03-02 16:51:36 UTC (rev 
7064)
+++ trunk/rental/inc/class.uiresultunit.inc.php 2011-03-03 12:43:51 UTC (rev 
7065)
@@ -24,6 +24,8 @@
                
                public function query()
                {
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();
                        $use_fellesdata = 
$config->config_data['use_fellesdata'];
                        
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
                        {
@@ -91,11 +93,13 @@
                        }
                }
                
-               public function edit(){
-                       
+               public function edit()
+               {
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= 
'::'.lang('edit');
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();
                        $use_fellesdata = 
$config->config_data['use_fellesdata'];
-                       
+
                        $unit_id = (int)phpgw::get_var('id');
                        
                        if (isset($unit_id) && $unit_id > 0 && $use_fellesdata) 
{
@@ -174,6 +178,8 @@
                
                public function add_delegate(int $account_id, $org_unit_id, 
$org_name)
                {
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();
                        $use_fellesdata = 
$config->config_data['use_fellesdata'];
                        if(!isset($account_id) || $account_id == '' && 
$use_fellesdata)
                        {
@@ -242,4 +248,4 @@
                        }
                        $GLOBALS['phpgw']->redirect_link('/index.php', $args);
                }
-       }
\ No newline at end of file
+       }