[Fmsystem-commits] [15177] property: sql filter

[sigurdne]

Revision: 15177
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15177
Author:   sigurdne
Date:     2016-05-19 10:24:37 +0000 (Thu, 19 May 2016)
Log Message:
-----------
property: sql filter

Modified Paths:
--------------
    trunk/property/inc/class.soentity.inc.php
    trunk/property/inc/class.sojasper.inc.php
    trunk/property/inc/class.soproject.inc.php

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2016-05-19 07:18:25 UTC (rev 
15176)
+++ trunk/property/inc/class.soentity.inc.php   2016-05-19 10:24:37 UTC (rev 
15177)
@@ -183,7 +183,7 @@
                                        unset($user);
 
                                        reset($public_user_list);
-                                       $filtermethod .= " $where (( 
$entity_table.user_id IN(" . implode(',', $public_user_list) . ")";
+                                       $filtermethod .= " $where ( 
$entity_table.user_id IN(" . implode(',', $public_user_list) . ")";
 
                                        $where = 'AND';
                                }
@@ -551,7 +551,7 @@
                                        unset($user);
 
                                        reset($public_user_list);
-                                       $filtermethod .= " $where (( 
$entity_table.user_id IN(" . implode(',', $public_user_list) . ")";
+                                       $filtermethod .= " $where ( 
$entity_table.user_id IN(" . implode(',', $public_user_list) . ")";
 
                                        $where = 'AND';
                                }
@@ -1541,7 +1541,7 @@
                                        unset($user);
 
                                        reset($public_user_list);
-                                       $filtermethod .= " $where (( 
$entity_table.user_id IN(" . implode(',', $public_user_list) . ")";
+                                       $filtermethod .= " $where ( 
$entity_table.user_id IN(" . implode(',', $public_user_list) . ")";
 
                                        $where = 'AND';
                                }

Modified: trunk/property/inc/class.sojasper.inc.php
===================================================================
--- trunk/property/inc/class.sojasper.inc.php   2016-05-19 07:18:25 UTC (rev 
15176)
+++ trunk/property/inc/class.sojasper.inc.php   2016-05-19 10:24:37 UTC (rev 
15177)
@@ -75,7 +75,7 @@
                        }
 
 
-                       $filtermethod = "WHERE ( {$table}.user_id = 
{$this->account}";
+                       $filtermethod = "WHERE {$table}.user_id = 
{$this->account}";
                        $public_user_list = array();
                        if (is_array($grants['accounts']) && 
$grants['accounts'])
                        {
@@ -84,7 +84,7 @@
                                        $public_user_list[] = $user;
                                }
                                reset($public_user_list);
-                               $filtermethod .= " OR (access='public' AND 
{$table}.user_id IN(" . implode(',', $public_user_list) . "))";
+                               $filtermethod .= " OR (access='public' AND 
{$table}.user_id IN(" . implode(',', $public_user_list) . ")";
                        }
 
                        $public_group_list = array();

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2016-05-19 07:18:25 UTC (rev 
15176)
+++ trunk/property/inc/class.soproject.inc.php  2016-05-19 10:24:37 UTC (rev 
15177)
@@ -537,7 +537,7 @@
                                }
                                unset($user);
                                reset($public_user_list);
-                               $filtermethod .= " $where (( 
fm_project.coordinator IN(" . implode(',', $public_user_list) . ")";
+                               $filtermethod .= " $where ( 
fm_project.coordinator IN(" . implode(',', $public_user_list) . ")";
                                $where = 'AND';
                        }
 
@@ -659,7 +659,7 @@
                                }
                        }
 
-                       $querymethod .= ')';
+//                     $querymethod .= ')';
 
                        $sql = str_replace('FROM', "{$_custom_cols} FROM", 
$sql);