Changeset 570

Timestamp:

06/03/09 19:08:38 (3 years ago)

Author:

nate

Message:

• Files now uses uuid files correctly.
• Initial implementation of uuids for attachments.

Location:

trunk/phpbms

Files:

• include/search_class.php (modified) (1 diff)
• include/tables.php (modified) (3 diffs)
• install/files.sql (modified) (2 diffs)
• install/generateuuids.php (modified) (2 diffs)
• install/updatev0.98.sql (modified) (1 diff)
• modules/base/files_addedit.php (modified) (1 diff)
• modules/base/include/attachments.php (modified) (4 diffs)
• modules/base/include/files.php (modified) (3 diffs)
• modules/bms/clients_attachments.php (modified) (1 diff)
• modules/bms/invoices_attachments.php (modified) (1 diff)
• modules/bms/products_attachments.php (modified) (1 diff)

trunk/phpbms/include/search_class.php

@@ -291 +291 @@
                         //Add limit (settings)
                         $_SESSION["thequerystatement"].=" limit ".$this->recordoffset.", ".RECORD_LIMIT.";";
-
 
                         $this->db->logError=false;

trunk/phpbms/include/tables.php

@@ -394 +394 @@
          * @return array A list of uuids used in the table.
          */
- 
+
         function _loadUUIDList($tableName) {
 
@@ -462 +462 @@
             if(isset($variables["uuid"]))
                 if(!$variables["uuid"])
-                    $this->verifyErrors[] = "The `uuid` field annot be blank";
+                    $this->verifyErrors[] = "The `uuid` field cannot be blank";
 
             if(isset($variables["inactive"]))
@@ -705 +705 @@
 
                                 $this->updateRecord($variables);
+                                if(isset($variables["getid"]))
+                                    if(is_numeric($variables["getid"]))
+                                        $theid = (int) $variables["getid"];// special variable to override the
+                                        //id for get record
 
                                 //get record

trunk/phpbms/install/files.sql

@@ -1 @@
-INSERT INTO `files` (`id`, `uuid`, `name`, `description`, `file`, `type`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`, `roleid`, `custom1`, `custom2`, `custom3`, `custom4`, `custom5`, `custom6`, `custom7`, `custom8`) VALUES ('1', '', 'logo.png', 'Company Logo Used in PDF reports', '‰PNG\r\n\Z\n\0\0\0\rIHDR\0\0\0\0\0]\0\0\0ŸS°\0\0\0gAMA\0\0¯È7Šé\0\0\0tEXtSoftware\0Adobe ImageReadyqÉe<\0\0\0`PLTE666ÑÑѶ¶¶óó󪪪kkk   rrrœœœÅÅŎŽŽèèèÛÛۄ„„¿¿¿|||XXXÞÞÞðððˆˆˆÉÉÉââ╕•€€€KKK&&&QQQPPP%%%bbbcccÿÿÿV\"l\0\0\0ØIDATxÚb \0@£A\0\0D£påΡ\0D£pà”®¡\04ˆÃA‘‘‘‰˜±I#€<^inT)&1^v99YYv^.f°@\0a†ƒ /¿¬
+INSERT INTO `files` (`id`, `uuid`, `name`, `description`, `file`, `type`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`, `roleid`, `custom1`, `custom2`, `custom3`, `custom4`, `custom5`, `custom6`, `custom7`, `custom8`) VALUES ('1', 'file:ad761197-e5a2-3fdf-f330-d1508f10813e', 'logo.png', 'Company Logo Used in PDF reports', '‰PNG\r\n\Z\n\0\0\0\rIHDR\0\0\0\0\0]\0\0\0ŸS°\0\0\0gAMA\0\0¯È7Šé\0\0\0tEXtSoftware\0Adobe ImageReadyqÉe<\0\0\0`PLTE666ÑÑѶ¶¶óó󪪪kkk   rrrœœœÅÅŎŽŽèèèÛÛۄ„„¿¿¿|||XXXÞÞÞðððˆˆˆÉÉÉââ╕•€€€KKK&&&QQQPPP%%%bbbcccÿÿÿV\"l\0\0\0ØIDATxÚb \0@£A\0\0D£påΡ\0D£pà”®¡\04ˆÃA‘‘‘‰˜±I#€<^inT)&1^v99YYv^.f°@\0a†ƒ /¿¬
 X#%á I~8°\0] +t*‚#ËÏ&‚¬†WVVN®‚ÝV~šŽ¬Bœ›
 \"\n0àgj Žp\0«’“
@@ -122 +122 @@
 ܀€\0Â(­Uº
 H•B=óÄ u¶±*€\0\ZYóÜšå0\0 Ñy
-\0 Ñp€\0€\0\Z\r\00\0tP|O;ë\0\0\0\0IEND®B`‚', 'image/png', 1, NOW(), 1, NOW(), '90', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+\0 Ñp€\0€\0\Z\r\00\0tP|O;ë\0\0\0\0IEND®B`‚', 'image/png', 1, NOW(), 1, NOW(), 'Admin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

trunk/phpbms/install/generateuuids.php

@@ -110 +110 @@
         $this->roleList[0] = "";
 
+        $this->tabledefList = $this->generateUUIDList("tabledefs");
+        //
+        //$this->moduleList= $this->generateUUIDList("modules");
+
         $menuList = $this->generateUUIDList("menu");
         $menuList[0] = "";
@@ -128 +132 @@
         //$this->updateFields("usersearches", array("tabledefid"=>$this->tabledefList, "userid"=>$this->userList, "roleid"=>$this->roleList));
         //$this->updateFields("relationships", array("fromtableid"=>$this->tabledefList, "totableid"=>$this->tabledefList));
+
+        //$this->updateFields("files", array("roleid"=>$this->roleList));
         //$this->updateFields("menu", array("parentid"=>$menuList, "roleid"=>$this->roleList));
         //$this->updateFields("smartsearches", array("tabledefid"=>$this->tabledefList, "moduleid"=>$this->moduleList));

trunk/phpbms/install/updatev0.98.sql

@@ -232 +232 @@
 --end usersearches ALTER--
 
+--files UPDATE--
+UPDATE `files` SET
+    `uuid`='file:ad761197-e5a2-3fdf-f330-d1508f10813e',
+    `roleid` = 'Admin'
+WHERE
+    `id`='1';
+--end files UPDATE--
 --menu INSERT--
 DELETE FROM `menu`;

trunk/phpbms/modules/base/files_addedit.php

@@ -67 +67 @@
         function getAttachments($db,$id){
                 $querystatement="SELECT tabledefs.displayname, attachments.recordid, attachments.creationdate, tabledefs.editfile
-                                                FROM attachments INNER JOIN tabledefs ON attachments.tabledefid=tabledefs.id
+                                                FROM attachments INNER JOIN tabledefs ON attachments.tabledefid=tabledefs.uuid
                                                 WHERE fileid=".$id;
                 $queryresult=$db->query($querystatement);

trunk/phpbms/modules/base/include/attachments.php

@@ -39 +39 @@
 if(class_exists("files")){
         class attachments extends files{
-        
-        
+
+
                 function getRecord($id){
                         $id = (int) $id;
-                        
-                        $querystatement = "SELECT
-                                        files.id,attachments.id as attachmentid,name,description,type,roleid,ISNULL(file) as nofile,
-                                        
-                                        attachments.createdby, attachments.creationdate, 
-                                        attachments.modifiedby, attachments.modifieddate
-        
-                                        FROM attachments INNER JOIN files on attachments.fileid=files.id
-                                        WHERE attachments.id=".$id;
-                                        
-                        $queryresult = $this->db->query($querystatement);
-                        
+
+                        $querystatement = "
+                                SELECT
+                                        `files`.`id`,
+                                        `files`.`uuid`,
+                                        `attachments`.`id` AS `attachmentid`,
+                                        `name`,
+                                        `description`,
+                                        `type`,
+                                        `roleid`,
+                                        ISNULL(`file`) AS `nofile`,
+                                        `attachments`.`createdby`,
+                                        `attachments`.`creationdate`,
+                                        `attachments`.`modifiedby`,
+                                        `attachments`.`modifieddate`
+                                FROM
+                                        `attachments`INNER JOIN `files` ON `attachments`.`fileid`=`files`.`uuid`
+                                WHERE
+                                        `attachments`.`id`='".$id."'
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
                         if($this->db->numRows($queryresult))
                                 $therecord = $this->db->fetchArray($queryresult);
-                        else 
+                        else
                                 $therecord = $this-> getDefaults();
-                
-                        
+
+
                         return $therecord;
-        
-                }
-                
+
+                }
+
                 function getDefaults(){
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["attachmentid"] = NULL;
                         $therecord["nofile"] = 1;
-                        
-                        return $therecord;      
-        
-                }
-                
-                
+
+                        return $therecord;
+
+                }
+
+
+                function prepareVariables($variables){
+
+                        $variables["getid"] = $variables["attachmentid"]; //to fix the get record problem
+
+                        return parent::prepareVariables($variables);
+
+                }//end method
+
+
                 function updateRecord($variables, $modifiedby = NULL){
                         parent::updateRecord($variables, $modifiedby);
-                        
+
                         $_POST["id"] = $variables["attachmentid"];
-                }
-                
-        
+
+                }
+
+
                 function insertRecord($variables, $createdby = NULL){
-                        
+
                         if($createdby == NULL)
                                 $createdby = $_SESSION["userinfo"]["id"];
-                        
+
                         if($variables["newexisting"]=="new"){
                                 //we need to add a new file record before adding a new
                                 //attachment record
-                                
-                                $variables["fileid"] = parent::insertRecord($variables, $createdby);                    
+
+                                $variables["fileid"] = parent::insertRecord($variables, $createdby);
                         }
-                        
+
                         //next we create the attachment record
-                        $querystatement="INSERT INTO attachments ";     
+
+                        $querystatement = "
+                                SELECT
+                                        `uuid`,
+                                        `maintable`
+                                FROM
+                                        `tabledefs`
+                                WHERE
+                                        `id` = '".(int)$variables["tabledefid"]."'
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+                        $therecord = $this->db->fetchArray($queryresult);
+                        $tabldefid = $therecord["uuid"];
+                        $maintable = $therecord["maintable"];
+
+                        $querystatement = "
+                                SELECT
+                                        `uuid`
+                                FROM
+                                        `".$maintable."`
+                                WHERE
+                                        `id` = '".$variables["recordid"]."'
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+                        $therecord = $this->db->fetchArray($queryresult);
+                        $recordid = $therecord["uuid"];
+
+                        $querystatement = "
+                                SELECT
+                                        `uuid`
+                                FROM
+                                        `files`
+                                WHERE
+                                        `id` = '".$variables["fileid"]."'
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+                        $therecord = $this->db->fetchArray($queryresult);
+                        $fileid = $therecord["uuid"];
+
+                        $querystatement="INSERT INTO attachments ";
                         $querystatement.="(fileid,tabledefid,recordid,
                                                                 createdby,creationdate,modifiedby) VALUES (";
-                        
-                        $querystatement.=$variables["fileid"].", "; 
-                        $querystatement.=$variables["tabledefid"].", "; 
-                        $querystatement.=$variables["recordid"].", "; 
-                                                
-                        $querystatement.=$createdby.", "; 
+
+                        $querystatement.="'".$fileid."', ";
+                        $querystatement.="'".$tabldefid."', ";
+                        $querystatement.="'".$recordid."', ";
+
+                        $querystatement.=$createdby.", ";
                         $querystatement.="Now(), ";
-                        $querystatement.=$createdby.")"; 
-                
-                        $queryresult = $this->db->query($querystatement);
-                        
+                        $querystatement.=$createdby.")";
+
+                        $queryresult = $this->db->query($querystatement);
+
                         if($queryresult)
                                 return $this->db->insertId();
                         else
                                 return false;
-                                        
+
                 }//end method
-                
+
         }//end class
 }//end if
@@ -124 +187 @@
 
                 function delete_record(){
-                        
+
                         $whereclause = $this->buildWhereClause();
-                        
+
                         $rowsdeleted=0;
                         foreach($this->idsArray as $id){
@@ -132 +195 @@
                                 $queryresult = $this->db->query($querystatement);
                                 $therecord=$this->db->fetchArray($queryresult);
-                                
+
                                 $querystatement = "DELETE FROM attachments WHERE id=".$id.";";
                                 $queryresult = $this->db->query($querystatement);
                                 $rowsdeleted++;
-                                
+
                                 $querystatement = "SELECT id FROM attachments WHERE fileid=".$therecord["fileid"].";";
                                 $queryresult = $this->db->query($querystatement);
@@ -144 +207 @@
                                         $queryresult = $this->db->query($querystatement);
                                 }
-                                
+
                         }
-                
+
                         $querystatement = "DELETE FROM attachments WHERE ".$whereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $message = $this->buildStatusMessage($rowsdeleted);
                         $message.=" deleted.";

trunk/phpbms/modules/base/include/files.php

@@ -41 +41 @@
         class files extends phpbmsTable{
 
-                var $availableRoleIDs = array();
+                var $_availableRoleUUIDs = NULL;
 
                 function getPicture($name){
@@ -54 +54 @@
                 }
 
-                //populates the list of possible role ids
-                //into $this->availableRoleIDs (an array)
-                function populateRoleArray(){
-
-                        $this->availableRoleIDs = array();
-
-                        $querystatement = "
-                                SELECT
-                                        `id`
-                                FROM
-                                        `roles`;
-                                ";
-
-                        $queryresult = $this->db->query($querystatement);
-
-                        //next two should also be allowed, but aren't stored in the database
-                        $this->availableRoleIDs[] = 0;//for everyone
-                        $this->availableRoleIDs[] = -100;//for administrators
-
-                        while($therecord = $this->db->fetchArray($queryresult))
-                                $this->availableRoleIDs[] = $therecord["id"];
-
-                }//end method --populateRoleArray--
-
 
                 function verifyVariables($variables){
 
-                        //if it is set, we'll have to check, if not, it defaults to 0 which is an acceptable
+                        //if it is set, we'll have to check, if not, it defaults to '' which is an acceptable
                         //value.
                         if(isset($variables["roleid"])){
 
-                                //either its numeric or == 0
-                                if(is_numeric($variables["roleid"]) || !$variables["roleid"]){
+                                //check to see if the RoleIDs are populated
+                                if($this->_availableRoleUUIDs === NULL){
+                                        $this->_availableRoleUUIDs = $this->_loadUUIDList("roles");
+                                        $this->_availableRoleUUIDs[] = "";
+                                        $this->_availableRoleUUIDs[] = "Admin";
+                                }//end if
 
-                                        //check to see if the RoleIDs are populated
-                                        if(!count($this->availableRoleIDs))
-                                                $this->populateRoleArray();//populate if not
+                                if(!in_array(((string)$variables["roleid"]), $this->_availableRoleUUIDs))
+                                        $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable role id number.";
 
-                                        //check to see if the int typecast of the roleid (to allow for values
-                                        //equivalent to 0) is an acceptable role id.
-                                        if(!in_array(((int)$variables["roleid"]), $this->availableRoleIDs))
-                                                $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable role id number.";
-                                }else
-                                        $this->verifyErrors[] = "The `roleid` field must be numeric or equivalent to 0.";
                         }//end if
 
@@ -119 +92 @@
                                 }//end if
 
-                        return $variables;
+                        return parent::prepareVariables($variables);
 
                 }//end function

trunk/phpbms/modules/bms/clients_attachments.php

@@ -50 +50 @@
     $refid = (integer) $_GET["id"];
 
+    $querystatement = "
+        SELECT
+            `uuid`,
+            `maintable`
+        FROM
+            `tabledefs`
+        WHERE
+            `id` = '".(int)$tabledefid."'
+        ";
+
+    $queryresult = $db->query($querystatement);
+    $therecord = $db->fetchArray($queryresult);
+    $tabledefuuid = $therecord["uuid"];
+    $maintable = $therecord["maintable"];
+
+    $querystatement = "
+        SELECT
+            `uuid`
+        FROM
+            `".$maintable."`
+        WHERE
+            `id` = '".$refid."'
+        ";
+
+    $queryresult = $db->query($querystatement);
+    $therecord = $db->fetchArray($queryresult);
+    $refuuid = $therecord["uuid"];
+
     $securitywhere="";
-    if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)
-        $securitywhere=" AND files.roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";
+    if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0){
+        $securitywhere = "''";
+        foreach($_SESSION["userinfo"]["roles"] as $roleuuid)
+            $securitywhere .= ",'".$roleuuid."'";
+    }//end if
 
-    $whereclause="attachments.tabledefid=".$tabledefid." AND attachments.recordid=".$refid.$securitywhere;
+    $whereclause="attachments.tabledefid='".$tabledefuuid."' AND attachments.recordid='".$refuuid."'".$securitywhere;
     $backurl="../bms/clients_attachments.php";
     $base="../../";

trunk/phpbms/modules/bms/invoices_attachments.php

@@ -48 +48 @@
         if(isset($_GET["refid"])) $_GET["id"]=$_GET["refid"];
         $refid=(integer) $_GET["id"];
-        $securitywhere="";
-        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)
-                $securitywhere=" AND files.roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";
-        $whereclause="attachments.tabledefid=".$tabledefid." AND attachments.recordid=".$refid.$securitywhere;
+
+    $querystatement = "
+        SELECT
+            `uuid`,
+            `maintable`
+        FROM
+            `tabledefs`
+        WHERE
+            `id` = '".(int)$tabledefid."'
+        ";
+
+    $queryresult = $db->query($querystatement);
+    $therecord = $db->fetchArray($queryresult);
+    $tabledefuuid = $therecord["uuid"];
+    $maintable = $therecord["maintable"];
+
+    $querystatement = "
+        SELECT
+            `uuid`
+        FROM
+            `".$maintable."`
+        WHERE
+            `id` = '".$refid."'
+        ";
+
+    $queryresult = $db->query($querystatement);
+    $therecord = $db->fetchArray($queryresult);
+    $refuuid = $therecord["uuid"];
+
+    $securitywhere="";
+    if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0){
+        $securitywhere = "''";
+        foreach($_SESSION["userinfo"]["roles"] as $roleuuid)
+            $securitywhere .= ",'".$roleuuid."'";
+    }//end if
+
+    $whereclause="attachments.tabledefid='".$tabledefuuid."' AND attachments.recordid='".$refuuid."'".$securitywhere;
         $backurl="../bms/invoices_attachments.php";
         $base="../../";

trunk/phpbms/modules/bms/products_attachments.php

@@ -48 +48 @@
         if(isset($_GET["refid"])) $_GET["id"]=$_GET["refid"];
         $refid=(integer) $_GET["id"];
-        $securitywhere="";
-        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)
-                $securitywhere=" AND files.roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";
-        $whereclause="attachments.tabledefid=".$tabledefid." AND attachments.recordid=".$refid.$securitywhere;
+    $querystatement = "
+        SELECT
+            `uuid`,
+            `maintable`
+        FROM
+            `tabledefs`
+        WHERE
+            `id` = '".(int)$tabledefid."'
+        ";
+
+    $queryresult = $db->query($querystatement);
+    $therecord = $db->fetchArray($queryresult);
+    $tabledefuuid = $therecord["uuid"];
+    $maintable = $therecord["maintable"];
+
+    $querystatement = "
+        SELECT
+            `uuid`
+        FROM
+            `".$maintable."`
+        WHERE
+            `id` = '".$refid."'
+        ";
+
+    $queryresult = $db->query($querystatement);
+    $therecord = $db->fetchArray($queryresult);
+    $refuuid = $therecord["uuid"];
+
+    $securitywhere="";
+    if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0){
+        $securitywhere = "''";
+        foreach($_SESSION["userinfo"]["roles"] as $roleuuid)
+            $securitywhere .= ",'".$roleuuid."'";
+    }//end if
+
+    $whereclause="attachments.tabledefid='".$tabledefuuid."' AND attachments.recordid='".$refuuid."'".$securitywhere;
         $backurl="../bms/products_attachments.php";
         $base="../../";