fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [8454] Merge 8446:8453 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [8454] Merge 8446:8453 from trunk
Date: Wed, 28 Dec 2011 23:24:52 +0000

Revision: 8454
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8454
Author:   sigurdne
Date:     2011-12-28 23:24:52 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Merge 8446:8453 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
    
branches/Version-1_0-branch/controller/inc/class.uierror_report_message.inc.php
    branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php
    branches/Version-1_0-branch/controller/setup/setup.inc.php
    branches/Version-1_0-branch/controller/setup/tables_current.inc.php
    branches/Version-1_0-branch/controller/setup/tables_update.inc.php
    
branches/Version-1_0-branch/controller/templates/base/create_error_report_message.xsl
    branches/Version-1_0-branch/controller/templates/base/css/base.css
    branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
    branches/Version-1_0-branch/property/inc/class.menu.inc.php

Added Paths:
-----------
    
branches/Version-1_0-branch/controller/templates/base/view_error_report_message.xsl

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453

Modified: branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php       
2011-12-28 23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php       
2011-12-28 23:24:52 UTC (rev 8454)
@@ -59,14 +59,16 @@
                                        'control_item_id',
                                        'status',
                                        'comment',
-                                       'check_list_id'
+                                       'check_list_id',
+                                       'message-ticket_id'
                        );
 
                        $values = array(
                                
$this->marshal($check_item->get_control_item_id(), 'int'),
-                               $this->marshal($check_item->get_status(), 
'bool'),
+                               $this->marshal($check_item->get_status(), 
'int'),
                                $this->marshal($check_item->get_comment(), 
'string'),
-                               
$this->marshal($check_item->get_check_list_id(), 'int')
+                               
$this->marshal($check_item->get_check_list_id(), 'int'),
+                               
$this->marshal($check_item->get_message_ticket_id(), 'int')
                        );
 
                        $result = $this->db->query('INSERT INTO 
controller_check_item (' . join(',', $cols) . ') VALUES (' . join(',', $values) 
. ')', __LINE__,__FILE__);
@@ -80,9 +82,10 @@
 
                        $values = array(
                                'control_item_id = ' . 
$this->marshal($check_item->get_control_item_id(), 'int'),
-                               'status = ' . 
$this->marshal($check_item->get_status(), 'bool'),
+                               'status = ' . 
$this->marshal($check_item->get_status(), 'int'),
                                'comment = ' . 
$this->marshal($check_item->get_comment(), 'string'),
-                               'check_list_id = ' . 
$this->marshal($check_item->get_check_list_id(), 'int')
+                               'check_list_id = ' . 
$this->marshal($check_item->get_check_list_id(), 'int'),
+                               'message_ticket_id = ' . 
$this->marshal($check_item->get_message_ticket_id(), 'int')
                        );
 
                        $result = $this->db->query('UPDATE 
controller_check_item SET ' . join(',', $values) . " WHERE id=$id", 
__LINE__,__FILE__);

Modified: 
branches/Version-1_0-branch/controller/inc/class.uierror_report_message.inc.php
===================================================================
--- 
branches/Version-1_0-branch/controller/inc/class.uierror_report_message.inc.php 
    2011-12-28 23:23:15 UTC (rev 8453)
+++ 
branches/Version-1_0-branch/controller/inc/class.uierror_report_message.inc.php 
    2011-12-28 23:24:52 UTC (rev 8454)
@@ -79,8 +79,16 @@
        
                        $location_array = 
execMethod('property.bolocation.read_single', array('location_code' => 
$location_code));
                        
+                       $catsObj = CreateObject('phpgwapi.categories', -1, 
'property', '.ticket');
+                                                       
+                       $this->cat_id = 89;
+                       $this->cats->supress_info       = true;                 
+                       $categories     = 
$catsObj->formatted_xslt_list(array('select_name' => 
'values[cat_id]','selected' => $this->cat_id, 'use_acl' => 
$this->_category_acl));
+
+                       
                        $data = array
                        (
+                               'categories'                    => $categories,
                                'location_array'                => 
$location_array,
                                'control_array'                 => 
$control->toArray(),
                                'check_list'                    => 
$check_list_with_check_items,
@@ -116,8 +124,8 @@
                        
                        foreach($check_item_ids as $check_item_id){
                                $check_item = 
$this->so_check_item->get_single($check_item_id);
-                               
-                               $details .= $check_item->get_comment(); 
+                               $details .= "Gjøremål: ";
+                               $details .=  $check_item->get_comment() . 
"<br>";
                        }
                        
                        $ticket = array
@@ -133,12 +141,19 @@
                        );
                        
                        $botts = CreateObject('property.botts',true);
-                       $ticket_id = $botts->add_ticket($ticket);
+                       $message_ticket_id = $botts->add_ticket($ticket);
 
+                       foreach($check_item_ids as $check_item_id){
+                               $check_item = 
$this->so_check_item->get_single($check_item_id);
+                               $check_item->set_message_ticket_id( 
$message_ticket_id );
+                               $this->so_check_item->update($check_item);
+                       }                       
                        
+                       $message_ticket = 
$botts->read_single($message_ticket_id);
                        
                        $data = array
                        (
+                               'message_ticket'                => 
$message_ticket,
                                'location_array'                => 
$location_array,
                                'control_array'                 => 
$control->toArray(),
                                'check_list'                    => 
$check_list_with_check_items,
@@ -152,7 +167,7 @@
                        
                        
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
                        
-                       
self::render_template_xsl('create_error_report_message', $data);
+                       self::render_template_xsl('view_error_report_message', 
$data);
                }
                
                public function query(){}

Modified: 
branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php   
2011-12-28 23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php   
2011-12-28 23:24:52 UTC (rev 8454)
@@ -39,6 +39,9 @@
                protected $status;
                protected $comment;
                protected $check_list_id;
+               protected $message_ticket_id;
+               
+               // Objects
                protected $control_item;
                
                /**
@@ -87,6 +90,16 @@
                
                public function get_check_list_id() { return 
$this->check_list_id; }
                
+               public function set_message_ticket_id($message_ticket_id)
+               {
+                       $this->message_ticket_id = $message_ticket_id;
+               }
+               
+               public function get_message_ticket_id() { return 
$this->message_ticket_id; }
+               
+               
+               // =================  Getters and setters for objects 
=================
+               
                public function set_control_item($control_item)
                {
                        $this->control_item = $control_item;

Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php  2011-12-28 
23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php  2011-12-28 
23:24:52 UTC (rev 8454)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.13';
+       $setup_info['controller']['version'] = '0.1.14';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php 
2011-12-28 23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php 
2011-12-28 23:24:52 UTC (rev 8454)
@@ -56,8 +56,9 @@
                                'id' => array('type' => 'auto','precision' => 
4,'nullable' => False),
                                'control_item_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
                                'status' => array('type' => 'bool','nullable' 
=> true,'default' => 'false'),
-                               'comment' => array('type' => 
'varchar','precision' => '255','nullable' => false),
-                               'check_list_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True)
+                               'comment' => array('type' => 
'varchar','precision' => '255','nullable' => False),
+                               'check_list_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
+                               'message_ticket_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True)
                        ),
                        'pk' => array('id'),
                        'fk' => array(),

Modified: branches/Version-1_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_update.inc.php  
2011-12-28 23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/controller/setup/tables_update.inc.php  
2011-12-28 23:24:52 UTC (rev 8454)
@@ -282,3 +282,17 @@
                $GLOBALS['setup_info']['controller']['currentver'] = '0.1.13';
                return $GLOBALS['setup_info']['controller']['currentver'];
        }
+       
+       $test[] = '0.1.13';
+       function controller_upgrade0_1_13()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_item', 
'message_ticket_id',array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => true,
+                       'default' => 0
+               ));
+
+               $GLOBALS['setup_info']['controller']['currentver'] = '0.1.14';
+               return $GLOBALS['setup_info']['controller']['currentver'];
+       }

Modified: 
branches/Version-1_0-branch/controller/templates/base/create_error_report_message.xsl
===================================================================
--- 
branches/Version-1_0-branch/controller/templates/base/create_error_report_message.xsl
       2011-12-28 23:23:15 UTC (rev 8453)
+++ 
branches/Version-1_0-branch/controller/templates/base/create_error_report_message.xsl
       2011-12-28 23:24:52 UTC (rev 8454)
@@ -10,7 +10,7 @@
                <h2>Utført dato <xsl:value-of select="php:function('date', 
$date_format, number(check_list/completed_date))"/></h2>
                                
                <div id="error_report_message_details">
-                       <h2 class="check_item_details">Velg sjekkpunkter som 
skal være med i avviksmelding</h2>
+                       
 
                        <xsl:choose>
                                <xsl:when 
test="check_list/check_item_array/child::node()">
@@ -31,9 +31,20 @@
                                      </xsl:attribute>
                                    </input>
                                    
-                                       <label>Tittel på melding</label>
-                                       <input name="title" type="text" />
-                                                               
+                                       <label style="font-size: 
15px;font-weight: bold;">Tittel på melding</label>
+                                       <input name="message_title" type="text" 
/>
+                                       
+                                        <select>
+                                               <xsl:for-each 
select="categories/cat_list">
+                                                       <xsl:variable 
name="cat_id"><xsl:value-of select="./cat_id"/></xsl:variable>
+                                                       <option 
value="{$cat_id}">
+                                                               <xsl:value-of 
select="./name"/>
+                                                       </option>               
        
+                                               </xsl:for-each>
+                                       </select>
+                       
+                       
+                                       <h3 class="check_item_details">Velg 
sjekkpunkter som skal være med i avviksmelding</h3>                             
    
                                        <ul class="check_items expand_list">
                                                <xsl:for-each 
select="check_list/check_item_array">
                                                        <li>

Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css  
2011-12-28 23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css  
2011-12-28 23:24:52 UTC (rev 8454)
@@ -1111,4 +1111,11 @@
        display:none;
        position:absolute;
     z-index: 1;
+}
+#error_report_message_details{
+       background: none repeat scroll 0 0 #EDF5FF;
+    border: 1px solid #ddd;
+    margin: 0;
+    padding: 15px;
+    width: 800px;      
 }
\ No newline at end of file

Copied: 
branches/Version-1_0-branch/controller/templates/base/view_error_report_message.xsl
 (from rev 8453, trunk/controller/templates/base/view_error_report_message.xsl)
===================================================================
--- 
branches/Version-1_0-branch/controller/templates/base/view_error_report_message.xsl
                         (rev 0)
+++ 
branches/Version-1_0-branch/controller/templates/base/view_error_report_message.xsl
 2011-12-28 23:24:52 UTC (rev 8454)
@@ -0,0 +1,76 @@
+<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
+<xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+       
+               <h1>Send avviksmelding på bygg: <xsl:value-of 
select="location_array/loc1_name"/></h1>
+               
+               <h2>Kontroll <xsl:value-of select="control_array/title"/></h2>
+               <h2>Utført dato <xsl:value-of select="php:function('date', 
$date_format, number(check_list/completed_date))"/></h2>
+                               
+               <div id="error_report_message_details">
+                       
+
+                       <xsl:choose>
+                               <xsl:when 
test="check_list/check_item_array/child::node()">
+                                       
+                               <form class="frm_save_error_report_message" 
action="index.php?menuaction=controller.uierror_report_message.save_error_report_message"
 method="post">
+                                       <input>
+                                     <xsl:attribute 
name="name">check_list_id</xsl:attribute>
+                                     <xsl:attribute 
name="type">hidden</xsl:attribute>
+                                     <xsl:attribute name="value">
+                                       <xsl:value-of select="check_list/id"/>
+                                     </xsl:attribute>
+                                   </input>
+                                   <input>
+                                     <xsl:attribute 
name="name">location_code</xsl:attribute>
+                                     <xsl:attribute 
name="type">hidden</xsl:attribute>
+                                     <xsl:attribute name="value">
+                                       <xsl:value-of 
select="location_array/location_code"/>
+                                     </xsl:attribute>
+                                   </input>
+                                   
+                                       <label style="font-size: 
15px;font-weight: bold;">Tittel på melding</label>
+                                       <xsl:value-of 
select="message_ticket/subject"/>
+                       
+                                       <h3 class="check_item_details">Velg 
sjekkpunkter som skal være med i avviksmelding</h3>                             
    
+                                       <ul class="check_items expand_list">
+                                               <xsl:for-each 
select="check_list/check_item_array">
+                                                       <li>
+                                                               <xsl:variable 
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
+                                                               
<h4><xsl:value-of select="control_item/title"/></h4>                            
                
+                                                       </li>
+                                               </xsl:for-each>
+                                       </ul>
+                                       
+                                       <a>
+                                               <xsl:attribute name="href">
+                                                       
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
+                                                       
<xsl:text>&amp;check_list_id=</xsl:text>
+                                                       <xsl:value-of 
select="check_list/id"/>
+                                               </xsl:attribute>
+                                     Registrer ny melding
+                                   </a>
+                                   
+                                   <a>
+                                               <xsl:attribute name="href">
+                                                       
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+                                                       
<xsl:text>&amp;check_list_id=</xsl:text>
+                                                       <xsl:value-of 
select="check_list/id"/>
+                                               </xsl:attribute>
+                                     Endre sjekkliste
+                                   </a>
+                                       
+                               </form>                 
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       Ingen sjekkpunkter
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </div>
+               
+               
+                       
+</div>
+</xsl:template>

Modified: branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php     
2011-12-28 23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php     
2011-12-28 23:24:52 UTC (rev 8454)
@@ -1459,17 +1459,21 @@
                        $block_time = time() - 
$GLOBALS['phpgw_info']['server']['block_time'] * 60;
                        $ip                     = 
$this->_db->db_addslashes($ip);
 
-                       $sql = 'SELECT COUNT(*) AS cnt FROM phpgw_access_log'
+                       if ( 
isset($GLOBALS['phpgw_info']['server']['sessions_checkip']) && 
$GLOBALS['phpgw_info']['server']['sessions_checkip'] )
+                       {
+                               $sql = 'SELECT COUNT(*) AS cnt FROM 
phpgw_access_log'
                                                        . " WHERE account_id = 
0 AND ip = '{$ip}' AND li > {$block_time}";
 
-                       $this->_db->query($sql, __LINE__, __FILE__);
-                       $this->_db->next_record();
+                               $this->_db->query($sql, __LINE__, __FILE__);
+                               $this->_db->next_record();
 
-                       $false_ip = $this->_db->f('cnt');
-                       if ( $false_ip > 
$GLOBALS['phpgw_info']['server']['num_unsuccessful_ip'] )
-                       {
-                               $blocked = true;
+                               $false_ip = $this->_db->f('cnt');
+                               if ( $false_ip > 
$GLOBALS['phpgw_info']['server']['num_unsuccessful_ip'] )
+                               {
+                                       $blocked = true;
+                               }
                        }
+
                        $login  = $this->_db->db_addslashes($login);
                        $sql    = 'SELECT COUNT(*) AS cnt FROM phpgw_access_log'
                                        . " WHERE account_id = 0 AND 
(loginid='{$login}' OR loginid LIKE '$login#%')"

Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-12-28 
23:23:15 UTC (rev 8453)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-12-28 
23:24:52 UTC (rev 8454)
@@ -198,7 +198,7 @@
                                                ),
                                                'accounting_config'     => array
                                                (
-                                                       'text'  => 
lang('accounting config'),
+                                                       'text'  => 
lang('Configuration'),
                                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uiconfig2.index', 'location_id' => 
$GLOBALS['phpgw']->locations->get_id('property', '.invoice')) )
                                                ),
                                                'accounting_tax'        => array




reply via email to

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