[Fmsystem-commits] [11036] property: optional bypass acl for tikcets

[Sigurd Nes]

Revision: 11036
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11036
Author:   sigurdne
Date:     2013-04-08 13:08:21 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
property: optional bypass acl for tikcets

Modified Paths:
--------------
    trunk/property/inc/class.sotts.inc.php
    trunk/property/templates/base/config.tpl

Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2013-04-08 12:15:53 UTC (rev 
11035)
+++ trunk/property/inc/class.sotts.inc.php      2013-04-08 13:08:21 UTC (rev 
11036)
@@ -219,12 +219,15 @@
                                }
                        }
 
-                       if($public_user_list)
+                       
if(!isset($GLOBALS['phpgw']->config->config_data['bypass_acl_at_tickets']) || 
!$GLOBALS['phpgw']->config->config_data['bypass_acl_at_tickets'])
                        {
-                               $public_user_list = 
array_unique($public_user_list);
-                               reset($public_user_list);
-                               $filtermethod .= " $where ( 
fm_tts_tickets.user_id IN(" . implode(',',$public_user_list) . "))";
-                               $where= 'AND';
+                               if($public_user_list)
+                               {
+                                       $public_user_list = 
array_unique($public_user_list);
+                                       reset($public_user_list);
+                                       $filtermethod .= " $where ( 
fm_tts_tickets.user_id IN(" . implode(',',$public_user_list) . "))";
+                                       $where= 'AND';
+                               }
                        }
 
                        if($tenant_id = 
$GLOBALS['phpgw']->session->appsession('tenant_id','property'))

Modified: trunk/property/templates/base/config.tpl
===================================================================
--- trunk/property/templates/base/config.tpl    2013-04-08 12:15:53 UTC (rev 
11035)
+++ trunk/property/templates/base/config.tpl    2013-04-08 13:08:21 UTC (rev 
11036)
@@ -443,6 +443,15 @@
                        </td>
                </tr>
                <tr class="row_off">
+                       <td>{lang_Bypass_ACL_for_accessing_tickets}.</td>
+                       <td>
+                               <select 
name="newsettings[bypass_acl_at_tickets]">
+                                       <option value="" 
{selected_bypass_acl_at_tickets_}>NO</option>
+                                       <option value="1" 
{selected_bypass_acl_at_tickets_1}>YES</option>
+                               </select>
+                       </td>
+               </tr>
+               <tr class="row_off">
                        <td>{lang_Use_ACL_for_helpdesk_categories}.</td>
                        <td>
                                <select name="newsettings[acl_at_tts_category]">