Changeset 485 for trunk/phpbms/install

Timestamp:

04/07/09 11:44:18 (3 years ago)

Author:

nate

Message:

• Merged Nathan branch back into trunk.

Location:

trunk/phpbms/install

Files:

• createtables.sql (modified) (10 diffs)
• fail.gif (copied) (copied from branches/nathan/install/fail.gif)
• index.php (copied) (copied from branches/nathan/install/index.php)
• install.css (modified) (1 diff)
• install.js (modified) (1 diff)
• install.php (deleted)
• installajax.php (copied) (copied from branches/nathan/install/installajax.php)
• installxml.php (deleted)
• install_include.php (modified) (1 diff)
• menu.sql (modified) (1 diff)
• notes.sql (modified) (1 diff)
• scheduler.sql (modified) (1 diff)
• success.gif (copied) (copied from branches/nathan/install/success.gif)
• tablecolumns.sql (modified) (1 diff)
• tabledefs.sql (modified) (1 diff)
• tablefindoptions.sql (modified) (1 diff)
• tablegroupings.sql (modified) (1 diff)
• tableoptions.sql (modified) (1 diff)
• tablesearchablefields.sql (modified) (1 diff)
• update.js (modified) (1 diff)
• update.php (modified) (3 diffs)
• updateajax.php (copied) (copied from branches/nathan/install/updateajax.php)
• updatev0.98.sql (modified) (3 diffs)
• updatexml.php (deleted)
• update_include.php (modified) (1 diff)
• version.php (deleted)
• warning.gif (copied) (copied from branches/nathan/install/warning.gif)

trunk/phpbms/install/createtables.sql

@@ -58 +58 @@
   `assignedtodate` date default NULL,
   `subject` varchar(128) default NULL,
-  `type` char(2) default NULL,
+  `type` char(2) NOT NULL default 'NT',
   `createdby` int(11) NOT NULL default '0',
   `creationdate` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -115 +115 @@
   `displayorder` int(11) NOT NULL default '0',
   `roleid` int(11) NOT NULL default '0',
-  `reportfile` varchar(128) default NULL,
+  `reportfile` varchar(128) NOT NULL,
   `description` text,
   `createdby` int(11) NOT NULL default '0',
@@ -169 +169 @@
   `modifieddate` timestamp NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=INNODB  AUTO_INCREMENT=1000; 
+) ENGINE=INNODB  AUTO_INCREMENT=1000;
 
 CREATE TABLE tablefindoptions (
@@ -180 +180 @@
   PRIMARY KEY  (id),
   KEY tabledef (tabledefid)
-) ENGINE=INNODB  AUTO_INCREMENT=2000; 
+) ENGINE=INNODB  AUTO_INCREMENT=2000;
 
 CREATE TABLE tableoptions (
@@ -193 +193 @@
   PRIMARY KEY  (id),
   KEY tabledef (tabledefid)
-) ENGINE=INNODB  AUTO_INCREMENT=2000; 
+) ENGINE=INNODB  AUTO_INCREMENT=2000;
 
 CREATE TABLE tablesearchablefields (
@@ -211 +211 @@
   firstname varchar(64) NOT NULL default '',
   lastname varchar(64) NOT NULL default '',
+  `lastip` VARCHAR(45) NOT NULL DEFAULT '',
   creationdate datetime NOT NULL default '0000-00-00 00:00:00',
   revoked tinyint(1) NOT NULL default '0',
@@ -259 +260 @@
   `roleid` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=INNODB  AUTO_INCREMENT=100; 
+) ENGINE=INNODB  AUTO_INCREMENT=100;
 
 CREATE TABLE `attachments` (
@@ -274 +275 @@
   KEY `thetable` (`tabledefid`),
   KEY `thefile` (`fileid`)
-) ENGINE=INNODB ; 
+) ENGINE=INNODB ;
 
 CREATE TABLE `roles` (
@@ -280 +281 @@
   `name` VARCHAR(64) NOT NULL,
   `description` TEXT,
-  `inactive` tinyint(4) NOT NULL,
+  `inactive` tinyint(4) NOT NULL DEFAULT 0,
   `createdby` INTEGER UNSIGNED,
   `creationdate` DATETIME,
@@ -351 +352 @@
   PRIMARY KEY  (`id`)
 ) ENGINE=INNODB;
-

trunk/phpbms/install/install.css

@@ -1 @@
-.bodyline,#topTitle{width:740px; margin:10px auto;}
-h1{margin-bottom:20px;}
-p{margin:0;padding:0px 10px 10px;}
+li{
+    margin-bottom: 20px;
+}
+
+.bodyline,#topTitle{
+    width:100%;
+    max-width: 740px;
+    margin:10px auto;
+}
+
+h1{
+    margin-bottom:20px;
+}
+
+p{
+    margin:10px 0;
+    padding:0;
+}
+
+#navPanel{
+    float: left;
+    width: 190px;
+}
+
+#navSelect{
+    font-size: 12px;
+    padding:0;
+    width: 98%
+}
+
+#stepsPanel{
+    margin-left: 198px;
+    min-height: 400px;
+    border-left: 1px solid #CCCCCC;
+    padding-left: 8px;
+}
+
+
+.success{
+    color: green;
+    line-height: 16px;
+    background: url("success.gif") no-repeat left;
+    padding:2px 0 2px 20px;
+}
+
+.fail {
+    color: red;
+    line-height: 16px;
+    background: url("fail.gif") no-repeat left;
+    padding:2px 0 2px 20px;
+}
+
+.warning {
+    line-height: 16px;
+    background: url("warning.gif") no-repeat left;
+    padding:2px 0 2px 20px;
+}
+
+.running {
+    line-height: 16px;
+    background: url("../common/image/spinner.gif") no-repeat left;
+    padding:2px 0 2px 20px;
+}
+
+
+#sysRequirements td{
+    border-bottom: 1px solid #CCCCCC;
+    padding: 5px 10px;
+}
 
 .results{width:99%;font-family:'Courier New', Courier, mono;font-size:13px;}
 .testButtonsP{text-align:center; padding:20px;}
 
-.nextprevP{text-align:right;}
-.nextprevButtons{padding-right:20px;padding-left:20px;}
+.nextprevP{
+    float: right;
+    margin: 0;
+}
 
-#moduleInformation h2{margin-top:0;padding-top:5px;}
+.nextButtons, .prevButtons{
+    padding:3px 20px;
+}
+
+.debugResults{
+    display: none;
+}
+
+#moduleTable td{
+
+    padding: 5px 10px;
+    border-top: 1px solid #CCCCCC;
+    vertical-align: top;
+}
+
+#moduleTable td h3{
+    margin-top: 0;
+    margin-left: 0;
+}
+
+#moduleTable th{
+    text-align: left;
+    background: #7B8DA1;
+    color: white;
+    padding: 10px;
+}
+
+.moduleInstall{
+    white-space: nowrap;
+    min-width: 120px;
+}
+
+#userpassTable{
+
+    margin: 0 auto;
+
+}
+
+    #userpassTable td{
+
+        font-size: 22px;
+
+    }

trunk/phpbms/install/install.js

@@ -1 @@
-window.onload = function(){
-        var sections = getElementsByClassName("bodyline");
-        
-        var i;
-        for(i=0; i< sections.length; i++){
-                if(sections[i].id != "step1"){
-                        sections[i].style.display = "none";
+installer = {
+
+        testConnection: function(){
+
+                var response = installer.runCommand("testconnection");
+                var testConnectionNoDebug = getObjectFromID("testConnectionNoDebug");
+
+                if(response.success === true){
+                        testConnectionNoDebug.className = "success"
+                        testConnectionNoDebug.innerHTML = "Connection Successful";
+                } else {
+                        testConnectionNoDebug.className = "fail"
+                        testConnectionNoDebug.innerHTML = "Connection Failed";
                 }
+
+        },//endfunction testConnection
+
+
+        createDatabase: function(){
+
+                var response = installer.runCommand("createdatabase");
+                var noDebug = getObjectFromID("createDatabaseNoDebug");
+
+                if(response.success === true){
+
+                        noDebug.className = "success"
+                        noDebug.innerHTML = "Database Schema Created";
+
+                } else {
+
+                        noDebug.className = "fail"
+                        noDebug.innerHTML = "Database Schema Creation Failed";
+
+                }//endif
+
+        }, // endfunction createdatabase
+
+
+        coreDataInstall: function(){
+
+                var noDebug = getObjectFromID("coreDataNoDebug");
+
+                noDebug.className = "running";
+                noDebug.innerHTML = "Running...";
+
+
+                //we pass the entered application name and e-mail address as a "::" separated pair
+                var appname = getObjectFromID("appname");
+                var email = getObjectFromID("email");
+
+                var extras = encodeURIComponent(appname.value + "::" + email.value)
+
+                var response = installer.runCommand("coredatainstall", extras);
+
+                if(response.success === true){
+
+                        noDebug.className = "success";
+                        noDebug.innerHTML = "Core Data Installed Succefully";
+
+                        var pass2 = getObjectFromID("pass2")
+
+                        pass2.innerHTML = response.extras;
+
+                } else {
+
+                        noDebug.className = "fail";
+                        noDebug.innerHTML = "Core Data Installation Failed";
+
+                }//endif
+
+        }, // endfunction coreDataInstall
+
+
+        moduleInstall: function(e){
+
+                var theButton = e.src();
+
+                var foo = "";
+
+                var module = theButton.id.substring(12);
+
+                var noDebug = getObjectFromID("Results"+module);
+
+                noDebug.className = "running";
+                noDebug.innerHTML = "Running...";
+
+                var response = installer.runCommand("moduleinstall", module);
+
+                if(response.success === true){
+
+                        noDebug.className = "success";
+                        noDebug.innerHTML = "Module Installed";
+
+                } else {
+
+                        noDebug.className = "fail";
+                        noDebug.innerHTML = "Installation Failed";
+
+                }//endif
+
+        },//end function moduleInstall
+
+
+        runCommand: function(command, extras){
+
+                if(typeof(extras) == "undefined")
+                        extras = "";
+                else
+                        extras = "&extras=" + extras
+
+                var theURL = "installajax.php?command=" + command + extras;
+
+                loadXMLDoc(theURL,null,false);
+
+                var JSONresponse;
+                eval("JSONresponse = (" + req.responseText +")");
+
+                var responseText = getObjectFromID(command + "results");
+                if(typeof(responseText) != "undefined"){
+
+                        if(responseText.value)
+                                responseText.value += "\n";
+
+                        responseText.value += JSONresponse.details;
+
+                }//endif
+
+                return JSONresponse
+
+        },//endfunction runCommand
+
+
+        toggleDebug: function(){
+
+                var debug = getObjectFromID("debug");
+                var display = "none";
+                if(debug.checked)
+                        display = "block";
+
+                var debugDisplays = getElementsByClassName("debugResults");
+
+                for(var i = 0; i < debugDisplays.length; i ++)
+                        debugDisplays[i].style.display = display;
+
+        }//end function toggleDebug
+
+}//end class installer
+
+
+
+stepsNav = {
+
+        currentSection: 1,
+        sections: null,
+
+        navNext: function(){
+
+                if(stepsNav.currentSection + 1 <= stepsNav.sections.length){
+                        stepsNav.navTo(stepsNav.currentSection + 1);
+                }
+        },
+
+
+        navPrev: function(){
+                if(stepsNav.currentSection - 1 > 0)
+                        stepsNav.navTo(stepsNav.currentSection - 1);
+        },
+
+
+        navTo: function(section){
+
+                for(var i=0; i< stepsNav.sections.length; i++){
+
+                        if(stepsNav.sections[i].id != "step" + section){
+                                stepsNav.sections[i].style.display = "none";
+                        } else {
+                                stepsNav.sections[i].style.display = "block";
+                        }//endif
+
+                }//endfor
+
+                navBar = getObjectFromID("navSelect");
+                for(i=0; i < navBar.options.length; i++){
+                        if(navBar.options[i].value == section){
+                                navBar.options[i].selected = true;
+                        }
+                }//endfor
+                //navBar.selectedIndex = section
+
+                stepsNav.currentSection = section;
+
+        },//end function navTo
+
+
+        navLeft: function(){
+
+                var navSelect = getObjectFromID("navSelect");
+                stepsNav.navTo(parseInt(navSelect.value));
+
+
         }
+
 }
 
-function goSection(direction){
-        var sections = getElementsByClassName("bodyline");
-        var currSection = 1;
-        
-        for(i=0; i< sections.length; i++){
-                if(sections[i].style.display == "block")                        
-                        currSection = parseInt(sections[i].id.substr(4),10);
-        }
-        
-        if(direction == "next")
-                direction = 1;
-        else
-                direction = -1;
-        
-        if(currSection + direction == 0)
-                return false;
-        else{
-                var currDiv = getObjectFromID("step"+currSection);
-                var newDiv = getObjectFromID("step"+(currSection + direction))
-
-                currDiv.style.display = "none";
-                newDiv.style.display = "block";
-        }
-}//end function
-
-
-        function runCommand(command){
-                var theURL="installxml.php?command="+command;
-                if(command=="updatesettings"){
-                        var mServer=getObjectFromID("mysqlserver");
-                        var mDatabase=getObjectFromID("mysqldb");
-                        var mUser=getObjectFromID("mysqluser");
-                        var mPassword=getObjectFromID("mysqluserpass");
-                        theURL+="&ms="+encodeURIComponent(mServer.value);
-                        theURL+="&mdb="+encodeURIComponent(mDatabase.value);
-                        theURL+="&mu="+encodeURIComponent(mUser.value);
-                        theURL+="&mup="+encodeURIComponent(mPassword.value);
-                }
-                var responseText= getObjectFromID(command+"results");
-                loadXMLDoc(theURL,null,false);
-                if(req.responseXML)
-                        response = req.responseXML.documentElement.firstChild.data+"\n";
-                else 
-                        response = req.responseText+"\n";
-                responseText.value += response;
-        }
-        
-
-        function changeModule(){
-                var moduleSel=getObjectFromID("modules");
-                var installButton=getObjectFromID("installmodule");
-                var modinfo = getObjectFromID("moduleInformation");
-                
-                var modName = getObjectFromID("modulename");
-                var modVer = getObjectFromID("moduleversion");
-                var modDesc = getObjectFromID("moduledescription");
-                var modReq = getObjectFromID("modulerequirements");
-                
-                if(moduleSel.value!=0){
-                        installButton.disabled=false;
-                        
-                        modName.innerHTML = modules[moduleSel.value]["name"];
-                        modVer.innerHTML = modules[moduleSel.value]["version"];
-                        modDesc.innerHTML = modules[moduleSel.value]["description"];
-                        modReq.innerHTML = modules[moduleSel.value]["requirements"];
-                        
-                        modinfo.style.display = "block";                                                
-                }
-                else{
-                        installButton.disabled=true;
-                        modinfo.style.display = "none";                 
-                }
-        }
-        
-        function runModuleInstall(){
-                var themodule=getObjectFromID("modules");
-                var responseText= getObjectFromID("moduleresults");
-                if(themodule.value=="")
-                        alert("You must select a module to install first.");
-                else {
-                        var theURL="../modules/"+themodule.value+"/install/install.php";
-                        loadXMLDoc(theURL,null,false);
-                        if(req.responseXML)
-                                response = req.responseXML.documentElement.firstChild.data+"\n";
-                        else 
-                                response = req.responseText;
-                        responseText.value+=response;
-                }
-        }
+// ====== Init Listeners =======================================================
+
+connect(window,"onload",function() {
+
+        stepsNav.sections = getElementsByClassName("steps");
+        stepsNav.navTo(1);
+
+        var nextButtons = getElementsByClassName("nextButtons");
+        for(var i=0; i< nextButtons.length; i++)
+                connect(nextButtons[i], "onclick", stepsNav.navNext);
+
+        var prevButtons = getElementsByClassName("prevButtons");
+        for(var i=0; i< prevButtons.length; i++)
+                connect(prevButtons[i], "onclick", stepsNav.navPrev);
+
+        var navSelect = getObjectFromID("navSelect");
+        connect(navSelect, "onchange", stepsNav.navLeft);
+
+        var debug = getObjectFromID("debug");
+        connect(debug, "onchange", installer.toggleDebug);
+
+        var testConnectionButton = getObjectFromID("testConnectionButton");
+        connect(testConnectionButton, "onclick", installer.testConnection);
+
+        var createDatabaseButton = getObjectFromID("createDatabaseButton");
+        connect(createDatabaseButton, "onclick", installer.createDatabase)
+
+        var coreDataButton = getObjectFromID("coreDataButton");
+        connect(coreDataButton, "onclick", installer.coreDataInstall);
+
+        moduleButtons = getElementsByClassName("moduleButtons");
+        for(i = 0; i < moduleButtons.length; i++)
+                connect(moduleButtons[i], "onclick", installer.moduleInstall);
+
+})

trunk/phpbms/install/install_include.php

@@ -1 +1 @@
 <?php
-function processSQLfile($db,$filename){
-        global $dblink;
-
-        $thefile = @ fopen($filename,"r");
-        if(!$thefile)
-                return "Could not open the file ".$filename.".\n";
-
-        $thereturn="Processing SQL from file '".$filename."'\n";
-                while(!feof($thefile)) {
-                        $sqlstatement=trim(fgets($thefile,2048));
-                        if(strrpos($sqlstatement,";")==strlen($sqlstatement)-1){
-                                $theresult=$db->query($sqlstatement);
-                                if($db->error)
-                                        $thereturn = "Error processing SQL file  ".$filename.": ".$db->error."\n".$sqlstatement;
-                                $sqlstatement="";
-                        }//end if;
-                }//end while
-
-        $thereturn.="Done processing SQL from file '".$filename."'. \n\n";
-        return $thereturn;
-}//end function
-
-
-function verifyAdminLogin($db,$user,$pass){
-
-        if((real) getCurrentVersion($db,"base")>=.7)
-                $querystatement="SELECT id FROM users WHERE login=\"".mysql_real_escape_string($user)."\" AND password=encode(\"".mysql_real_escape_string($pass)."\",\"".ENCRYPTION_SEED."\") AND admin=1";
-        else
-                $querystatement="SELECT id FROM users WHERE login=\"".mysql_real_escape_string($user)."\" AND password=encode(\"".mysql_real_escape_string($pass)."\",\"".ENCRYPTION_SEED."\") AND accesslevel>=90";
-
-        $queryresult=$db->query($querystatement);
-
-        if(!$queryresult)
-                return false;
-        return ($db->numRows($queryresult)>0);
-}
-
-
-function getCurrentVersion($db,$module){
-
-        $querystatement="SELECT version FROM modules WHERE name=\"".mysql_real_escape_string($module)."\";";
-        $queryresult=$db->query($querystatement);
-
-        $ver=$db->fetchArray($queryresult);
-        return $ver["version"];
-}
-
-
-function loadModules($type){
-        $currdirectory = @getcwd();
-
-        $thedir= @ opendir("../modules/");
-
-        echo 'modules = Array();'."\n";
-
-        $modules = array();
-        while($entry=readdir($thedir)){
-                if($entry != "." && $entry != ".." && $entry != "base" && $entry != "sample" && is_dir("../modules/".$entry)){
-                        if(file_exists("../modules/".$entry."/install/".$type.".php") && file_exists("../modules/".$entry."/install/version.php")){
-                                include("../modules/".$entry."/install/version.php");
-                        }
-                }
-        }
-
-        foreach($modules as $name=>$module)
-                if(is_array($module)){
-                        echo 'modules["'.$name.'"] = Array()'."\n";
-                        foreach($module as $key=>$value)
-                                echo 'modules["'.$name.'"]["'.$key.'"] = "'.$value.'";'."\n";
-                }
-
-        @ chdir ($currdirectory);
-
-        return $modules;
-}//end function
-
-
-function showModules($modules){
-        if(is_array($modules)){
-                foreach($modules as $name => $module)
-                        if($name != "base")
-                                if(is_array($module)){
-                                        ?><option value="<?php echo $name ?>"><?php echo $module["name"]?></option><?php
-                                }
-        }
-}
-
-
-function createTables($db,$sqlfile){
-
-        $sqlstatement="";
-        $thereturn = "";
-
-        $createfile = @ fopen("createtables.sql","r");
-        if(!$createfile)
-                return "Could not open SQL file: ".$sqlfile;
-        else{
-                while(!feof($createfile)) {
-                        $sqlstatement.= @ fgets($createfile,1024);
-                        if(strpos($sqlstatement,";")){
-
-                                $theresult = $db->query(trim($sqlstatement));
-
-                                if($db->error){
-                                        return "Error creating tables: ".$db->error."\n\n".trim($sqlstatement);
-                                }
-                                $sqlstatement="";
-                        }//end if;
-                }//end while
-
-        }//end if
-
-        return true;
-}
-
-
-function importData($db,$tablename){
-
-        $tablefile = @ fopen($tablename.".sql","rb");
-        if(!$tablefile)
-                return "Could not open the file ".$tablename.".sql\n";
-
-        $thereturn="";
-        $counter=0;
-        $failure = false;
-
-        while(!feof($tablefile)) {
-                $sqlstatement=trim(fgets($tablefile,8184));
-                if(strrpos($sqlstatement,";")==strlen($sqlstatement)-1){
-
-                        $theresult=$db->query($sqlstatement);
-
-                        if($db->error){
-                                $failure = true;
-                                $thereturn .= "Error importing record into ".$tablename.": ".$db->error."\n";
-                        }
+        class installer{
+
+                var $db;
+
+                function installer($db){
+
+                        $this->db = $db;
+
+                }//end function init
+
+
+                function createTables($sqlfile){
+
+                        $sqlstatement="";
+                        $thereturn = "";
+                        $line = 1;
+
+                        $filePointer = @ fopen($sqlfile,"r");
+
+                        if(!$filePointer)
+                                return "Could not open SQL file: ".$sqlfile;
+
+                        while(!feof($filePointer)) {
+
+                                $createstatement .= @ fgets($filePointer,1024);
+
+                                if(strpos($createstatement,";")){
+
+                                        $this->db->query(trim($createstatement));
+
+                                        if($this->db->error)
+                                                return "Error creating tables on line ".$line.": ".$this->db->error." SQL Statement: ".trim($createstatement);
+
+                                        $createstatement = "";
+
+                                }//end if;
+
+                                $line++;
+
+                        }//end while
+
+                        return true;
+
+                }//end function createTables
+
+
+                function processSQLfile($filename){
+
+                        $thefile = @ fopen($filename,"r");
+                        $line = 1;
+                        $thereturn = "";
+
+                        if(!$thefile)
+                                return "Could not open the SQL file ".$filename;
+
+                        while(!feof($thefile)) {
+
+                                $sqlstatement .= @ trim(fgets($thefile));
+
+                                // we look for the ; at the end of the line
+                                // If it is not there, we keep adding to the sql statement
+                                if(strrpos($sqlstatement,";") == strlen($sqlstatement)-1){
+
+                                        $this->db->query(trim($sqlstatement));
+                                        if($this->db->error)
+                                                $thereturn .= "Error processing SQL file '".$filename."' on line ".$line.": ".$this->db->error." - SQL Statement: ".$sqlstatement."\n";
+
+                                        $sqlstatement = "";
+
+                                }//end if;
+
+                                $line++;
+
+                        }//end while
+
+                        if($thereturn)
+                                return $thereturn;
                         else
-                                $counter++;
-
-                        $sqlstatement="";
-                }//end if;
-        }//end while
-
-        if($failure)
-                $threturn = "Importing of some records in ".$tablename." occured.\n\n";
-        else
-                $thereturn.="Import of ".$counter." record(s) for '".$tablename."' complete.\n";
-
-        return $thereturn;
-}//end function
+                                return true;
+
+                }//end function
+
+        }//end class
+
+
+
+        class modules{
+
+                var $list = array();
+
+                // this loads the modules in to an array
+                // type looks for either update, to make sure the
+                // module folder has an install folder, and inside the install
+                // folder is an install.php or update .php (depending on type)
+                // and that it has a version.php file;
+                function modules($type = "install"){
+
+                        $currdirectory = @getcwd();
+
+                        $thedir= @ opendir("../modules/");
+
+                        $modules = array();
+
+                        //this helps build the modules array
+                        // each included modules version.php should add to the
+                        // array
+                        while($entry = readdir($thedir)){
+
+                                if($entry != "." && $entry != ".." && $entry != "base" && $entry != "sample" && is_dir("../modules/".$entry)){
+
+                                        if(file_exists("../modules/".$entry."/install/".$type.".php") && file_exists("../modules/".$entry."/version.php")){
+
+                                                include("../modules/".$entry."/version.php");
+
+                                        }//endif
+
+                                }//endif
+
+                        }//end if
+
+                        @ chdir ($currdirectory);
+
+                        $this->list = $modules;
+
+                }//end function init
+
+
+                function displpayJS(){
+
+                        echo 'modules = Array();'."\n";
+
+                        foreach($this->list as $name=>$module)
+                                if(is_array($module) && $name != "base"){
+
+                                        echo 'modules["'.$name.'"] = Array()'."\n";
+                                        foreach($module as $key=>$value)
+                                                echo 'modules["'.$name.'"]["'.$key.'"] = "'.$value.'";'."\n";
+                                }//endif
+
+
+                }//end function displayJS
+
+
+                function displayInstallTable(){
+
+                        ?>
+                        <table id="moduleTable" cellpadding="0" cellspacing="0" border="0">
+                                <thead>
+                                        <tr>
+                                                <th>module</th>
+                                                <th>version</th>
+                                                <th>&nbsp;</th>
+                                        </tr>
+                                </thead>
+                                <tbody>
+                        <?php
+
+                        ksort($this->list);
+
+                        foreach($this->list as $key=>$module){
+
+                                if($key != "base"){
+
+                                        ?>
+                                        <tr>
+                                                <td>
+                                                        <h3><strong><?php echo $module["name"]?></strong></h3>
+                                                        <p><?php echo $module["description"]?></p>
+                                                        <p class="notes"><strong>Requirements:</strong> <?php echo $module["requirements"]?></p>
+                                                </td>
+                                                <td><?php echo $module["version"] ?></td>
+                                                <td class="moduleInstall">
+                                                        <button class="Buttons moduleButtons" id="moduleButton<?php echo $key ?>">Install Module</button>
+                                                        <p><span class="" id="Results<?php echo $key?>"></span></p>
+                                                </td>
+                                        </tr>
+                                        <?php
+
+                                }//end if
+
+                        }//end foreach
+
+                        ?></tbody></table><?php
+
+                }//end function displayInstallTable
+
+        }//end class
+
+
+
+        class installUpdateBase{
+
+                var $db;
+                var $phpbmsSession;
+
+                function returnJSON($success, $details, $extras = null){
+
+                        $thereturn["success"] = $success;
+                        $thereturn["details"] = $details;
+
+                        if($extras)
+                                $thereturn["extras"] = $extras;
+
+                        return json_encode($thereturn);
+
+                }//endfunction returnJSON
+
+        }//end class installUpdateBase
+
 
 ?>

trunk/phpbms/install/menu.sql

@@ -1 @@
-INSERT INTO `menu` (`id`, `name`, `link`, `parentid`, `displayorder`, `createdby`, `modifiedby`, `creationdate`, `modifieddate`, `roleid`) VALUES ('1', 'Organizer', '', '0', '3', '1', '1', NOW(), NOW(), '0');
+INSERT INTO `menu` (`id`, `name`, `link`, `parentid`, `displayorder`, `createdby`, `modifiedby`, `creationdate`, `modifieddate`, `roleid`) VALUES ('1', 'Tools', '', '0', '3', '1', '1', NOW(), NOW(), '0');
 INSERT INTO `menu` (`id`, `name`, `link`, `parentid`, `displayorder`, `createdby`, `modifiedby`, `creationdate`, `modifieddate`, `roleid`) VALUES ('2', 'Notes', 'search.php?id=12', '1', '1', '1', '1', NOW(), NOW(), '0');
 INSERT INTO `menu` (`id`, `name`, `link`, `parentid`, `displayorder`, `createdby`, `modifiedby`, `creationdate`, `modifieddate`, `roleid`) VALUES ('3', 'Tasks', 'search.php?id=23', '1', '2', '1', '1', NOW(), NOW(), '0');

trunk/phpbms/install/notes.sql

@@ -1 +1 @@
 INSERT INTO `notes` (`assignedtoid`, `attachedid`, `attachedtabledefid`, `content`, `assignedtodate`, `subject`, `type`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`, `importance`, `parentid`, `startdate`, `enddate`, `completed`, `private`, `status`, `completeddate`, `location`, `category`, `assignedtotime`, `starttime`, `endtime`, `assignedbyid`, `repeating`, `repeattype`, `repeatuntil`, `repeatevery`, `repeattimes`, `repeateachlist`, `repeatontheday`, `repeatontheweek`, `firstrepeat`, `lastrepeat`, `timesrepeated`, `repeatname`) VALUES (NULL,NULL,NULL,'For more help using this software use the following links:\r\n\r\nhttp://www.phpbms.org - community site and wiki.\r\n\r\nhttp://www.phpbms.org/forum -user support forum.\r\n\r\nhttp://www.kreotek.com - paid support and customization.',NULL,'Welcome to phpBMS','SM',1,NOW(),1,NOW(),0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'Daily',NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL);
+INSERT INTO `notes` (`assignedtoid`, `attachedid`, `attachedtabledefid`, `content`, `assignedtodate`, `subject`, `type`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`, `importance`, `parentid`, `startdate`, `enddate`, `completed`, `private`, `status`, `completeddate`, `location`, `category`, `assignedtotime`, `starttime`, `endtime`, `assignedbyid`, `repeating`, `repeattype`, `repeatuntil`, `repeatevery`, `repeattimes`, `repeateachlist`, `repeatontheday`, `repeatontheweek`, `firstrepeat`, `lastrepeat`, `timesrepeated`, `repeatname`) VALUES (NULL, NULL, NULL, '1) From the menu, navigate to Tools->Notes.\r\n2) From the find drop down, choose \'System Messages\' and then click the search button.\r\n3) Select the record(s) you want to delete and then click the delete (-) button.', NULL, 'How To Delete System Messages', 'SM', 1, NOW(), 1, NOW(), '0', NULL, NULL, NULL, '0', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '0', 'Daily', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, '0', NULL);

trunk/phpbms/install/scheduler.sql

@@ -1 @@
-INSERT INTO `scheduler` (`name`, `job`, `crontab`, `lastrun`, `startdatetime`, `enddatetime`, `description`, `inactive`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('clean import files', '/scheduler_delete_tempimport.php', '30::*::*::*::*', NULL, NOW(), NULL, 'This will delete any temporary import files that are present (for whatever reason) after 30 minutes of their creation.', '0', 1, NOW(), 1, NOW());
+INSERT INTO `scheduler` (`name`, `job`, `crontab`, `lastrun`, `startdatetime`, `enddatetime`, `description`, `inactive`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('Clean Import Files', './scheduler_delete_tempimport.php', '30::*::*::*::*', NULL, NOW(), NULL, 'This will delete any temporary import files that are present (for whatever reason) after 30 minutes of their creation.', '0', 1, NOW(), 1, NOW());
+INSERT INTO `scheduler` (`id`, `name`, `job`, `crontab`, `lastrun`, `startdatetime`, `enddatetime`, `description`, `inactive`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('4', 'Remove Excess System Log Records', './scheduler_delete_logs.php', '*::24::*::*::*', NULL, '2009-03-31 12:00:00', NULL, 'This script will trim the system log when there are more than 2000 records present at the time of its calling (default will be every 24 hours).', '0', 1, NOW(), 1, NOW());

trunk/phpbms/install/tablecolumns.sql

@@ -1 @@
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (9,'log in name','users.login','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (9,'name','concat(users.firstname,\" \",users.lastname)','left','',0,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (9,'last login','users.lastlogin','left','',3,'',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (9,'revoked','users.revoked','center','',2,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (10,'name','relationships.name','left','',0,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (10,'to','concat(totable.maintable, \'.\', relationships.tofield)','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (10,'from','concat(fromtable.maintable, \'.\', relationships.fromfield)','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (10,'inherent','relationships.inherint','center','',3,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (11,'id','tabledefs.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (11,'main table','tabledefs.maintable','left','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (11,'display','tabledefs.displayname','left','',1,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (11,'type','tabledefs.type','center','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (12,'done','notes.completed','center','',1,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (12,'title','notes.subject','left','',0,'',1,'99%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (16,'id','reports.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (16,'name','reports.name','left','',1,'',0,'100%','noencoding',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (16,'type','reports.type','left','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (16,'order','reports.displayorder','center','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (17,'id','usersearches.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (17,'name','usersearches.name','left','',1,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (17,'user','if(usersearches.userid=0,\"<b>global</b>\",concat(users.lastname,\", \",users.firstname))','left','',2,NULL,0,'','noencoding',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (19,'id','menu.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (19,'link','menu.link','left','',2,'',1,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (19,'access','if(menu.roleid=0,\'EVERYONE\',if(menu.roleid=-100,\'Administrators\',roles.name))','left','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (19,'Item','menu.name','left','',1,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (21,'id','modules.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (21,'name','modules.displayname','left','',1,'',1,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (21,'version','modules.version','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (23,'complete','notes.completed','center','',1,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (23,'title','notes.subject','left','',2,'',1,'65%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (23,'repeat','notes.repeatname','left','',3,'',1,'30%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (23,'due date','if(notes.endtime is not null,concat(notes.enddate,\" \",notes.endtime),notes.enddate)','left','',0,'',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (24,'start','if(notes.starttime,concat(notes.startdate,\" \",notes.starttime),notes.startdate)','left','',0,'concat(notes.startdate,\" \",notes.starttime)',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (24,'end','if(notes.endtime,concat(notes.enddate,\" \",notes.endtime),notes.enddate)','left','',1,'concat(notes.enddate,\" \",notes.endtime)',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (24,'title','notes.subject','left','',2,'',1,'65%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (24,'status','notes.status','left','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (24,'repeating','notes.repeatname','left','',5,'',1,'30%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (24,'location','notes.location','left','',4,'',1,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (26,'id','files.id','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (26,'description','files.description','left','',2,'',1,'99%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (26,'file','files.name','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (26,'download','files.id','center','',3,'',0,'','filelink',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (27,'attached','attachments.creationdate','left','',2,'',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (27,'file','concat(\"<b>\",files.name,\"</b>\")','left','',0,NULL,0,'','noencoding',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (27,'download','files.id','center','',3,'',0,'','filelink',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (27,'description','files.description','left','',1,'',1,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (200,'name','roles.name','left','',1,'',0,'99%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (200,'inactive','roles.inactive','center','',2,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (200,'id','roles.id','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (201,'name','scheduler.name','left','',0,'',0,'95%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (201,'cron interval','scheduler.crontab','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (201,'inactive','scheduler.inactive','center','',2,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (202,'time','log.stamp','left','',1,'',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (202,'id','log.id','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (202,'type','log.type','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (202,'value','log.value','left','',3,'',1,'90%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (202,'user','concat(users.firstname,\" \",users.lastname)','left','',4,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (202,'ip address','log.ip','left','',5,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (203,'name','tabs.name','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (203,'location','tabs.location','left','',2,'',1,'95%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (203,'display order','tabs.displayorder','center','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (203,'id','tabs.id','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (203,'access','if(tabs.roleid=0,\'EVERYONE\',if(tabs.roleid=-100,\'Administrators\',roles.name))','left','',4,'',0,'',NULL,0);
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('9', 'log in name', 'users.login', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('9', 'name', 'concat(users.firstname,\" \",users.lastname)', 'left', '', '0', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('9', 'last login', 'users.lastlogin', 'left', '', '3', '', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('9', 'revoked', 'users.revoked', 'center', '', '2', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('10', 'name', 'relationships.name', 'left', '', '0', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('10', 'to', 'concat(totable.maintable, \'.\', relationships.tofield)', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('10', 'from', 'concat(fromtable.maintable, \'.\', relationships.fromfield)', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('10', 'inherent', 'relationships.inherint', 'center', '', '3', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('11', 'id', 'tabledefs.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('11', 'main table', 'tabledefs.maintable', 'left', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('11', 'display', 'tabledefs.displayname', 'left', '', '1', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('11', 'type', 'tabledefs.type', 'center', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('12', 'done', 'notes.completed', 'center', '', '1', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('12', 'title', 'notes.subject', 'left', '', '0', '', '1', '99%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('16', 'id', 'reports.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('16', 'name', 'reports.name', 'left', '', '1', '', '0', '100%', 'noencoding', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('16', 'type', 'reports.type', 'left', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('16', 'order', 'reports.displayorder', 'center', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('17', 'id', 'usersearches.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('17', 'name', 'usersearches.name', 'left', '', '1', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('17', 'user', 'if(usersearches.userid=0,\"<b>global</b>\",concat(users.lastname,\", \",users.firstname))', 'left', '', '2', NULL, '0', '', 'noencoding', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('19', 'id', 'menu.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('19', 'link', 'menu.link', 'left', '', '2', '', '1', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('19', 'access', 'if(menu.roleid=0,\'EVERYONE\',if(menu.roleid=-100,\'Administrators\',roles.name))', 'left', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('19', 'Item', 'menu.name', 'left', '', '1', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('21', 'id', 'modules.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('21', 'name', 'modules.displayname', 'left', '', '1', '', '1', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('21', 'version', 'modules.version', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('23', 'complete', 'notes.completed', 'center', '', '1', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('23', 'title', 'notes.subject', 'left', '', '2', '', '1', '65%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('23', 'repeat', 'notes.repeatname', 'left', '', '3', '', '1', '30%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('23', 'due date', 'if(notes.endtime is not null,concat(notes.enddate,\" \",notes.endtime),notes.enddate)', 'left', '', '0', '', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('24', 'start', 'if(notes.starttime,concat(notes.startdate,\" \",notes.starttime),notes.startdate)', 'left', '', '0', 'concat(notes.startdate,\" \",notes.starttime)', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('24', 'end', 'if(notes.endtime,concat(notes.enddate,\" \",notes.endtime),notes.enddate)', 'left', '', '1', 'concat(notes.enddate,\" \",notes.endtime)', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('24', 'title', 'notes.subject', 'left', '', '2', '', '1', '65%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('24', 'status', 'notes.status', 'left', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('24', 'repeating', 'notes.repeatname', 'left', '', '5', '', '1', '30%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('24', 'location', 'notes.location', 'left', '', '4', '', '1', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('26', 'id', 'files.id', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('26', 'description', 'files.description', 'left', '', '2', '', '1', '99%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('26', 'file', 'files.name', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('26', 'download', 'files.id', 'center', '', '3', '', '0', '', 'filelink', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('27', 'attached', 'attachments.creationdate', 'left', '', '2', '', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('27', 'file', 'concat(\"<b>\",files.name,\"</b>\")', 'left', '', '0', NULL, '0', '', 'noencoding', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('27', 'download', 'files.id', 'center', '', '3', '', '0', '', 'filelink', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('27', 'description', 'files.description', 'left', '', '1', '', '1', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('200', 'name', 'roles.name', 'left', '', '1', '', '0', '99%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('200', 'inactive', 'roles.inactive', 'center', '', '2', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('200', 'id', 'roles.id', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('201', 'name', 'scheduler.name', 'left', '', '0', '', '0', '95%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('201', 'cron interval', 'scheduler.crontab', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('201', 'inactive', 'scheduler.inactive', 'center', '', '2', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('202', 'time', 'log.stamp', 'left', '', '1', '', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('202', 'id', 'log.id', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('202', 'type', 'log.type', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('202', 'value', 'log.value', 'left', '', '3', '', '1', '90%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('202', 'user', 'concat(users.firstname,\" \",users.lastname)', 'left', '', '4', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('202', 'ip address', 'log.ip', 'left', '', '5', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('203', 'name', 'tabs.name', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('203', 'location', 'tabs.location', 'left', '', '2', '', '1', '95%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('203', 'display order', 'tabs.displayorder', 'center', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('203', 'id', 'tabs.id', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('203', 'access', 'if(tabs.roleid=0,\'EVERYONE\',if(tabs.roleid=-100,\'Administrators\',roles.name))', 'left', '', '4', '', '0', '', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('204', 'name', 'smartsearches.name', 'left', '', '0', '', '1', '99%', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('204', 'table', 'tabledefs.displayname', 'left', '', '1', '', '0', '', NULL, '0');

trunk/phpbms/install/tabledefs.sql

@@ -1 @@
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('9', 'Users', 'system', '1', 'users', 'users', 'modules/base/users_addedit.php', '0', 'modules/base/users_addedit.php', '0', 'modules/base/users_import.php', '-100', '0', '-100', '-100', 'revoke', 'users.id !=0', 'users.id', NULL, NULL, NULL, 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('10', 'Relationships', 'system', '1', 'relationships', '(relationships inner join tabledefs as fromtable on relationships.fromtableid=fromtable.id) inner join tabledefs as totable on relationships.totableid=totable.id', 'modules/base/relationships_addedit.php', '0', 'modules/base/relationships_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'relationships.id != 0', 'fromtable.displayname, name', '', '', '', 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('11', 'Table Definitions', 'system', '1', 'tabledefs', 'tabledefs left join modules on tabledefs.moduleid=modules.id', 'modules/base/tabledefs_addedit.php', '-100', 'modules/base/tabledefs_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'tabledefs.id != 0', 'modules.name, tabledefs.displayname', '', '', '', 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('9', 'Users', 'system', '1', 'users', 'users', 'modules/base/users_addedit.php', '0', 'modules/base/users_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'revoke', 'users.id !=0', 'users.id', NULL, NULL, NULL, 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('10', 'Relationships', 'system', '1', 'relationships', '(relationships inner join tabledefs as fromtable on relationships.fromtableid=fromtable.id) inner join tabledefs as totable on relationships.totableid=totable.id', 'modules/base/relationships_addedit.php', '0', 'modules/base/relationships_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'relationships.id != 0', 'fromtable.displayname, name', NULL, NULL, NULL, 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('11', 'Table Definitions', 'system', '1', 'tabledefs', 'tabledefs left join modules on tabledefs.moduleid=modules.id', 'modules/base/tabledefs_addedit.php', '-100', 'modules/base/tabledefs_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'tabledefs.id != 0', 'modules.name, tabledefs.displayname', NULL, NULL, NULL, 1, NOW(), 1, NOW());
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('12', 'Notes', 'table', '1', 'notes', 'notes', 'modules/base/notes_addedit.php', '0', 'modules/base/notes_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'notes.type=\'NT\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND completed=0', 'notes.category,notes.type,notes.importance DESC,notes.creationdate', 'search', 'My Unread Notes', 'new', 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('16', 'Reports', 'system', '1', 'reports', 'reports left join tabledefs on reports.tabledefid=tabledefs.id', 'modules/base/reports_addedit.php', '0', 'modules/base/reports_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'reports.id != 0', 'tabledefid,displayorder DESC, reports.name', '', '', '', 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('17', 'Saved Searches/Sorts', 'system', '1', 'usersearches', '(usersearches left join users on usersearches.userid = users.id) inner join tabledefs on usersearches.tabledefid=tabledefs.id', 'modules/base/usersearches_edit.php', '0', 'N/A', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'usersearches.id != 0', 'usersearches.name', '', '', '', 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('19', 'Menu', 'system', '1', 'menu', '((menu LEFT JOIN menu as parentmenu on menu.parentid=parentmenu.id) LEFT JOIN roles on menu.roleid=roles.id)', 'modules/base/menu_addedit.php', '-100', 'modules/base/menu_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'menu.id!=0', 'if(parentmenu.name is null,menu.displayorder,parentmenu.displayorder+(menu.displayorder+1)/10000)', '', '', '', 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('16', 'Reports', 'system', '1', 'reports', 'reports left join tabledefs on reports.tabledefid=tabledefs.id', 'modules/base/reports_addedit.php', '0', 'modules/base/reports_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'reports.id != 0', 'tabledefid,displayorder DESC, reports.name', NULL, NULL, NULL, 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('17', 'Saved Searches/Sorts', 'system', '1', 'usersearches', '(usersearches left join users on usersearches.userid = users.id) inner join tabledefs on usersearches.tabledefid=tabledefs.id', 'modules/base/usersearches_edit.php', '0', 'N/A', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'usersearches.id != 0', 'usersearches.name', NULL, NULL, NULL, 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('19', 'Menu', 'system', '1', 'menu', '((menu LEFT JOIN menu as parentmenu on menu.parentid=parentmenu.id) LEFT JOIN roles on menu.roleid=roles.id)', 'modules/base/menu_addedit.php', '-100', 'modules/base/menu_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'menu.id!=0', 'if(parentmenu.name is null,menu.displayorder,parentmenu.displayorder+(menu.displayorder+1)/10000)', NULL, NULL, NULL, 1, NOW(), 1, NOW());
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('21', 'Installed Modules', 'system', '1', 'modules', 'modules', 'modules/base/modules_view.php', '0', 'modules/base/modules_view.php', '0', NULL, '-100', '0', '-100', '-100', 'NA', 'modules.id!=0', 'modules.name', '', '', '', 1, NOW(), 1, NOW());
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('23', 'Tasks', 'view', '1', 'notes', '((notes left join users as assignedto on assignedto.id= notes.assignedtoid)  left join users as assignedby on assignedby.id=notes.assignedbyid)', 'modules/base/notes_addedit.php?backurl=../../search.php?id=23', '0', 'modules/base/notes_addedit.php?ty=TS&backurl=../../search.php?id=23', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'notes.type=\'TS\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND completed=0', 'notes.category,notes.enddate,notes.endtime,notes.startdate,notes.starttime,notes.importance DESC,notes.subject', 'search', 'My Uncompleted Tasks', '', 1, NOW(), 1, NOW());
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('24', 'Events', 'view', '1', 'notes', '((notes left join users as assignedto on assignedto.id= notes.assignedtoid)  left join users as assignedby on assignedby.id=notes.assignedbyid)', 'modules/base/notes_addedit.php?backurl=../../search.php?id=24', '0', 'modules/base/notes_addedit.php?ty=EV&backurl=../../search.php?id=24', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = year(notes.startdate)=year(curdate()) and week(notes.startdate)=week(curdate())))', 'notes.startdate DESC,notes.starttime DESC,notes.enddate DESC,notes.endtime DESC,notes.importance', 'search', NULL, NULL, 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('26', 'Files', 'table', '1', 'files', 'files', 'modules/base/files_addedit.php', '0', 'modules/base/files_addedit.php', '0', NULL, '-100', '-100', '-100', '-100', 'delete', 'files.id=-1', 'files.name', 'search', '', '', 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('26', 'Files', 'table', '1', 'files', 'files', 'modules/base/files_addedit.php', '0', 'modules/base/files_addedit.php', '0', NULL, '-100', '-100', '-100', '-100', 'delete', 'files.id=-1', 'files.name', 'search', NULL, NULL, 1, NOW(), 1, NOW());
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('27', 'Attachments', 'table', '1', 'attachments', '(attachments INNER JOIN files on attachments.fileid=files.id)', 'modules/base/files_addedit.php', '0', 'modules/base/files_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'delete', 'attachments.id!=0', 'attachments.creationdate DESC', 'search', '', '', 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('200', 'Roles', 'table', '1', 'roles', 'roles', 'modules/base/roles_addedit.php', '-100', 'modules/base/roles_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'inactivate', 'roles.id!=-1', 'name', 'search', '', '', 1, NOW(), 1, NOW());
-INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('201', 'Scheduler', 'system', '1', 'scheduler', 'scheduler', 'modules/base/scheduler_addedit.php', '-100', 'modules/base/scheduler_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'scheduler.id!=0', 'scheduler.name', '', '', '', 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('200', 'Roles', 'table', '1', 'roles', 'roles', 'modules/base/roles_addedit.php', '-100', 'modules/base/roles_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'inactivate', 'roles.id!=-1', 'name', 'search', NULL, NULL, 1, NOW(), 1, NOW());
+INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('201', 'Scheduler', 'system', '1', 'scheduler', 'scheduler', 'modules/base/scheduler_addedit.php', '-100', 'modules/base/scheduler_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'scheduler.id!=0', 'scheduler.name', NULL, NULL, NULL, 1, NOW(), 1, NOW());
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('202', 'System Log', 'system', '1', 'log', 'log LEFT JOIN users ON log.userid=users.id', 'N/A', '-100', 'N/A', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'log.stamp> DATE_SUB(CURDATE(),INTERVAL 1 DAY)', 'log.stamp', '', '', '', 1, NOW(), 1, NOW());
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `importfile`, `importroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('203', 'Tabs', 'system', '1', 'tabs', 'tabs LEFT JOIN roles ON tabs.roleid=roles.id', 'modules/base/tabs_addedit.php', '-100', 'modules/base/tabs_addedit.php', '-100', NULL, '-100', '-100', '-100', '-100', 'delete', 'tabs.id!=0', 'tabs.tabgroup,tabs.displayorder', '', '', '', 1, NOW(), 1, NOW());

trunk/phpbms/install/tablefindoptions.sql

@@ -1 @@
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (3,9,'All Users','users.id!=0',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (4,9,'Revoked Users','users.revoked=1',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (13,10,'All Records','relationships.id !=0',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (5,11,'All Records','tabledefs.id !=0',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (70,12,'Unread Notes Assigned By Me','notes.type=\'NT\' and notes.assignedbyid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0',3,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (69,12,'Unread Notes Assigned To Me','notes.type=\'NT\' and notes.assignedtoid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0',2,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (20,12,'My Notes','notes.type=\'NT\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}}',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (21,12,'All Viewable Notes and System Notes','notes.type=\'SM\' OR ( notes.type=\'NT\' AND !(notes.private=1 AND notes.createdby!={{$_SESSION[\'userinfo\'][\'id\']}}))',7,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (14,16,'All Reports','reports.id != 0',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (15,17,'All Records','usersearches.id != 0',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (42,19,'All Records','menu.id!=0',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (43,21,'All Records','modules.id!=0',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (71,12,'System Messages','notes.type=\"SM\"',4,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (72,12,'Public Notes','notes.type=\'NT\' AND notes.private=0',6,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (73,12,'My Unread Notes','notes.type=\'NT\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND completed=0',0,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (74,12,'Public Unread Notes','notes.type=\'NT\' AND notes.private=0 AND notes.completed=0',5,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (76,23,'My Uncompleted Tasks','notes.type=\'TS\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND completed=0',0,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (77,23,'My Tasks','notes.type=\'TS\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}}',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (78,23,'Uncomplete Tasks Assigned To Me','notes.type=\'TS\' and notes.assignedtoid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0',2,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (79,23,'Uncomplete Tasks Assigned By Me','notes.type=\'NT\' and notes.assignedbyid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0',3,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (80,23,'Public Uncomplete Tasks','notes.type=\'TS\' AND notes.private=0 AND notes.completed=0',4,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (81,23,'Public Tasks','notes.type=\'NT\' AND notes.private=0',5,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (82,23,'All Viewable Tasks','notes.type=\'TS\' AND !(notes.private=1 AND notes.createdby!={{$_SESSION[\'userinfo\'][\'id\']}})',6,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (83,24,'My Events','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}}',0,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (84,24,'Public Events','notes.type=\'EV\' AND notes.private=0',8,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (85,24,'Undone Events Assigned To Me','notes.type=\'EV\' and notes.assignedtoid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0',17,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (86,24,'Undone Events Assigned By Me','notes.type=\'NT\' and notes.assignedbyid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0',16,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (87,24,'All Viewable Events','notes.type=\'EV\' AND !(notes.private=1 AND notes.createdby!={{$_SESSION[\'userinfo\'][\'id\']}})',18,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (88,24,'My Events - Today','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = curdate()) OR notes.`repeat`=1)',1,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (89,24,'My Events - Yesterday','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = date_sub(curdate(),INTERVAL 1 DAY)) OR notes.`repeat`=1)',2,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (90,24,'My Events - This Week','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = year(notes.startdate)=year(curdate()) and week(notes.startdate)=week(curdate())) OR notes.repeat=1)',4,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (91,24,'My Events - This Month','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = year(notes.startdate)=year(curdate()) and month(notes.startdate)=month(curdate())) OR notes.repeat=1)',6,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (92,24,'My Events - Tomorrow','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND (notes.startdate = date_add(curdate(),INTERVAL 1 DAY) OR notes.repeat=1)',3,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (93,24,'My Events - Next Month','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 MONTH)) and month(notes.startdate)=month(date_add(curdate(),INTERVAL 1 MONTH))) OR notes.repeat=1)',7,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (94,24,'My Events - Next Week','notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 WEEK)) and week(notes.startdate)=week(date_add(curdate(),INTERVAL 1 WEEK))) OR notes.repeat=1)',5,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (95,24,'Public Events - Today','notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = curdate()) OR notes.repeat=1)',9,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (96,24,'Public Events - Yesterday','notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = date_sub(curdate(),INTERVAL 1 DAY)) OR notes.repeat=1)',10,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (97,24,'Public Events - Tomorrow','notes.type=\'EV\' AND notes.private=0 AND (notes.startdate = date_add(curdate(),INTERVAL 1 DAY) OR notes.repeat=1)',11,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (98,24,'Public Events - This Week','notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = year(notes.startdate)=year(curdate()) and week(notes.startdate)=week(curdate())) OR notes.repeat=1)',12,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (99,24,'Public Events - Next Week','notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 WEEK)) and week(notes.startdate)=week(date_add(curdate(),INTERVAL 1 WEEK))) OR notes.repeat=1)',13,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (100,24,'Public Events - This Month','notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = year(notes.startdate)=year(curdate()) and month(notes.startdate)=month(curdate())) OR notes.repeat=1)',14,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (101,24,'Public Events - Next Month','notes.type=\'EV\' notes.private=0 AND ((year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 MONTH)) and month(notes.startdate)=month(date_add(curdate(),INTERVAL 1 MONTH))) OR notes.repeat=1)',15,0);
-INSERT INTO `tablefindoptions` (`id`, `tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (108,26,'All Records','files.id!=0',0,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (200,'Active Roles','roles.inactive=0',0,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (200,'Inactive Roles','roles.inactive=1',1,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (200,'All Records','roles.id!=-100',2,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (201,'all records','scheduler.id!=0',0,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (202,'entries within last day','log.stamp> DATE_SUB(CURDATE(),INTERVAL 1 DAY)',0,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (202,'entries within last week','log.stamp> DATE_SUB(CURDATE(),INTERVAL 1 WEEK)',1,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (202,'all entries','log.id!=-1',2,0);
-INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (203,'All Records','tabs.id!=-1',0,-100);
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('9', 'All Users', 'users.id!=0', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('9', 'Revoked Users', 'users.revoked=1', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('10', 'All Records', 'relationships.id !=0', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('11', 'All Records', 'tabledefs.id !=0', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'My Notes', 'notes.type=\'NT\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}}', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'All Viewable Notes and System Notes', 'notes.type=\'SM\' OR ( notes.type=\'NT\' AND !(notes.private=1 AND notes.createdby!={{$_SESSION[\'userinfo\'][\'id\']}}))', '7', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'Unread Notes Assigned To Me', 'notes.type=\'NT\' and notes.assignedtoid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0', '2', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'Unread Notes Assigned By Me', 'notes.type=\'NT\' and notes.assignedbyid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0', '3', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'System Messages', 'notes.type=\"SM\"', '4', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'Public Notes', 'notes.type=\'NT\' AND notes.private=0', '6', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'My Unread Notes', 'notes.type=\'NT\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND completed=0', '0', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('12', 'Public Unread Notes', 'notes.type=\'NT\' AND notes.private=0 AND notes.completed=0', '5', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('16', 'All Reports', 'reports.id != 0', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('17', 'All Records', 'usersearches.id != 0', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('19', 'All Records', 'menu.id!=0', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('21', 'All Records', 'modules.id!=0', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('23', 'My Uncompleted Tasks', 'notes.type=\'TS\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND completed=0', '0', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('23', 'My Tasks', 'notes.type=\'TS\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}}', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('23', 'Uncomplete Tasks Assigned To Me', 'notes.type=\'TS\' and notes.assignedtoid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0', '2', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('23', 'Uncomplete Tasks Assigned By Me', 'notes.type=\'NT\' and notes.assignedbyid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0', '3', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('23', 'Public Uncomplete Tasks', 'notes.type=\'TS\' AND notes.private=0 AND notes.completed=0', '4', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('23', 'Public Tasks', 'notes.type=\'NT\' AND notes.private=0', '5', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('23', 'All Viewable Tasks', 'notes.type=\'TS\' AND !(notes.private=1 AND notes.createdby!={{$_SESSION[\'userinfo\'][\'id\']}})', '6', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}}', '0', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events', 'notes.type=\'EV\' AND notes.private=0', '8', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Undone Events Assigned To Me', 'notes.type=\'EV\' and notes.assignedtoid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0', '17', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Undone Events Assigned By Me', 'notes.type=\'NT\' and notes.assignedbyid={{$_SESSION[\'userinfo\'][\'id\']}} and notes.completed=0', '16', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'All Viewable Events', 'notes.type=\'EV\' AND !(notes.private=1 AND notes.createdby!={{$_SESSION[\'userinfo\'][\'id\']}})', '18', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events - Today', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = curdate()) OR notes.`repeat`=1)', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events - Yesterday', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = date_sub(curdate(),INTERVAL 1 DAY)) OR notes.`repeat`=1)', '2', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events - This Week', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = year(notes.startdate)=year(curdate()) and week(notes.startdate)=week(curdate())) OR notes.repeat=1)', '4', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events - This Month', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = year(notes.startdate)=year(curdate()) and month(notes.startdate)=month(curdate())) OR notes.repeat=1)', '6', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events - Tomorrow', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND (notes.startdate = date_add(curdate(),INTERVAL 1 DAY) OR notes.repeat=1)', '3', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events - Next Month', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 MONTH)) and month(notes.startdate)=month(date_add(curdate(),INTERVAL 1 MONTH))) OR notes.repeat=1)', '7', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'My Events - Next Week', 'notes.type=\'EV\' AND notes.createdby = {{$_SESSION[\'userinfo\'][\'id\']}} AND ((notes.startdate = year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 WEEK)) and week(notes.startdate)=week(date_add(curdate(),INTERVAL 1 WEEK))) OR notes.repeat=1)', '5', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events - Today', 'notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = curdate()) OR notes.repeat=1)', '9', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events - Yesterday', 'notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = date_sub(curdate(),INTERVAL 1 DAY)) OR notes.repeat=1)', '10', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events - Tomorrow', 'notes.type=\'EV\' AND notes.private=0 AND (notes.startdate = date_add(curdate(),INTERVAL 1 DAY) OR notes.repeat=1)', '11', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events - This Week', 'notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = year(notes.startdate)=year(curdate()) and week(notes.startdate)=week(curdate())) OR notes.repeat=1)', '12', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events - Next Week', 'notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 WEEK)) and week(notes.startdate)=week(date_add(curdate(),INTERVAL 1 WEEK))) OR notes.repeat=1)', '13', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events - This Month', 'notes.type=\'EV\' AND notes.private=0 AND ((notes.startdate = year(notes.startdate)=year(curdate()) and month(notes.startdate)=month(curdate())) OR notes.repeat=1)', '14', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('24', 'Public Events - Next Month', 'notes.type=\'EV\' notes.private=0 AND ((year(notes.startdate)=year(date_add(curdate(),INTERVAL 1 MONTH)) and month(notes.startdate)=month(date_add(curdate(),INTERVAL 1 MONTH))) OR notes.repeat=1)', '15', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('26', 'All Records', 'files.id!=0', '0', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('200', 'Active Roles', 'roles.inactive=0', '0', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('200', 'Inactive Roles', 'roles.inactive=1', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('200', 'All Records', 'roles.id!=-100', '2', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('201', 'all records', 'scheduler.id!=0', '0', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('202', 'entries within last day', 'log.stamp> DATE_SUB(CURDATE(),INTERVAL 1 DAY)', '0', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('202', 'entries within last week', 'log.stamp> DATE_SUB(CURDATE(),INTERVAL 1 WEEK)', '1', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('202', 'all entries', 'log.id!=-1', '2', '0');
+INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('203', 'All Records', 'tabs.id!=-1', '0', '-100');
 INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('204', 'All Records', 'smartsearches.id!=-1', '0', '0');

trunk/phpbms/install/tablegroupings.sql

@@ -1 @@
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (10,'fromtable.displayname',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (11,'modules.name',1,0,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (12,'notes.category',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (16,'if(tabledefs.displayname is null,\"global\",tabledefs.displayname)',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (17,'tabledefs.displayname',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (17,'if(usersearches.type=\"SCH\",\"Search\",\"Sort\")',2,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (19,'if(menu.parentid=0,concat( lpad(menu.displayorder,3,\"0\"), \" - \" ,menu.name )  , concat( lpad(parentmenu.displayorder,3,\"0\") , \" - \",parentmenu.name))',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (23,'ELT(notes.importance+3,\'6 - Lowest\',\' 5 - Low\',\'4 - Normal\',\"3 - Medium\",\'2 - High\',\'1 - Highest\')',1,1,'Importance',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (23,'notes.category',2,1,'Category',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (24,'notes.category',1,1,'category',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (203,'tabs.tabgroup',1,1,'Group',0);
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('10', 'fromtable.displayname', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('11', 'modules.name', '1', '0', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('12', 'notes.category', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('16', 'if(tabledefs.displayname is null,\"global\",tabledefs.displayname)', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('17', 'tabledefs.displayname', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('17', 'if(usersearches.type=\"SCH\",\"Search\",\"Sort\")', '2', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('19', 'if(menu.parentid=0,concat( lpad(menu.displayorder,3,\"0\"), \" - \" ,menu.name )  , concat( lpad(parentmenu.displayorder,3,\"0\") , \" - \",parentmenu.name))', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('23', 'ELT(notes.importance+3,\'6 - Lowest\',\' 5 - Low\',\'4 - Normal\',\"3 - Medium\",\'2 - High\',\'1 - Highest\')', '1', '1', 'Importance', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('23', 'notes.category', '2', '1', 'Category', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('24', 'notes.category', '1', '1', 'category', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('203', 'tabs.tabgroup', '1', '1', 'Group', '0');

trunk/phpbms/install/tableoptions.sql

@@ -14 +14 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('11', 'edit', '1', '1', '0', '0', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('11', 'printex', '1', '0', '0', '0', '0');
-INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('12', 'import', '0', '0', '0', '-100', '0');
+INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('12', 'import', '1', '0', '0', '-100', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('12', 'select', '1', '0', '0', '0', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('12', 'edit', '1', '1', '0', '0', '0');

trunk/phpbms/install/tablesearchablefields.sql

@@ -1 @@
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (3,9,'(users.lastname like \"{{value}}%\" or users.firstname like \"{{value}}%\" )','name',0,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (5,9,'users.accesslevel','access level',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (6,9,'users.login','log in name',1,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (7,9,'users.id','id',3,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (26,10,'relationships.id','id',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (8,11,'tabledefs.maintable','main table',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (9,11,'tabledefs.displayname','display',1,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (10,11,'tabledefs.id','id',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (35,12,'notes.subject','title',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (36,12,'notes.content','content',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (37,12,'assignedto.firstname like \"{{value}}%\"or assignedto.lastname like \"{{value}}%\"','assigned to',3,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (38,12,'assignedby.firstname like \"{{value}}%\"or assignedby.lastname like \"{{value}}%\"','assigned by',4,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (39,12,'notes.id','id',5,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (81,12,'notes.category','category',1,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (27,16,'reports.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (28,16,'reports.reporttable','table',1,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (29,16,'reports.type','type',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (30,16,'reports.id','id',3,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (31,17,'usersearches.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (32,17,'({{value]]=\"global\" or users.firstname like \"{{value}}%\" or users.lastname like \"{{value}}%\")','user',1,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (33,17,'usersearches.table','table',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (34,17,'usersearches.id','id',3,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (67,19,'menu.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (68,19,'parentmenu.name','parent name',1,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (69,19,'menu.id','id',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (70,21,'modules.id','id',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (83,23,'notes.subject','title',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (84,23,'notes.category','category',1,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (85,23,'notes.content','content',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (86,23,'assignedto.firstname like \"{{value}}%\"or assignedto.lastname like \"{{value}}%\"','assigned to',3,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (87,23,'assignedby.firstname like \"{{value}}%\"or assignedby.lastname like \"{{value}}%\"','assigned by',4,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (88,23,'notes.id','id',5,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (89,24,'notes.subject','title',0,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (90,24,'notes.category','category',1,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (91,24,'notes.content','content',2,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (92,24,'assignedto.firstname like \"{{value}}%\"or assignedto.lastname like \"{{value}}%\"','assigned to',3,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (93,24,'assignedby.firstname like','assigned by',4,'whereclause');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (94,24,'notes.id','id',5,'field');
-INSERT INTO `tablesearchablefields` (`id`, `tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (96,26,'files.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (200,'roles.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (201,'scheduler.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (202,'log.type','type',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (202,'log.ip','ip address',1,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (203,'tabs.name','name',1,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (203,'tabs.tabgroup','group',0,'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('9', '(users.lastname like \"{{value}}%\" or users.firstname like \"{{value}}%\" )', 'name', '0', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('9', 'users.accesslevel', 'access level', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('9', 'users.login', 'log in name', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('9', 'users.id', 'id', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('10', 'relationships.id', 'id', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('11', 'tabledefs.id', 'id', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('11', 'tabledefs.displayname', 'display', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('11', 'tabledefs.maintable', 'main table', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('12', 'notes.id', 'id', '5', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('12', 'assignedby.firstname like \"{{value}}%\"or assignedby.lastname like \"{{value}}%\"', 'assigned by', '4', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('12', 'assignedto.firstname like \"{{value}}%\"or assignedto.lastname like \"{{value}}%\"', 'assigned to', '3', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('12', 'notes.content', 'content', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('12', 'notes.subject', 'title', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('12', 'notes.category', 'category', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('16', 'reports.reporttable', 'table', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('16', 'reports.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('16', 'reports.id', 'id', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('16', 'reports.type', 'type', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('17', '({{value]]=\"global\" or users.firstname like \"{{value}}%\" or users.lastname like \"{{value}}%\")', 'user', '1', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('17', 'usersearches.id', 'id', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('17', 'usersearches.table', 'table', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('17', 'usersearches.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('19', 'menu.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('19', 'parentmenu.name', 'parent name', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('19', 'menu.id', 'id', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('21', 'modules.id', 'id', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('23', 'notes.id', 'id', '5', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('23', 'assignedby.firstname like \"{{value}}%\"or assignedby.lastname like \"{{value}}%\"', 'assigned by', '4', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('23', 'assignedto.firstname like \"{{value}}%\"or assignedto.lastname like \"{{value}}%\"', 'assigned to', '3', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('23', 'notes.content', 'content', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('23', 'notes.category', 'category', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('23', 'notes.subject', 'title', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('24', 'notes.id', 'id', '5', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('24', 'assignedby.firstname like', 'assigned by', '4', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('24', 'assignedto.firstname like \"{{value}}%\"or assignedto.lastname like \"{{value}}%\"', 'assigned to', '3', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('24', 'notes.content', 'content', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('24', 'notes.category', 'category', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('24', 'notes.subject', 'title', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('26', 'files.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('200', 'roles.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('201', 'scheduler.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('202', 'log.ip', 'ip address', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('202', 'log.type', 'type', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('203', 'tabs.name', 'name', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('203', 'tabs.tabgroup', 'group', '0', 'field');
 INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('204', 'tabledefs.displayname', 'table', '2', 'field');
 INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('204', 'smartsearches.name', 'name', '1', 'field');

trunk/phpbms/install/update.js

@@ -1 @@
-window.onload = function(){
-        var sections = getElementsByClassName("bodyline");
-        
-        var i;
-        for(i=0; i< sections.length; i++){
-                if(sections[i].id != "step1"){
-                        sections[i].style.display = "none";
+updater = {
+
+        coreDataUpdate: function(){
+
+                var noDebug = getObjectFromID("coreDataNoDebug");
+
+                noDebug.className = "running";
+                noDebug.innerHTML = "Running...";
+
+                var response = updater.runCommand("coredataupdate");
+
+                if(response.success === true){
+
+                        noDebug.className = "success";
+                        noDebug.innerHTML = "Core Program Updated Succefully";
+
+                } else {
+
+                        noDebug.className = "fail";
+                        noDebug.innerHTML = "Core Program Update Failed";
+
+                }//endif
+
+        }, // endfunction coreDataInstall
+
+
+        moduleUpdate: function(e){
+
+                var theButton = e.src();
+
+                var foo = "";
+
+                var module = theButton.id.substring(12);
+
+                var noDebug = getObjectFromID("Results" + module);
+
+                noDebug.className = "running";
+                noDebug.innerHTML = "Running...";
+
+                var response = updater.runCommand("moduleupdate", module);
+
+                if(response.success === true){
+
+                        noDebug.className = "success";
+                        noDebug.innerHTML = "Update Successful";
+
+                } else {
+
+                        noDebug.className = "fail";
+                        noDebug.innerHTML = "Update Failed";
+
+                }//endif
+
+        },//end function moduleInstall
+
+
+        runCommand: function(command, extras){
+
+                if(typeof(extras) == "undefined")
+                        extras = "";
+                else
+                        extras = "&extras=" + extras
+
+                var theURL = "updateajax.php?command=" + command + extras;
+
+                loadXMLDoc(theURL,null,false);
+
+                var JSONresponse;
+                eval("JSONresponse = (" + req.responseText +")");
+
+                var responseText = getObjectFromID(command + "results");
+                if(typeof(responseText) != "undefined"){
+
+                        if(responseText.value)
+                                responseText.value += "\n";
+
+                        responseText.value += JSONresponse.details;
+
+                }//endif
+
+                return JSONresponse
+
+        },//endfunction runCommand
+
+
+        toggleDebug: function(){
+
+                var debug = getObjectFromID("debug");
+                var display = "none";
+                if(debug.checked)
+                        display = "block";
+
+                var debugDisplays = getElementsByClassName("debugResults");
+
+                for(var i = 0; i < debugDisplays.length; i ++)
+                        debugDisplays[i].style.display = display;
+
+        }//end function toggleDebug
+
+}//end class installer
+
+
+
+stepsNav = {
+
+        currentSection: 1,
+        sections: null,
+
+        navNext: function(){
+
+                if(stepsNav.currentSection + 1 <= stepsNav.sections.length){
+                        stepsNav.navTo(stepsNav.currentSection + 1);
                 }
+        },
+
+
+        navPrev: function(){
+                if(stepsNav.currentSection - 1 > 0)
+                        stepsNav.navTo(stepsNav.currentSection - 1);
+        },
+
+
+        navTo: function(section){
+
+                for(var i=0; i< stepsNav.sections.length; i++){
+
+                        if(stepsNav.sections[i].id != "step" + section){
+                                stepsNav.sections[i].style.display = "none";
+                        } else {
+                                stepsNav.sections[i].style.display = "block";
+                        }//endif
+
+                }//endfor
+
+                navBar = getObjectFromID("navSelect");
+                for(i=0; i < navBar.options.length; i++){
+                        if(navBar.options[i].value == section){
+                                navBar.options[i].selected = true;
+                        }
+                }//endfor
+                //navBar.selectedIndex = section
+
+                stepsNav.currentSection = section;
+
+        },//end function navTo
+
+
+        navLeft: function(){
+
+                var navSelect = getObjectFromID("navSelect");
+                stepsNav.navTo(parseInt(navSelect.value));
+
+
         }
+
 }
 
-function goSection(direction){
-        var sections = getElementsByClassName("bodyline");
-        var currSection = 1;
-        
-        for(i=0; i< sections.length; i++){
-                if(sections[i].style.display == "block")                        
-                        currSection = parseInt(sections[i].id.substr(4),10);
-        }
-        
-        if(direction == "next")
-                direction = 1;
-        else
-                direction = -1;
-        
-        if(currSection + direction == 0)
-                return false;
-        else{
-                var currDiv = getObjectFromID("step"+currSection);
-                var newDiv = getObjectFromID("step"+(currSection + direction))
+// ====== Init Listeners =======================================================
 
-                currDiv.style.display = "none";
-                newDiv.style.display = "block";
-        }
-}//end function
+connect(window,"onload",function() {
 
+        stepsNav.sections = getElementsByClassName("steps");
+        stepsNav.navTo(1);
 
-function changeModule(){
-        var moduleSel=getObjectFromID("modules");
-        var updateButton=getObjectFromID("updatemodule");
-        var modinfo = getObjectFromID("moduleInformation");
-        
-        var modName = getObjectFromID("modulename");
-        var modVer = getObjectFromID("moduleversion");
-        var modDesc = getObjectFromID("moduledescription");
-        var modReq = getObjectFromID("modulerequirements");
-        
-        if(moduleSel.value!=0){
-                updateButton.disabled=false;
-                
-                modName.innerHTML = modules[moduleSel.value]["name"];
-                modVer.innerHTML = modules[moduleSel.value]["version"];
-                modDesc.innerHTML = modules[moduleSel.value]["description"];
-                modReq.innerHTML = modules[moduleSel.value]["requirements"];
-                
-                modinfo.style.display = "block";                                                
-        }
-        else{
-                updateButton.disabled=true;
-                modinfo.style.display = "none";                 
-        }
-}
+        var nextButtons = getElementsByClassName("nextButtons");
+        for(var i=0; i< nextButtons.length; i++)
+                connect(nextButtons[i], "onclick", stepsNav.navNext);
 
+        var prevButtons = getElementsByClassName("prevButtons");
+        for(var i=0; i< prevButtons.length; i++)
+                connect(prevButtons[i], "onclick", stepsNav.navPrev);
 
-function runCommand(command){
-        var theURL="updatexml.php?command="+command;
-        var adminName=getObjectFromID("username");
-        var adminPass=getObjectFromID("password");
-        var version=getObjectFromID("version");
-        var theModules=getObjectFromID("modules");
-        
-        theURL+="&u="+encodeURIComponent(adminName.value);
-        theURL+="&p="+encodeURIComponent(adminPass.value);
-        theURL+="&v="+encodeURIComponent(version.value);
-        
-        if(command == "checkModuleUpdate"){
-                theURL+="&m="+encodeURIComponent(theModules.value);
-                theURL+="&mv="+encodeURIComponent(modules[theModules.value]["version"]);
-        }
+        var navSelect = getObjectFromID("navSelect");
+        connect(navSelect, "onchange", stepsNav.navLeft);
 
-        var responseText= getObjectFromID(command+"results");
-        loadXMLDoc(theURL,null,false);
-        if(req.responseXML)
-                response = req.responseXML.documentElement.firstChild.data+"\n";
-        else 
-                response = req.responseText+"\n";
-                
-        responseText.value+=response;
-}
+        var debug = getObjectFromID("debug");
+        connect(debug, "onchange", updater.toggleDebug);
 
+        var updatecoreButton = getObjectFromID("updatecoreButton");
+        if(updatecoreButton)
+                connect(updatecoreButton,"onclick", updater.coreDataUpdate);
 
-function runModuleUpdate(){
-        var themodule=getObjectFromID("modules");
-        var responseText= getObjectFromID("checkModuleUpdateresults");
-        if(themodule.value=="")
-                alert("First, Select a module");
-        else {
-                var theURL="../modules/"+themodule.value+"/install/update.php";
-                var adminName=getObjectFromID("username");
-                var adminPass=getObjectFromID("password");
-                var theModules=getObjectFromID("modules");
+        moduleButtons = getElementsByClassName("moduleButtons");
+        for(i = 0; i < moduleButtons.length; i++)
+                connect(moduleButtons[i], "onclick", updater.moduleUpdate);
 
-                theURL+="?u="+encodeURIComponent(adminName.value);
-                theURL+="&p="+encodeURIComponent(adminPass.value);
-                theURL+="&v="+encodeURIComponent(modules[theModules.value]["version"]);
-                
-                loadXMLDoc(theURL,null,false);
-                if(req.responseXML)
-                        response = req.responseXML.documentElement.firstChild.data+"\n";
-                else 
-                        response = req.responseText;
-                        
-                responseText.value+=response
-        }
-}
+})

trunk/phpbms/install/update.php

@@ -1 @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -38 +38 @@
 */
 
-        include("install_include.php");
-        include("version.php");
-        
+        include("update_include.php");
+
+        $updater = new updater();
+        $updater->buildList();
+
+
+        //check for php version
+        $neededVer = "5.2.0";
+        $phpVer = phpversion();
+        if(floatval($neededVer) <= floatval($phpVer))
+                $phpVerClass = "success";
+        else
+                $phpVerClass = "fail";
+
+        //check to see if mysql plugin present
+        if(phpversion("mysql"))
+                $mysqlPresent = "success";
+        else
+                $mysqlPresent = "fail";
+
+        //check the web server
+        $webServer = explode(" ",$_SERVER['SERVER_SOFTWARE']);
+        $webServer = explode("/", $webServer[0]);
+
+        if(strtolower($webServer[0]) == "apache"){
+
+                if(floatval($webServer[1]) > 2)
+                        $webServerReport["class"] = "success";
+                else
+                        $webServerReport["class"] = "warning";
+
+                $webServerReport["message"] = $webServer[0]."/".$webServer[1];
+
+        } else {
+                $webServerReport["class"] = "warning";
+                $webServerReport["message"] = "Non-Apache servers are untested and may have problems.";
+        }
+
+        $mysqlVer = $updater->getMySQLVersion();
+
+        if(floatval($mysqlVer) >= 5)
+                $mysqlPassFailClass = "success";
+        else
+                $mysqlPassFailClass = "fail";
+
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -53 +95 @@
 <script language="JavaScript" src="../common/javascript/moo/moo.fx.pack.js" type="text/javascript" ></script>
 <script language="JavaScript" src="update.js" type="text/javascript" ></script>
-<script language="JavaScript" type="text/javascript">
-        <?php $modules = array_merge($modules,loadModules("update")) ?>
-</script>
 </head>
 
 <body>
-        <h1 id="topTitle">phpBMS v<?php echo $modules["base"]["version"]?> Update</h1>
-        
-        <div class="bodyline" id="step1">
-                <h1>Before Updating</h1>
-                
-                <p class="important">Backup all of your data and program files before running any update.</p>
-                <p>
-                        By downloading and decompressing this update, you may have already replaced script files 
-                        from the previous version of phpBMS. If you have decompressed these files to a separate 
-                        directory and have made custom changes directly to the system we recommend backing up 
-                        those files before continuing. 
-                </p>
-                <p>For the latest information about phpBMS check the <a href="http://www.phpbms.org">phpBMS Project web site</a>.</p>
-
-                <p class="nextprevP">
-                        <button type="button" class="disabledButtons nextprevButtons" onclick="goSection('back')" disabled="disabled">back</button>
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('next')">next</button>
-                </p>
+        <noscript>
+                <div class="bodyline">
+                        <h1>Javascript Support Disabled</h1>
+                        <p>Both the installer and the main phpBMS program require JavaScript support in order to run.</p>
+                </div>
+        </noscript>
+
+        <h1 id="topTitle">phpBMS v<?php echo $updater->list["base"]["version"]?> Update</h1>
+
+        <div class="bodyline">
+
+                <div id="navPanel">
+                        <select id="navSelect" size="10">
+                                <option value="1" selected="selected">* Preparing For Update</option>
+                                <option value="2">* Update Core Program</option>
+                                <option value="3">* Update Modules</option>
+                                <option value="4">* Finish Update</option>
+                        </select>
+                        <p><input type="checkbox" id="debug" /><label for="debug">updating debug</label></p>
+                </div>
+                <div id="stepsPanel">
+
+                        <div class="steps" id="step1">
+
+                                <p class="nextprevP">
+                                        <button type="button" class="disabledButtons prevButtons" disabled="disabled">back</button>
+                                        <button type="button" class="Buttons nextButtons">next</button>
+                                </p>
+
+                                <h1>Preparing For Update</h1>
+                                <p>
+                                        Before updating, There are several steps to take and insure that backup runs smoothly.
+                                </p>
+                                <ul>
+                                        <li>
+                                                <strong>Backup</strong> your data file. If you have access to a shell, using
+                                                the mysqldump command is a fast way of creating a reliable backup of your data.
+                                        </li>
+
+                                        <li>
+                                                By downloading and decompressing this update, you may have already replaced script files
+                                                from the previous version of phpBMS. If you have decompressed these files to a separate
+                                                directory and have made custom changes directly to the system we recommend backing up
+                                                those files before continuing.
+                                        </li>
+
+                                        <li>
+                                                For the latest information about phpBMS check the <a href="http://www.phpbms.org">phpBMS Project web site</a>.
+                                        </li>
+                                </ul>
+
+                                <h2>Server Requirements</h2>
+                                <table id="sysRequirements" cellpadding="0" cellspacing="0" border="0">
+                                        <thead>
+                                                <tr>
+                                                        <td>requirement</td>
+                                                        <td>server</td>
+                                                </tr>
+                                        </thead>
+                                        <tbody>
+                                                <tr>
+                                                        <td>PHP 5.2.0 or higher</td>
+                                                        <td><span class="<?php echo $phpVerClass?>"><?php echo $phpVer?></span></td>
+                                                </tr>
+                                                <tr>
+                                                        <td>PHP MySQL Support</td>
+                                                        <td><span class="<?php echo $mysqlPresent?>"><?php echo $mysqlPresent?></span></td>
+                                                </tr>
+                                                <tr>
+                                                        <td>Apache 2.0 or higher</td>
+                                                        <td><span class="<?php echo $webServerReport["class"]?>"><?php echo $webServerReport["message"]?></span></td>
+                                                </tr>
+                                                <tr>
+                                                        <td>MySQL Server 5.0 or higher</td>
+                                                        <td><span class="<?php echo $mysqlPassFailClass ?>"><?php echo $mysqlVer ?></span></td>
+                                                </tr>
+
+                                        </tbody>
+                                </table>
+
+                        </div>
+
+                        <div class="steps" id="step2">
+
+                                <p class="nextprevP">
+                                        <button type="button" class="Buttons prevButtons">back</button>
+                                        <button type="button" class="Buttons nextButtons">next</button>
+                                </p>
+
+                                <h1>Update Core Program</h1>
+
+                                <p>
+                                        The database reports the current version is <strong><?php echo $updater->list["base"]["currentversion"] ?></strong>.
+                                        The application files show the application version to upgrade to is <strong><?php echo $updater->list["base"]["version"] ?></strong>.
+                                </p>
+
+                                <?php if($updater->checkBaseUpdate()) { ?>
+
+                                        <p class="notes"><strong>Versions match.  No update is necessary.</strong></p>
+
+                                <?php } else { ?>
+
+                                        <p class="notes"><strong>You must update the phpBMS Core Program before updating any modules.</strong></p>
+
+
+                                        <p><button class="Buttons" id="updatecoreButton">Update Core Program</button> <span id="coreDataNoDebug"></span></p>
+
+                                        <div class="debugResults">
+                                                <h3>Update Core Results</h3>
+                                                <p><textarea name="results" id="coredataupdateresults" cols="40" rows="4" class="results"></textarea></p>
+                                        </div>
+
+                                <?php } //endif  ?>
+                        </div>
+
+                        <div class="steps" id="step3">
+
+                                <p class="nextprevP">
+                                        <button type="button" class="Buttons prevButtons">back</button>
+                                        <button type="button" class="Buttons nextButtons">next</button>
+                                </p>
+
+                                <h1>Udate Modules</h1>
+
+                                <?php $updater->showModulesUpdate(); ?>
+
+                                <div class="debugResults">
+                                        <h3>Module Installation Results</h3>
+                                        <p><textarea name="results" id="moduleupdateresults" class="results" cols="80" rows="10"></textarea></p>
+                                </div>
+
+                        </div>
+
+                        <div class="steps" id="step4">
+
+                                <p class="nextprevP">
+                                        <button type="button" class="Buttons prevButtons">back</button>
+                                        <button type="button" class="disabledButtons nextButtons" disabled="disabled">next</button>
+                                </p>
+
+                                <h1>Finish Update</h1>
+                                <p>
+                                        To finish the update process you will need to:
+                                </p>
+                                <ul>
+                                        <li>
+                                                <h3>Delete Install Folders</h3>
+                                                <p>
+                                                        You must delete both the core installation folder, as well as all modules' installation
+                                                        folders before you can use the system
+                                                </p>
+                                        </li>
+                                        <li>
+                                                <h3>Clear your Browser Cache</h3>
+                                                <p>
+                                                        Part of the update process may have replaced javascript and stylesheet (css) files.
+                                                        Most browsers cache these files to speed loading times. In order to insure that
+                                                        your web application is using all of the latest updates, you will need to
+                                                        clear the browser cache of all client browsers that access the application.
+                                                </p>
+                                                <p>
+                                                        Most browsers will clear this cache automatically if you simply restart the browser
+                                                </p>
+                                        </li>
+
+                                </ul>
+                                <h2>Troubleshooting</h2>
+                                <h3>General Help </h3>
+                                <p>
+                                If you have problems during updating, have questions about how the program works, or would like additional
+                                information about phpBMS, please visit the <a href="http://www.phpbms.org">phpBMS Project web site</a>.  The phpBMS project web site
+                                has many resources to help you including a user wiki, users forum, and mailing list that can help you.</p>
+                                <h3>Paid Customization, Update, Support Options</h3>
+                                <p>Paid technical support and phpBMS customization is available from <a href="http://www.kreotek.com">Kreotek</a>,</p>
+
+                        </div>
+
+                </div>
+
         </div>
 
-        
-        <div class="bodyline" id="step2">
-                <h1>Enter Administrative Log In Information</h1>
-                <p>
-                        Running the update requires administrative access privleges.  Please enter the login credentials
-                        that have administrative priveleges.
-                </p>
-
-                <fieldset>
-                        <legend>administrative login</legend>
-                        <p>
-                                <label for="username">name</label><br />
-                                <input name="name" type="text" id="username" size="32" maxlength="64" />
-                                <input name="name" type="hidden" id="version"  value="<?php echo $modules["base"]["version"] ?>" />
-                        </p>
-                        <p>
-                                <label for="password">password</label><br />
-                                <input name="password" type="password" id="password" size="32" maxlength="24"  />
-                        </p>
-                        <p>
-                                <input type="button" value="Verify" class="Buttons" onclick="runCommand('verifyLogin')" />
-                        </p>
-                </fieldset>
-                <h3>Administrative Verification Results</h3>
-                <p>
-                        <textarea name="results" id="verifyLoginresults" class="results" cols="80" rows="2"></textarea>
-                </p>
-                
-                <p class="nextprevP">
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('back')">back</button>
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('next')">next</button>
-                </p>            
-        </div>
-        
-        
-        <div class="bodyline" id="step3">
-                <h1>Check for phpBMS Core Update Availability</h1>
-
-                <p>Check to see if the phpBMS core needs to be updated</p>
-                <p class="testButtonsP">
-                        <input type="button" value="Check Core Availability" class="Buttons" onclick="runCommand('checkBaseUpdate')" />
-                </p>
-                <h3>Availability Results</h3>
-                <p>
-                        <textarea name="results" id="checkBaseUpdateresults" class="results" cols="80" rows="2"></textarea>
-                </p>
-
-
-                <p class="nextprevP">
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('back')">back</button>
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('next')">next</button>
-                </p>            
-        </div>
-
-
-        <div class="bodyline" id="step4">
-                <h1>Update phpBMS Core</h1>
-                
-                <p>If an update was reported as available in the previous section, you should  run the update to the phpBMS core.</p>
-                
-                <p class="notes">
-                        If no update is available, running the update on an already updated version of phpBMS
-                        can cause data corruption and break the application.
-                </p>
-                
-                <p class="testButtonsP">
-                        <input type="button" value="Update Core" class="Buttons" onclick="runCommand('updateBaseVersion')" />
-                </p>
-                <h3>Core Update Results</h3>
-                <p>
-                        <textarea name="results" id="updateBaseVersionresults" class="results" cols="80" rows="8"></textarea>
-                </p>
-
-                <p class="nextprevP">
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('back')">back</button>
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('next')">next</button>
-                </p>            
-        </div>
-        
-        
-        <div class="bodyline" id="step5">
-                <h1>Update Installed Modules</h1>
-                <p>Before updating an installed module, make sure that you meet any module requirements listed.</p>
-                
-                <p>
-                        <label for="modules">available modules</label><br />
-                        <select id="modules" name="modules" onchange="changeModule()">
-                                <option value="0">Select a module to update...</option>
-                                <?php showModules($modules);?>
-                        </select>                       
-        </p>
-
-                <div id="moduleInformation" class="box" style="display:none">
-                        <h2>Module Information</h2>
-                        <p>
-                                module Name<br />
-                                <strong id="modulename"></strong>
-                        </p>
-                        <p>
-                                version: <strong id="moduleversion"></strong>
-                        </p>
-                        <p class="notes">
-                                The version above is not necessarily the current data version.  Use the
-                                "Check For Updates" button to see if an update is necessary.
-                        </p>
-                        <p>
-                                description<br />
-                                <strong id="moduledescription"></strong>                                
-                        </p>
-                        <p>
-                                requirements<br />
-                                <strong id="modulerequirements"></strong>
-                        </p>
-                        <p class="notes">make sure your system meets all of the module's requirements.</p>
-                        <p class="testButtonsP">
-                                <input type="button" id="checkModule" value="Check For Updates" class="Buttons" onclick="runCommand('checkModuleUpdate')" />
-                                <input type="button" id="updatemodule" name="updatemodule" value="Update Module" class="Buttons" onclick="runModuleUpdate()" disabled="disabled"/>
-                        </p>
-                </div>
-
-                
-                <h3>Module Update Results</h3>
-                <p>
-                        <textarea name="results" id="checkModuleUpdateresults" class="results" cols="80" rows="8"></textarea>
-                </p>
-
-                
-                <p class="nextprevP">
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('back')">back</button>
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('next')">next</button>
-                </p>            
-        </div>
-
-        <div class="bodyline" id="step6">
-                <h1>Complete the Update Process</h1>
-                
-                <p>
-                        To complete the update process, you may need to <strong>restart your browser</strong>, or <strong>clear site cookies and browser
-                        cache</strong> in order for all the changes to take affect.
-                </p>
-                
-                <p class="testButtonsP"><input type="button" id="login" name="login" value="phpBMS Log In" class="Buttons" onclick="document.location='../'" /></p>
-                
-                <p class="nextprevP">
-                        <button type="button" class="Buttons nextprevButtons" onclick="goSection('back')">back</button>
-                        <button type="button" class="disabledButtons nextprevButtons" onclick="goSection('next')" disabled="disabled">next</button>
-                </p>    
-        </div>
-        
         <p class="tiny" align="center"> $Rev$ |  $LastChangedDate$</p>
 </body>

trunk/phpbms/install/updatev0.98.sql

@@ -4 +4 @@
 ALTER TABLE `log` ENGINE=INNODB;
 ALTER TABLE `menu` ENGINE=INNODB;
+UPDATE `menu` SET `name` = 'Tools' WHERE `id` = '1' AND `name` = 'Organizer';
 ALTER TABLE `modules` ENGINE=INNODB;
 ALTER TABLE `notes` ENGINE=INNODB;
+ALTER TABLE `notes` MODIFY COLUMN `type` CHAR(2) NOT NULL DEFAULT 'NT';
 ALTER TABLE `relationships` ENGINE=INNODB;
 ALTER TABLE `reports` ENGINE=INNODB;
+ALTER TABLE `reports` MODIFY COLUMN `reportfile` VARCHAR(128) NOT NULL;
+UPDATE `reports` SET `description` = 'This report will generate a comma-delimited text file. Values are encapsulated in quotes, and the first line lists the field names.' WHERE `name` = 'Raw Table Export';
 ALTER TABLE `roles` ENGINE=INNODB;
+ALTER TABLE `roles` MODIFY COLUMN `inactive` TINYINT(4) NOT NULL DEFAULT 0;
 ALTER TABLE `rolestousers` ENGINE=INNODB;
 ALTER TABLE `scheduler` ENGINE=INNODB;
+INSERT INTO `scheduler` (`name`, `job`, `crontab`, `lastrun`, `startdatetime`, `enddatetime`, `description`, `inactive`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('Clean Import Files', './scheduler_delete_tempimport.php', '30::*::*::*::*', NULL, NOW(), NULL, 'This will delete any temporary import files that are present (for whatever reason) after 30 minutes of their creation.', '0', 1, NOW(), 1, NOW());
+INSERT INTO `scheduler` (`id`, `name`, `job`, `crontab`, `lastrun`, `startdatetime`, `enddatetime`, `description`, `inactive`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('4', 'Remove Excess System Log Records', './scheduler_delete_logs.php', '*::24::*::*::*', NULL, '2009-03-31 12:00:00', NULL, 'This script will trim the system log when there are more than 2000 records present at the time of its calling (default will be every 24 hours).', '0', 1, NOW(), 1, NOW());
 ALTER TABLE `settings` ENGINE=INNODB;
 ALTER TABLE `smartsearches` ENGINE=INNODB;
 ALTER TABLE `tablecolumns` ENGINE=INNODB;
 ALTER TABLE `tabledefs` ENGINE=INNODB;
+ALTER TABLE `tabledefs` ADD COLUMN `importfile` VARCHAR(128) DEFAULT NULL AFTER `addroleid`, ADD COLUMN `importroleid` int(11) NOT NULL DEFAULT '-100' AFTER `importfile`;
 ALTER TABLE `tablefindoptions` ENGINE=INNODB;
 ALTER TABLE `tablegroupings` ENGINE=INNODB;
 ALTER TABLE `tableoptions` ENGINE=INNODB;
-ALTER TABLE `tablesearchablefields` ENGINE=INNODB;
-ALTER TABLE `tabs` ENGINE=INNODB;
-ALTER TABLE `users` ENGINE=INNODB;
-ALTER TABLE `usersearches` ENGINE=INNODB;
-INSERT INTO `scheduler` (`name`, `job`, `crontab`, `lastrun`, `startdatetime`, `enddatetime`, `description`, `inactive`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('clean import files', '/scheduler_delete_tempimport.php', '30::*::*::*::*', NULL, NOW(), NULL, 'This will delete any temporary import files that are present (for whatever reason) after 30 minutes of their creation.', '0', 1, NOW(), 1, NOW());
-ALTER TABLE `tabledefs` ADD COLUMN `importfile` VARCHAR(128) DEFAULT NULL AFTER `addroleid`, ADD COLUMN `importroleid` int(11) NOT NULL DEFAULT '-100' AFTER `importfile`;
-UPDATE `tabledefs` SET `importfile`='modules/base/users_import.php' WHERE `id` = 9;
 ALTER TABLE `tableoptions` ADD COLUMN `needselect` BOOLEAN NOT NULL DEFAULT 1 AFTER `option`;
 UPDATE `tableoptions` SET `needselect` = 0 WHERE `name` IN('massEmail','new','printex','select') AND `tabledefid` IN (9,10,11,12,16,17,19,21,23,24,26,27,200,201,202,203,204);
@@ -30 +31 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('10', 'import', '0', '0', '0', '-100', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('11', 'import', '0', '0', '0', '-100', '0');
-INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('12', 'import', '0', '0', '0', '-100', '0');
+INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('12', 'import', '1', '0', '0', '-100', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('16', 'import', '0', '0', '0', '-100', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('17', 'import', '1', '0', '0', '-100', '0');
@@ -44 +45 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('203', 'import', '0', '0', '0', '-100', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('204', 'import', '0', '0', '0', '-100', '0');
-UPDATE `reports` SET `description` = 'This report will generate a comma-delimited text file. Values are encapsulated in quotes, and the first line lists the field names.' WHERE `name` = 'Raw Table Export';
+ALTER TABLE `tablesearchablefields` ENGINE=INNODB;
+ALTER TABLE `tabs` ENGINE=INNODB;
+ALTER TABLE `users` ENGINE=INNODB;
+ALTER TABLE `users` ADD COLUMN `lastip` VARCHAR(45) NOT NULL DEFAULT '' AFTER `lastname`;
+ALTER TABLE `usersearches` ENGINE=INNODB;

trunk/phpbms/install/update_include.php

@@ -1 +1 @@
 <?php
 
-        
+define("APP_DEBUG",false);
+define("noStartup",true);
+
+require("../include/session.php");
+
+        class updater{
+
+                // database object
+                var $db;
+
+                // module list
+                var $list;
+
+                var $phpbmsSession;
 
 
-//=======================================================================================
-//=======================================================================================
-        function loadSettings() {       
-                $settingsfile =  fopen("../settings.php","r");
-                if($settingsfile){
-                        //loop through the settings file and load variables into the session 
-                        while( !feof($settingsfile)) {
-                                $line=NULL;
-                                $key=NULL;
-                                $value=NULL;
-                                $line=fscanf($settingsfile,"%[^=]=%[^[]]",$key,$value);
-                                if ($line){
-                                        $key=trim($key);
-                                        $value=trim($value);
-                                        if($key!="" and !strpos($key,"]")){     
-                                                $startpos=strpos($value,"\"");
-                                                $endpos=strrpos($value,"\"");
-                                                if($endpos!=false)
-                                                        $value=substr($value,$startpos+1,$endpos-$startpos-1);
-                                                $variables[$key]=$value;
-                                        }
-                                }
-                        }
-                        if(!isset($variables["mysql_pconnect"]))
-                        $variables["mysql_pconnect"]="true";
-                        fclose($settingsfile);
-                        return $variables;
-                } else return "Cannot open setting.php file";
-        }
+                function updater(){
 
-        
-        function getNewVersion($dir="."){
-                $file =  @ fopen($dir."/version.txt","r");
-                $version=fgets($file,1024);
-                @ fclose($file);
-                return $version;
-        }
-        
-        function showModules(){
-                $vars=loadSettings();
-                if(!is_array($vars)) {
-                        echo "<option>Could Not Open Settings File</option>";
-                        return false;
-                }
-                if($vars["mysql_pconnect"]=="true")
-                        $dblink = @  mysql_pconnect($vars["mysql_server"],$vars["mysql_user"],$vars["mysql_userpass"]);
-                else
-                        $dblink = @  mysql_connect($vars["mysql_server"],$vars["mysql_user"],$vars["mysql_userpass"]);
-                @ mysql_select_db($vars["mysql_database"],$dblink);
-                
-                $querystatement="SELECT name,version FROM modules WHERE name!=\"base\" ";
-                $queryresult=$db->query($querystatement);
-                
-                while($modulerecord=$db->fetchArray($queryresult)){
-                        $newVersion=getNewVersion("../modules/".$modulerecord["name"]."/install");
-                        if($newVersion!=$modulerecord["version"])
-                                echo "<OPTION value=\"".$modulerecord["name"]."\">".$modulerecord["name"]." (".$modulerecord["version"]." -&gt; ".$newVersion.")</OPTION>\n";
-                }
-                
-        }
+                        $this->phpbmsSession = new phpbmsSession;
 
-        $version=getNewVersion();
+                        if($this->phpbmsSession->loadDBSettings(false)){
 
+                                @ include_once("include/db.php");
+
+                                $this->db = new db(false);
+                                $this->db->stopOnError = false;
+                                $this->db->showError = false;
+                                $this->db->logError = false;
+
+                        } else
+                                $error = new appError(-300,"","",true,true,false);
+
+                        if(!$this->db->connect())
+                                $error = new appError(-400,"Could not connect to database server.\n\n".$this->db->getError(),"Database Error",true,true,false);
+
+                        if(!$this->db->selectSchema())
+                                $error = new appError(-410,"Could not open schema ".$this->db->schema,"Database Error", true, true, false);
+
+                }//end function init
+
+
+                function buildList(){
+
+                        $thedir = @ opendir("../modules/");
+
+                        $modules = array();
+
+                        //this helps build the modules array
+                        // each included modules version.php should add to the
+                        // array
+                        while($entry = readdir($thedir)){
+
+                                if($entry != "." && $entry != ".." && $entry != "base" && $entry != "sample" && is_dir("../modules/".$entry)){
+
+                                        if(file_exists("../modules/".$entry."/install/update.php") && file_exists("../modules/".$entry."/version.php")){
+
+                                                include("../modules/".$entry."/version.php");
+
+                                        }//endif
+
+                                }//endif
+
+                        }//end if
+
+                        //Next we add the base version in
+                        include("../phpbmsversion.php");
+
+                        //go retrieve current versions
+                        foreach($modules as $key=>$value)
+                                $modules[$key]["currentversion"] = $this->getCurrentVersion($key);
+
+                        $this->list = $modules;
+
+                }//end function buildList
+
+
+                function getMySQLVersion(){
+
+                        $querystatement = "SELECT VERSION() AS ver";
+                        $queryresult = $this->db->query($querystatement);
+                        if($this->db->error)
+                                $error = new appError(-425,"Could not retrieve mysql verson. ","Database Error", true, true, false);
+
+                        $therecord = $this->db->fetchArray($queryresult);
+
+                        return $therecord["ver"];
+
+                }//endif
+
+
+                function getCurrentVersion($module){
+
+                        $querystatement = "
+                                SELECT
+                                        version
+                                FROM
+                                        modules
+                                WHERE
+                                        name = '".$module."'";
+
+                        $queryresult = $this->db->query($querystatement);
+                        if($this->db->error)
+                                $error = new appError(-600,"Could not retrieve current version information for ".$module.": ".$this->db->error,"Cannot load module information",true,true,false);
+
+                        if($this->db->numRows($queryresult)){
+
+                                $therecord = $this->db->fetchArray($queryresult);
+
+                                return floatval($therecord["version"]);
+
+                        } else
+                                return 0;
+
+                }//end function getCurrentVersion
+
+
+                function checkBaseUpdate(){
+
+                        return ($this->list["base"]["version"] == $this->list["base"]["currentversion"]);
+
+                }//end function showBaseUpdate
+
+
+                function showModulesUpdate(){
+
+                        ?>
+                        <table id="moduleTable" cellpadding="0" cellspacing="0" border="0">
+                                <thead>
+                                        <tr>
+                                                <th>module</th>
+                                                <th>database version</th>
+                                                <th>file version</th>
+                                                <th>&nbsp;</th>
+                                        </tr>
+                                </thead>
+                                <tbody>
+                        <?php
+
+                        ksort($this->list);
+
+                        foreach($this->list as $key=>$module){
+
+                                if($key != "base"){
+
+                                        ?>
+                                        <tr>
+                                                <td>
+                                                        <h3><strong><?php echo $module["name"]?></strong></h3>
+                                                        <p><?php echo $module["description"]?></p>
+                                                        <p class="notes"><strong>Requirements:</strong> <?php echo $module["requirements"]?>
+                                                </td>
+                                                <td><?php echo $module["version"] ?></td>
+                                                <td><?php echo $module["currentversion"] ?></td>
+
+                                                <td class="moduleInstall">
+                                                        <?php
+                                                                if($module["version"] != $module["currentversion"]){
+                                                                        if($module["currentversion"] == 0) {
+                                                        ?>
+                                                                Not Installed>
+                                                        <?php
+                                                                        } else {}
+                                                        ?>
+
+                                                                <button class="Buttons moduleButtons" id="moduleButton<?php echo $key ?>">Update Module</button>
+                                                                <p><span class="" id="Results<?php echo $key?>"></span></p>
+
+                                                        <?php } else {?>
+                                                                Versions Match<br />
+                                                                Update Unnecessary
+                                                        <?php }//endif version!=currentversion ?>
+                                                </td>
+                                        </tr>
+                                        <?php
+
+                                }//end if
+
+                        }//end foreach
+
+                        ?></tbody></table><?php
+
+                }//end function showModuleUpdate
+
+        }//end class
 ?>