Changeset 729 for trunk/phpbms

Timestamp:

01/07/10 16:01:56 (2 years ago)

Author:

brieb

Message:

• code clean up
• changed list display of table definitions

Location:

trunk/phpbms

Files:

• include/print_class.php (modified) (2 diffs)
• include/search_class.php (modified) (1 diff)
• install/tablecolumns.sql (modified) (1 diff)
• install/updatev0.98.sql (modified) (1 diff)
• search.php (modified) (3 diffs)

trunk/phpbms/include/print_class.php

@@ -50 +50 @@
 
                 function printer($db,$tableid,$theids){
+
                         $this->db = $db;
                         $this->tableid = $tableid;
@@ -62 +63 @@
                                         `uuid` = '".$this->tableid."'
                                 ";
-                        $queryresult = $this->db->query($querystatement);
-                        if(!$queryresult) $error = new appError(500,"Error retrieving table info.");
+
+                        $queryresult = $this->db->query($querystatement);
+
                         $therecord = $this->db->fetchArray($queryresult);
+
                         $this->maintable = $therecord["maintable"];
 

trunk/phpbms/include/search_class.php

@@ -514 +514 @@
 
                         }//endwhile
-
+//debug($options);
                         return $options;
 

trunk/phpbms/install/tablecolumns.sql

@@ -23 +23 @@
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('tbld:5c9d645f-26ab-5003-b98e-89e9049f8ac3', 'id', 'tabledefs.id', 'center', '', '0', '', '0', '', NULL, '');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('tbld:5c9d645f-26ab-5003-b98e-89e9049f8ac3', 'main table', 'tabledefs.maintable', 'left', '', '3', '', '0', '', NULL, '');
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('tbld:5c9d645f-26ab-5003-b98e-89e9049f8ac3', 'display', 'tabledefs.displayname', 'left', '', '1', '', '0', '100%', NULL, '');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('tbld:5c9d645f-26ab-5003-b98e-89e9049f8ac3', 'display', 'concat(\'[b]\', tabledefs.displayname, \'[/b][br][space][space]\', tabledefs.uuid)', 'left', '', '1', '', '0', '100%', 'bbcode', '');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('tbld:5c9d645f-26ab-5003-b98e-89e9049f8ac3', 'type', 'tabledefs.type', 'center', '', '2', '', '0', '', NULL, '');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('tbld:7e75af48-6f70-d157-f440-69a8e7f59d38', 'name', 'tabs.name', 'left', '', '1', '', '0', '', NULL, '');

trunk/phpbms/install/updatev0.98.sql

@@ -324 +324 @@
 --tablecolumns UPDATE--
 UPDATE `tablecolumns` SET `column` = 'IF(`tabs`.`roleid`=\'\' OR `tabs`.`roleid` IS NULL,\'EVERYONE\',IF(`tabs`.`roleid`=\'Admin\',\'Administrators\',`roles`.`name`))' WHERE `column` = 'if(tabs.roleid=0,\'EVERYONE\',if(tabs.roleid=-100,\'Administrators\',roles.name))' AND `tabledefid` = '203';
+UPDATE `tablecolumns` SET `column` = 'concat(\'[b]\', tabledefs.displayname, \'[/b][br][space][space]\', tabledefs.uuid)', `format` = 'bbcode' WHERE `name` = 'display' AND `tabledefid` = 11;
 --end tablecolumns UPDATE--
 --tabledefs INSERT--

trunk/phpbms/search.php

@@ -82 +82 @@
 
                         if($_POST["theids"] === "")
-                                $_POST["theids"]="-100";
+                            $_POST["theids"]="-100";
 
                         $theids=explode(",",$_POST["theids"]);
-                        $_SESSION["printing"]["tableid"]=$displayTable->thetabledef["uuid"];
-                        $_SESSION["printing"]["maintable"]=$displayTable->thetabledef["maintable"];
+                        $_SESSION["printing"]["tableid"] = $displayTable->thetabledef["uuid"];
+                        $_SESSION["printing"]["maintable"] = $displayTable->thetabledef["maintable"];
                         $_SESSION["printing"]["theids"]=$theids;
                         goURL("print.php");
@@ -103 +103 @@
 
                         //grab the method name
-                        if(((int) $_POST["othercommands"]) === -1)
-                                $functionname = "delete_record";
-                        else {
+                        if(((int) $_POST["othercommands"]) === -1){
+
+                            $functionname = "delete_record";
+
+                        } else {
 
                                 $querystatement = "
@@ -120 +122 @@
 
                                 $functionname = $therecord["name"];
+
+                                if(!hasRights($therecord["roleid"]))
+                                    goURL(APP_PATH."noaccess.php");
 
                         }//endif