Changeset 558 for trunk/phpbms/include

Timestamp:

06/02/09 16:45:50 (3 years ago)

Author:

nate

Message:

• Reports with global access now correctly displayed.

Files:

• trunk/phpbms/include/print_class.php (modified) (5 diffs)

trunk/phpbms/include/print_class.php

@@ -67 +67 @@
                         $therecord = $this->db->fetchArray($queryresult);
                         $this->maintable = $therecord["maintable"];
-                        $this->uuid = $therecord["uuid"];
-
-                        $securitywhere = "";
-
-                        if ($_SESSION["userinfo"]["admin"] != 1 && count($_SESSION["userinfo"]["roles"]) > 0)
-                                $securitywhere=" AND roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",'')";
-
-                        $querystatement="
+                        $this->tableuuid = $therecord["uuid"];
+
+                        $securitywhere="";
+                        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0){
+
+                                foreach($_SESSION["userinfo"]["roles"] as $roleUUID)
+                                        $securitywhere .= ",'".$roleUUID."'";
+
+                                $securitywhere=" AND( `roleid` IN (''".$securitywhere.") OR `roleid` IS NULL)";
+                        }
+
+                        $querystatement = "
                                 SELECT
                                         `id`,
@@ -86 +90 @@
                                 WHERE
                                         (
-                                                tabledefid = ''
+                                                `tabledefid` = ''
                                                 OR
-                                                tabledefid='".$this->uuid."'
+                                                `tabledefid` = '".$this->tableuuid."'
                                         ) ".$securitywhere."
                                 ORDER BY
@@ -95 +99 @@
                                         `name`
                                 ";
+
                         $queryresult = $this->db->query($querystatement);
                         if(!$queryresult) $error = new appError(500,"Error retreving reports.");
@@ -113 +118 @@
 
                         $securitywhere="";
-                        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)
-                                $securitywhere=" AND roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",'')";
-                        $querystring="SELECT id,name,userid FROM usersearches WHERE tabledefid=".$this->tableid." and type=\"".$type."\" and((userid=0 ".$securitywhere.") or userid=\"".$userid."\") order by userid,name";
+                        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0){
+
+                                foreach($_SESSION["userinfo"]["roles"] as $roleUUID)
+                                        $securitywhere .= ",'".$roleUUID."'";
+
+                                $securitywhere = substr($securitywhere, 1);
+
+                                $securitywhere=" AND roleid IN (".$securitywhere.")";
+                        }
+                        $querystring = "
+                                SELECT
+                                        `id`,
+                                        `name`,
+                                        `userid`
+                                FROM
+                                        `usersearches`
+                                WHERE
+                                        `tabledefid`='".$this->tableuuid."'
+                                        AND
+                                        type=\"".$type."\"
+                                        AND
+                                        (
+                                                (userid = '0' ".$securitywhere.")
+                                                OR
+                                                userid=\"".$userid."\"
+                                        )
+                                ORDER BY
+                                        `userid`,
+                                        `name`";
+
                         $thequery = $this->db->query($querystring);
                         return $thequery;
@@ -121 +153 @@
 
 
-                function  donePrinting($backurl){
+                function donePrinting($backurl){
                         if(!$backurl)
                                 goURL("search.php?id=".$this->tableid);