Changeset 485

Timestamp:

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

Author:

nate

Message:

• Merged Nathan branch back into trunk.

Location:

trunk/phpbms

Files:

• ChangeLog (modified) (4 diffs)
• common/javascript/fields.js (modified) (8 diffs)
• common/stylesheet/mozilla/menu.css (modified) (1 diff)
• common/stylesheet/mozilla/pages/base/snapshot.css (copied) (copied from branches/nathan/common/stylesheet/mozilla/pages/base/snapshot.css)
• common/stylesheet/mozilla/pages/bms/incoming_cashflow.css (copied) (copied from branches/nathan/common/stylesheet/mozilla/pages/bms/incoming_cashflow.css)
• common/stylesheet/mozilla/pages/info.css (modified) (1 diff)
• common/stylesheet/mozilla/pages/login.css (modified) (1 diff)
• common/stylesheet/mozilla/pages/requirements.css (modified) (1 diff)
• common/stylesheet/mozilla/pages/snapshot.css (deleted)
• defaultsettings.php (modified) (1 diff)
• help/index.php (modified) (2 diffs)
• include/common_functions.php (modified) (24 diffs)
• include/db.php (modified) (15 diffs)
• include/fields.php (modified) (1 diff)
• include/imports.php (modified) (16 diffs)
• include/jstransport.php (modified) (4 diffs)
• include/login_include.php (modified) (1 diff)
• include/session.php (modified) (9 diffs)
• include/tables.php (modified) (1 diff)
• index.php (modified) (3 diffs)
• info.php (modified) (2 diffs)
• install/createtables.sql (modified) (10 diffs)
• install/fail.gif (copied) (copied from branches/nathan/install/fail.gif)
• install/index.php (copied) (copied from branches/nathan/install/index.php)
• install/install.css (modified) (1 diff)
• install/install.js (modified) (1 diff)
• install/install.php (deleted)
• install/installajax.php (copied) (copied from branches/nathan/install/installajax.php)
• install/installxml.php (deleted)
• install/install_include.php (modified) (1 diff)
• install/menu.sql (modified) (1 diff)
• install/notes.sql (modified) (1 diff)
• install/scheduler.sql (modified) (1 diff)
• install/success.gif (copied) (copied from branches/nathan/install/success.gif)
• install/tablecolumns.sql (modified) (1 diff)
• install/tabledefs.sql (modified) (1 diff)
• install/tablefindoptions.sql (modified) (1 diff)
• install/tablegroupings.sql (modified) (1 diff)
• install/tableoptions.sql (modified) (1 diff)
• install/tablesearchablefields.sql (modified) (1 diff)
• install/update.js (modified) (1 diff)
• install/update.php (modified) (3 diffs)
• install/updateajax.php (copied) (copied from branches/nathan/install/updateajax.php)
• install/updatev0.98.sql (modified) (3 diffs)
• install/updatexml.php (deleted)
• install/update_include.php (modified) (1 diff)
• install/version.php (deleted)
• install/warning.gif (copied) (copied from branches/nathan/install/warning.gif)
• modules/base/adminsettings.php (modified) (2 diffs)
• modules/base/cron.php (modified) (19 diffs)
• modules/base/general_import.php (modified) (10 diffs)
• modules/base/include/adminsettings_include.php (modified) (9 diffs)
• modules/base/include/files.php (modified) (3 diffs)
• modules/base/include/menu.php (modified) (4 diffs)
• modules/base/include/notes.php (modified) (36 diffs)
• modules/base/include/relationships.php (modified) (1 diff)
• modules/base/include/reports.php (modified) (2 diffs)
• modules/base/include/roles.php (modified) (1 diff)
• modules/base/include/scheduler.php (modified) (4 diffs)
• modules/base/include/snapshot_include.php (modified) (6 diffs)
• modules/base/include/tabledefs.php (modified) (4 diffs)
• modules/base/include/users.php (modified) (5 diffs)
• modules/base/include/usersearches.php (modified) (2 diffs)
• modules/base/notes_addedit.php (modified) (22 diffs)
• modules/base/scheduler_addedit.php (modified) (10 diffs)
• modules/base/scheduler_delete_logs.php (copied) (copied from branches/nathan/modules/base/scheduler_delete_logs.php)
• modules/base/scheduler_delete_tempimport.php (modified) (1 diff)
• modules/base/snapshot.php (modified) (2 diffs)
• modules/base/tabs_addedit.php (modified) (8 diffs)
• modules/base/users_addedit.php (modified) (9 diffs)
• modules/base/users_import.php (deleted)
• modules/bms/clients_addedit.php (modified) (21 diffs)
• modules/bms/clients_import.php (modified) (12 diffs)
• modules/bms/include/addresses.php (modified) (6 diffs)
• modules/bms/include/addresstorecord.php (modified) (14 diffs)
• modules/bms/include/clients.php (modified) (27 diffs)
• modules/bms/include/discounts.php (modified) (1 diff)
• modules/bms/include/invoices.php (modified) (5 diffs)
• modules/bms/include/invoicestatuses.php (modified) (2 diffs)
• modules/bms/include/products.php (modified) (5 diffs)
• modules/bms/include/receipts.php (modified) (29 diffs)
• modules/bms/install/install.php (modified) (1 diff)
• modules/bms/install/reports.sql (modified) (1 diff)
• modules/bms/install/tablecolumns.sql (modified) (1 diff)
• modules/bms/install/tabledefs.sql (modified) (2 diffs)
• modules/bms/install/tablegroupings.sql (modified) (1 diff)
• modules/bms/install/tableoptions.sql (modified) (1 diff)
• modules/bms/install/tablesearchablefields.sql (modified) (1 diff)
• modules/bms/install/update.php (modified) (9 diffs)
• modules/bms/install/updatev0.9.sql (copied) (copied from branches/nathan/modules/bms/install/updatev0.9.sql)
• modules/bms/install/updatev0.90.sql (deleted)
• modules/bms/install/updatev0.98.sql (modified) (3 diffs)
• modules/bms/install/version.php (deleted)
• modules/bms/invoices_attachments.php (modified) (4 diffs)
• modules/bms/invoices_notes.php (modified) (3 diffs)
• modules/bms/javascript/aritem_aging.js (modified) (2 diffs)
• modules/bms/javascript/incoming_cashflow.js (copied) (copied from branches/nathan/modules/bms/javascript/incoming_cashflow.js)
• modules/bms/javascript/totalreports.js (modified) (4 diffs)
• modules/bms/products_import.php (deleted)
• modules/bms/report/incoming_cashflow.php (copied) (copied from branches/nathan/modules/bms/report/incoming_cashflow.php)
• modules/bms/version.php (copied) (copied from branches/nathan/modules/bms/version.php)
• modules/recurringinvoices/install/install.php (modified) (1 diff)
• modules/recurringinvoices/install/update.php (modified) (1 diff)
• modules/recurringinvoices/install/version.php (deleted)
• modules/recurringinvoices/scheduler_recurr.php (modified) (20 diffs)
• modules/recurringinvoices/version.php (copied) (copied from branches/nathan/modules/recurringinvoices/version.php)
• modules/sample/install/install.php (modified) (1 diff)
• modules/sample/install/update.php (modified) (1 diff)
• modules/sample/install/version.php (deleted)
• modules/sample/sampletable_addedit.php (modified) (9 diffs)
• modules/sample/snapshot.php (modified) (1 diff)
• modules/sample/version.php (copied) (copied from branches/nathan/modules/sample/version.php)
• phpbmsversion.php (copied) (copied from branches/nathan/phpbmsversion.php)
• requirements.php (modified) (2 diffs)
• THANKS.txt (modified) (1 diff)

trunk/phpbms/ChangeLog

@@ -? +1 @@
+phpBMS v0.98
+http://phpbms.org/browser/tags/phpbms-0.98
+ * Support for importing records directly from within phpBMS
+ * New install and update procedures
+
+The complete list of closed tickets can be found here: http://phpbms.org/query?status=closed&milestone=0.98
+
 phpBMS v0.96
+http://phpbms.org/browser/tags/phpbms-0.96
  * Support For Multiple Client Addresses
  * Separate Bill To and Ship To Addresses on Sales Orders
- * Automatic removal of old CC/Bank routing information on Invoices 
+ * Automatic removal of old CC/Bank routing information on Invoices
 
 The complete list of closed tickets can be found here: http://phpbms.org/query?status=closed&milestone=0.96
@@ -51 +59 @@
 phpBMS v0.7
 http://phpbms.org/browser/tags/phpbms-0.7
- 
+
  * Support for multiple phone formats
  * Support for multiple currency formats
  * Support for multiple date/time formats
  * New client order defaults
- * New scheduler system 
+ * New scheduler system
  * New logging system
  * Support for type JPG on logo
@@ -65 +73 @@
  * Longer state fields
  * Order status now modifiable
- * Track order status history 
+ * Track order status history
  * Users can edit their information
  * New user access level system
@@ -223 +231 @@
  * Fixed issue with invoice line items not able to enter/fill correctly
  * addressed global variable problem in multiple areas
- * Removed parameter "response" from passed variables to UPS shipping lookup.  
+ * Removed parameter "response" from passed variables to UPS shipping lookup.
  * Including parameter breaks the CGI lookup (returned blank response) for UPS shipping lookup
  * Included amount due on invoice report

trunk/phpbms/common/javascript/fields.js

@@ -41 +41 @@
         var thereturn=true;
         var errorMessage="";
-                        
+
         //skip validation if cancel
         if (theform["cancelclick"]){
@@ -56 +56 @@
                         break;
                 }
-        }       
-                
+        }
+
         //validate required fields first
         for(i=0;i<requiredArray.length;i++){
@@ -101 +101 @@
                 }
         }
-        
+
         //next phone numbers
         for(i=0;i<phoneArray.length;i++){
@@ -133 +133 @@
         }
         return thereturn;
-        
+
 }
 
@@ -209 +209 @@
 function validateCurrency(theitem){
         theitem.value=numberToCurrency(currencyToNumber(theitem.value));
-        
+
         //in case the field has an additional onchange code to be run
         if (theitem.thechange) theitem.thechange();
@@ -227 +227 @@
                 if (thenumber.charAt(i)!="%" && thenumber.charAt(i)!="+" && thenumber.charAt(i)!=",") markupnumber+=thenumber.charAt(i);
         }
-        
+
         //get rid of trailing zeros and possibly "."
         while(markupnumber.charAt(markupnumber.length-1)=="0" && markupnumber.indexOf(".")!=-1) markupnumber=markupnumber.substring(0,markupnumber.length-1);
@@ -238 +238 @@
 
 function checkUnique(tabledefid,column,checkvalue,excludeid){
-        
+
         var theurl=APP_PATH+"checkunique.php?tdid="+parseInt(tabledefid);
         theurl=theurl+"&c="+encodeURIComponent(column);
@@ -246 +246 @@
 
         loadXMLDoc(theurl,null,false);
-        
+
         response = req.responseXML.documentElement;
         thevalue = response.getElementsByTagName('isunique')[0].firstChild.data;
-        
+
         if(thevalue==1) return true; else return false;
 }

trunk/phpbms/common/stylesheet/mozilla/menu.css

@@ -124 +124 @@
 
 /* ------ Help Page  ---- */
-#helpBox{height:420px; overflow:auto; background:white}
-#helpBox h1{margin-top:20px;}
-#helpClose{width:70px}
+#helpBox{background:white}
+#helpClose{
+        padding-left: 15px;
+        padding-right: 15px;
+}

trunk/phpbms/common/stylesheet/mozilla/pages/info.css

@@ -1 +1 @@
 /* $Rev$ | $LastChangedBy$ */
 /* $LastChangedDate$ */
-#container{width:740px; margin:10px auto}
+#container{
+        width:740px; margin:10px auto
+}
+
 #phpBMSLogo{
-        float:right;
-        background:white url(../../../image/logo-large.png) 10px 10px no-repeat;
-        padding:77px 10px 10px 10px;
-        margin-right:20px;
-        width:250px;
-        text-align:right;
+        float: right;
+        background: white url("../../../image/logo-large.png") 10px 10px no-repeat;
+        padding: 77px 10px 10px 10px;
+        width: 250px;
+        text-align: right;
 }
-#companyInfo{margin-right:190px;}
-#loginButton{width:100px;}
+
+#companyInfo{
+        margin-right:260px;
+}
+
+#loginButton{
+        padding-right: 15px;
+        padding-left: 15px;
+}

trunk/phpbms/common/stylesheet/mozilla/pages/login.css

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-.bodyline{display:block;padding:5px;width:300px; margin: 0 auto;}
+.bodyline{
+        display: block;
+        padding: 5px;
+        width: 22em;
+        margin: 0 auto;
+}
+
+label{
+        line-height: 1.5em;
+}
+
 #loginbox{
         margin:100px auto 50px;
 }
 
-#loginbox h1{font-size:21px;font-weight:bold;background-position:6px 6px;padding-left:28px;color:#455372;}
+        #loginbox h1{
+                font-size: 21px;
+                font-weight: bold;
+                background-position: 6px 6px;
+                padding-left: 28px;
+                color:#455372;
+        }
 
-#moreinfoButtonP{text-align:left;padding-bottom:5px;}
+        #loginbox .box{
+                margin:10px 8px 10px;
+                border-style: none;
+                background-color: white;
+                text-align: center;
+        }
 
-#moreinfo{padding:0;}
-#moreingo p{padding:2px;}
-#moreinfo h2{margin:0;padding:5px;background:none;height:22px;}
-#moreinfo h2 a{display:block;width:85px;height:22px;background:url(../../../image/logo.png);}
-#moreinfo h3{text-align:left;padding:2px 5px 10px;margin:0;border:0;font-weight:normal;font-size:9px; border:0;}
+        #loginbox form{
+                padding:10px 5px 0;
+                margin:0;
+        }
 
-#buttonP{padding-right:18px;text-align:right;}
-#buttonP button{padding-left:15px;padding-right:15px;}
-
-#loginbox .box{
-        margin:10px 8px 10px;
-        border-style:none;
-        background-color:white;
-        text-align:center;
+#moreinfoButtonP{
+        float: left;
+        text-align:left;
+        padding-top: 6px;
 }
 
-#loginbox form{padding:10px 5px 0;margin:0;}
+#moreinfo{
+        padding:0;
+}
 
-#username,#password{width:98%;}
-#command{width:75px;}
+        #moreinfo p{
+                padding:2px;
+        }
 
-#failed{text-align:center;margin-top:5px;}
+        #moreinfo h2{
+                margin: 0;
+                padding: 5px;
+                background: none;
+                height: 22px;
+        }
+
+                #moreinfo h2 a{
+                        display: block;
+                        width: 85px;
+                        height: 22px;
+                        background: url("../../../image/logo.png");
+                }
+
+        #moreinfo h3{
+                text-align: left;
+                padding: 2px 5px 10px;
+                margin: 0;
+                border: 0;
+                font-weight: normal;
+                font-size: 9px;
+                border: 0;
+        }
+
+#buttonP{
+        text-align:right;
+}
+
+        #buttonP button{
+                padding-left: 15px;
+                padding-right: 15px;
+                font-size: 13px;
+        }
 
 
 
-#demobox{ margin:0 auto;}
-#demobox h2{margin-top:0;}
-#demobox dt{font-weight:bold; padding:2px 10px;}
-#demobox dd{padding-bottom:10px;}
+#username, #password{
+        width:99%;
+        font-size: 15px;
+}
+
+#command{
+        width:75px;
+}
+
+#failed{
+        text-align: center;
+        margin-top: 5px;
+}
+
+
+#demobox{
+        margin: 0 auto;
+}
+
+        #demobox h2{
+                margin-top:0;
+        }
+
+        #demobox dt{
+                font-weight:bold;
+                padding:2px 10px;
+        }
+
+        #demobox dd{
+                padding-bottom: 10px;
+        }

trunk/phpbms/common/stylesheet/mozilla/pages/requirements.css

@@ -1 +1 @@
 /* $Rev$ | $LastChangedBy$ */
 /* $LastChangedDate$ */
-#container{width:740px; margin:10px auto;}
-#cba{margin-top:45px;}
-#logo{
-        float:right;background:white url(../../../image/logo-large.png) 8px 12px no-repeat;
-        width:260px;height:67px;
+#container{
+        width:740px;
+        margin:10px auto;
 }
-#logo span{display:none;}
-#browserTable{margin:20px;}
-#loginButton{width:100px;}
+
+#browserTable{
+        width: 100%
+}
+
+#loginButton{
+        padding-left: 10px;
+        padding-right: 10px;
+}

trunk/phpbms/defaultsettings.php

@@ -1 +? @@
-<?php /* ]
+<?php /* [
 mysql_server    = "localhost"
 mysql_database  = "phpbms"
-mysql_user              = "bms"
+mysql_user      = "bms"
 mysql_userpass  = "bmspass"
 mysql_pconnect  = "true"
- end] */ ?>
+] */ ?>

trunk/phpbms/help/index.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        require("../include/session.php");      
-        
-        $querystatement="SELECT displayname,version from modules ORDER BY id";
-        $queryresult=$db->query($querystatement);
+        require("../include/session.php");
 
-        function displayVersions($db,$queryresult){
-                if($queryresult){
-                        while($therecord=$db->fetchArray($queryresult)){
-                                if($therecord["displayname"]!="Base"){
-                                        echo $therecord["displayname"].": ";
-                                        echo "v".$therecord["version"]."<br />";
-                                } else
-                                        echo "<span class=\"important\">phpBMS version: ".$therecord["version"]."</span><br />";
-                        }
-                }
-        }
-                
+        class versions{
+
+                var $db;
+                var $queryresult;
+
+                function versions($db){
+
+                        $this->db = $db;
+
+                }//end function init
+
+                function get(){
+
+                        $querystatement = "
+                                SELECT
+                                        `name`,
+                                        `displayname`,
+                                        `version`
+                                FROM
+                                        `modules`
+                                ORDER BY
+                                        `id`";
+
+                        $this->queryresult = $this->db->query($querystatement);
+
+                }//end function get
+
+
+                function show(){
+
+                        if(!$this->queryresult)
+                                return false;
+
+                        while($therecord = $this->db->fetchArray($this->queryresult)){
+
+                                if($therecord["name"] != "base")
+                                        echo formatVariable($therecord["displayname"]).": v".$therecord["version"]."<br />";
+                                else
+                                        echo '<strong>v'.$therecord["version"].'</strong><br /><br />';
+
+                        }//endwhile
+
+                        return true;
+
+                }//end function show
+
+        }//end class
+
+        $versions = new versions($db);
+        $versions->get();
+
 ?>
 <div class="box" id="helpBox">
 
-        <h1>About This Program</h3>
-        <blockquote>
-                <p align="right" style="float:right;"><img src="<?php echo APP_PATH?>common/image/logo.png" alt="phpBMS Logo" width="85" height="22"/></p>
-                
-                <h3>phpBMS - Commercial Open Source Business Management Web Application</h3>
-                
-                <p class="small"><?php displayVersions($db,$queryresult)?></p>
-                
-                <p>Copyright &reg; 2004-2007 Kreotek, LLC. All Rights Reserved. phpBMS, and the phpBMS logo are trademarks of Kreotek, LLC.</p>
-        
-                <p>
-                        <strong>Kreotek, LLC</strong><br />
-                        610 Quantum<br />
-                        Rio Rancho, NM 87124<br />
-                        <a href="http://www.kreotek.com" target="_blank">http://www.kreotek.com</a><br />
-                        1-800-731-8026<br />
-                </p>
-        </blockquote>
+        <p align="right" style="float:right; text-align:right; padding-left: 10px;" class="small">
+                <img src="<?php echo APP_PATH?>common/image/logo.png" alt="phpBMS Logo" width="85" height="22"/><br />
+                <?php $versions->show()?>
+        </p>
 
-        <h1>Keyboard Shortcuts</h1>
-        <blockquote>
-                <p>
-                        phpBMS takes advanage of HTML's accesskey property to allow
-                        you to use your keyboard to navigate pages.  Some browsers and OS's
-                        might have different modifier keys, so check your
-                        browser documentation.  In windows, when using Internet Explorer and Firefox &lt 2.0, hold
-                        down the Alt key followed by the shortcut.  When using Firefox &gt 2.0 in windows hold down Alt-Shift buttons 
-                        followed by the shortcut. In opera hold down Shift-Esc then
-                        the shortut.  On a Mac, use the ctrl key in both Firefox &lt; 2.0 and Safari. 
-                </p>
-        
-                <h2>Search/List Screens</h2>
-                <div class="fauxP">
-                        <table border="0" cellpadding="0" cellspacing="0" class="querytable" width="300">
-                                <tr>
-                                        <th valign="bottom" class="queryheader" align="right" width="100%">Command</th>
-                                        <th valign="bottom" class="queryheader" align="center">Key</th>
-                                </tr>
-                                <tr class="qr1" >
-                                        <td align="right">New Record</td>
-                                        <td align="center">N</td>
-                                </tr>
-                                <tr class="qr2" >
-                                        <td align="right">Edit Record</td>
-                                        <td align="center">E</td>
-                                </tr>
-                                <tr class="qr1" >
-                                        <td align="right">Print</td>
-                                        <td align="center">P</td>
-                                </tr>
-                                <tr class="qr2" >
-                                        <td align="right">Delete (where applicable)</td>
-                                        <td align="center">D</td>
-                                </tr>
-                                <tr class="qr1" >
-                                        <td align="right">Select All</td>
-                                        <td align="center">A</td>
-                                </tr>
-                                <tr class="qr2" >
-                                        <td align="right">Select None</td>
-                                        <td align="center">X</td>
-                                </tr>
-                                <tr class="qr1" >
-                                        <td align="right">Keep Highlighted</td>
-                                        <td align="center">K</td>
-                                </tr>
-                                <tr class="qr2">
-                                        <td align="right">Omit Highlighted</td>
-                                        <td align="center">O</td>
-                                </tr>
-                                <tr class="queryfooter">
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                </tr>
-                        </table>
-                </div>
-        
-                <h2>Add/Edit Screens</h2>
-                <div class="fauxP">
-                        <table border="0" cellpadding="0" cellspacing="0" class="querytable" width="300">
-                                <tr>
-                                        <th valign="bottom" class="queryheader" align="right" width="100%">Command</th>
-                                        <th valign="bottom" class="queryheader" align="center">Key</th>
-                                </tr>
-                                <tr class="qr1">
-                                        <td align="right">Save Record</td>
-                                        <td align="center">S</td>
-                                </tr>
-                                <tr class="qr2">
-                                        <td align="right">Cancel</td>
-                                        <td align="center">X</td>
-                                </tr>
-                                <tr class="queryfooter">
-                                        <td>&nbsp;</td>
-                                        <td>&nbsp;</td>
-                                </tr>
-                        </table>
-                </div>
-        </blockquote>
+        <h3 style="margin-top:0">phpBMS</h3>
+        <p><strong>Commercial Open Source Business Management Web Application</strong>
+
+        <p class="tiny">Copyright &reg; <?php echo date("Y") ?> Kreotek, LLC. All Rights Reserved. phpBMS, and the phpBMS logo are trademarks of Kreotek, LLC.</p>
 
 
-        <h1>Community Support at www.phpbms.org</h1>
-        
-        <blockquote>
-                <ul>
-                        <li><p><a href="http://www.phpbms.org" target="_blank">phpBMS project Web Site</a> - Main site for phpBMS development, documentation, and user support.</p></li>
-                        <li><p><a href="http://phpbms.org/wiki/PhpbmsFaq" target="_blank">phpBMS FAQ</a> - Frequently asked questions </p></li>
-                        <li><p><a href="http://www.phpbms.org/forum" target="_blank">phpBMS User Support forum</a> - A place for user and developer discussions.</p></li>
-                        <li><p><a href="http://phpbms.org/wiki/PhpbmsGuide" target="_blank">phpBMS Wiki Documentation </a> - Wiki driven user documentation starting point.</p></li>
-                </ul>
-        </blockquote>
+        <p class="tiny" style="clear: right;float: right;"><a href="http://www.kreotek.com" target="_blank">http://www.kreotek.com</a></p>
 
-        <h1>Customization and Paid Support Options</h1>
 
-        <blockquote>
-                <h2>Paid Technical, Development and Installation Support</h2>
-        
-                <p>
-                        Know that your mission critical business software is backed by
-                        toll-free phone and e-mail support provided by the very people
-                        who created the software.  Choose a paid support contract
-                        provided by Kreotek that suits your need and budget.
-                </p>
-                <p>
-                        Visit <a href="http://www.kreotek.com" target="_blank">http://www.kreotek.com</a> or call
-                        <strong>1-800-731-8026</strong> for more information.
-                </p>
-                <h2>Customizing phpBMS</h2>
-                <p>
-                        No two businesses are run the exact same way. Every individual buiness has uniques needs. Don't conform
-                        your business processes to your software, make your software work the way your business does.
-                </p>
-                <p>
-                        Kreotek can provide for all of  your company's customization needs.  From custom reports, importing, adding fields,
-                        or integrating with legacy systems, let the people who created the software tailor phpBMS to work within your
-                        specific business processes.
-                </p>
-                <p>
-                        Visit <a href="http://www.kreotek.com" target="_blank">http://www.kreotek.com</a> or call
-                        <strong>1-800-731-8026</strong> for more information.
-                </p>
-        </blockquote>
+        <p class="small">
+                <strong>Kreotek, LLC</strong><br />
+                610 Quantum<br />
+                Rio Rancho, NM 87124 USA
+        </p>
+
+
+        <p class="tiny">
+                U.S. and Canada Toll Free<br />
+                1-800-731-8026
+        </p>
+
+        <p class="tiny">
+                Outside US and Canada<br />
+                +1-505-994-6388
+        </p>
+
+        <h3>Community Support</h3>
+        <ul>
+                <li class="small"><a href="http://www.phpbms.org" target="_blank">phpBMS project Web Site</a></li>
+                <li class="small"><a href="http://www.phpbms.org/forum" target="_blank">phpBMS Community Support forum</a></li>
+                <li class="small"> <a href="http://phpbms.org/wiki/PhpbmsGuide" target="_blank">phpBMS Wiki Documentation </a></li>
+        </ul>
+
+        <h3>Paid Support and Customization</h3>
+        <p class="small">
+                Receive paid support directly from the creators of phpBMS, Kreotek.
+                We have multiple tiers of support contracts available and can customize
+                phpBMS to suit your specific needs.
+        </p>
+
 </div>
 <p align="right"><button id="helpClose" type="button" class="Buttons" onclick="closeModal()"><span>close</span></button></p>

trunk/phpbms/include/common_functions.php

@@ -40 +40 @@
 // it should be instanced in session.php
 class phpbms{
-        
+
         var $db;
         var $modules = array();//array of installed modules
@@ -48 +48 @@
         var $bottomJS = array();
         var $onload = array();
-                
+
         var $showFooter = true;
         var $showMenu = true;
-        
+
         function phpbms($db){
                 $this->db = $db;
-                
+
                 $this->modules = $this->getModules();
         }
@@ -65 +65 @@
                 }
         }
-        
+
         function showJsIncludes(){
                 foreach($this->jsIncludes as $theinclude){
@@ -84 +84 @@
         }//end method
 
-        
+
         function getModules(){
                 $modules = array();
-                
+
                 $querystatement = "SELECT * FROM `modules`";
                 $queryresult = $this->db->query($querystatement);
                 while($therecord = $this->db->fetchArray($queryresult))
                         $modules[$therecord["name"]] = $therecord;
-                        
+
                 return $modules;
         }
-        
+
 
         function displayRights($roleid,$rolename = NULL){
                         switch($roleid){
-                                
+
                                 case 0:
                                         echo "EVERYONE";
                                 break;
-                                
+
                                 case -100:
                                         echo "Administrators";
                                 break;
-                                
+
                                 default:
                                         if(!$rolename){
                                                 $querystatement = "SELECT name FROM roles WHERE id=".((int) $roleid);
                                                 $queryresult = $this->db->query($querystatement);
-        
+
                                                 $therecord = $this->db->fetchArray($queryresult);
                                                 $rolename = $therecord["name"];
                                         }//end if
-                                        
+
                                         echo $rolename;
                         }//end case
@@ -123 +123 @@
 
         function showTabs($tabgroup,$currenttabid,$recordid=0){
-                        
+
                 $querystatement="SELECT id,name,location,enableonnew,notificationsql,tooltip,roleid FROM tabs WHERE tabgroup=\"".$tabgroup."\" ORDER BY displayorder";
                 $queryresult=$this->db->query($querystatement);
-        
-                ?><ul class="tabs"><?php 
+
+                ?><ul class="tabs"><?php
                         while($therecord=$this->db->fetchArray($queryresult)){
 
                                 if(hasRights($therecord["roleid"])){
-                        
+
                                         ?><li <?php if($therecord["id"]==$currenttabid) echo "class=\"tabsSel\"" ?>><?php
                                                 if($therecord["id"]==$currenttabid || ($recordid==0 && $therecord["enableonnew"]==0)){
@@ -143 +143 @@
                                                         $therecord["notificationsql"]=str_replace("{{id}}",((int) $recordid),$therecord["notificationsql"]);
                                                         $notificationresult=$this->db->query($therecord["notificationsql"]);
-                
+
                                                         if($this->db->numRows($notificationresult)!=0){
                                                                 $notificationrecord=$this->db->fetchArray($notificationresult);
@@ -153 +153 @@
                                                         }
                                                 }
-                                                
+
                                                 echo $opener.$therecord["name"].$closer;
-                
-                                        ?></li><?php 
+
+                                        ?></li><?php
                                 }//endif hasRights
-                        }//end whilt    
+                        }//end whilt
                 ?>
                 </ul><?php
@@ -165 +165 @@
 
         function getUserName($id=0){
-                
+
                 $querystatement="select concat(firstname,\" \",lastname) as name from users where id=".((int) $id);
                 $queryresult = $this->db->query($querystatement);
-        
+
                 $tempinfo = $this->db->fetchArray($queryresult);
                 return trim($tempinfo["name"]);
-                
+
         }// end method
 
@@ -222 +222 @@
                                 if(count($temparray)==3)
                                         $thedate=mktime(0,0,0,(int) $temparray[1],(int) $temparray[2],(int) $temparray[0]);
-                                else 
+                                else
                                         return false;
                         break;
@@ -231 +231 @@
                                 if(count($temparray)==4)
                                         $thedate=mktime(0,0,0,(int) $temparray[1],(int) $temparray[2],(int) $temparray[3]);
-                                else 
+                                else
                                         return false;
                         break;
-                        
+
                         case "English, UK":
                                 $datestring="/".ereg_replace(",.","/",$datestring);
@@ -240 +240 @@
                                 if(count($temparray)==4)
                                         $thedate=mktime(0,0,0,(int) $temparray[2],(int) $temparray[1],(int) $temparray[3]);
-                                else 
+                                else
                                         return false;
                         break;
-                        
+
                         case "Dutch, NL":
                                 $datestring="-".ereg_replace(",.","-",$datestring);
@@ -249 +249 @@
                                 if(count($temparray)==4)
                                         $thedate=mktime(0,0,0,(int) $temparray[2],(int) $temparray[1],(int) $temparray[3]);
-                                else 
+                                else
                                         return false;
                         break;
@@ -302 +302 @@
                                 $datestring=strftime("%Y-%m-%d",$thedate);
                         break;
-                        
+
                         case "English, US":
                                 $datestring=strftime("%m/%d/%Y",$thedate);
                         break;
-                        
+
                         case "English, UK":
                                 $datestring=strftime("%d/%m/%Y",$thedate);
@@ -349 +349 @@
                 if($format=="24 Hour")
                         $timestring=$sqltime;
-                else 
+                else
                         $timestring=timeToString(stringToTime($sqltime,"24 Hour"),$format);
         return $timestring;
@@ -362 +362 @@
                         if(count($tempdatearray)>1 && count($temptimearray)>1)
                                 $thedatetime=mktime((int) $temptimearray[0],(int) $temptimearray[1],(int) $temptimearray[2],(int) $tempdatearray[1],(int) $tempdatearray[2],(int) $tempdatearray[0]);
-                }               
+                }
                 return $thedatetime;
 }
@@ -371 +371 @@
         if($sqldatetime!=""){
                 $datetimearray=explode(" ",$sqldatetime);
-                
+
                 $datestring=trim($datetimearray[0]);
                 if($dateformat=="SQL")
                         $datestring=$datestring;
-                else 
+                else
                         $datestring=dateToString(stringToDate($datestring,"SQL"),$dateformat);
                 if(isset($datetimearray[1])){
@@ -381 +381 @@
                         if($timeformat=="24 Hour")
                                 $timestring=$timestring;
-                        else 
+                        else
                                 $timestring=timeToString(stringToTime($timestring,"24 Hour"),$timeformat);
                 }
@@ -400 +400 @@
         settype($datetime, 'string');
         eregi('(....)(..)(..)(..)(..)(..)',$datetime,$matches);
-        array_shift ($matches); 
+        array_shift ($matches);
         foreach (array('year','month','day','hour','minute','second') as $var) {
                 $$var = (int) array_shift($matches);
         }
-        
-        
+
+
         $thedatetime=mktime($hour,$minute,$second,$month,$day,$year);
-        
+
         return trim(dateToString($thedatetime,$dateformat)." ".timeToString($thedatetime,$timeformat));
 }
@@ -448 +448 @@
         $number=str_replace(DECIMAL_SYMBOL,".",$number);
         $number=((real) $number);
-        
+
         return $number;
 }
 
-
+// Phone/Email functions
+//=====================================================================
+function validateEmail($value){
+
+        $thereturn = false;
+        $atPos = strpos($value, "@");
+
+        //@ symobol must be after first char
+        if($atPos > 0){
+
+                $dotPos = strpos($value, ".", $atPos);
+                $length = strlen($value);
+
+                //the dot must be at least 2 chars away from at
+                //it also must not be the last char in the string
+                if( ($dotPos > ($atPos + 1)) && ($length > ($dotPos + 1)) )
+                        $thereturn = true;
+
+        }//end if
+
+        return $thereturn;
+
+}//end function --validateEmail--
+
+
+function validatePhone($number){
+
+        //need to decide on the phone reg ex based upon settings information
+        switch(PHONE_FORMAT){
+
+                case "US - Loose":
+                        $phoneRegEx = "/^(?:[\+]?(?:[\d]{1,3})?(?:\s*[\(\.-]?(\d{3})[\)\.-])?\s*(\d{3})[\.-](\d{4}))(?:(?:[ ]+(?:[xX]|(?:[eE][xX][tT][\.]?)))[ ]?[\d]{1,5})?$/";
+                break;
+
+                case "US - Strict":
+                        $phoneRegEx = "/^[2-9]\d{2}-\d{3}-\d{4}$/";
+                break;
+
+                case "UK - Loose":
+                        $phoneRegEx = "/^((\(?0\d{4}\)?\s?\d{3}\s?\d{3})|(\(?0\d{3}\)?\s?\d{3}\s?\d{4})|(\(?0\d{2}\)?\s?\d{4}\s?\d{4}))(\s?\#(\d{4}|\d{3}))?$/";
+                break;
+
+                case "International":
+                        $phoneRegEx = "/^(\(?\+?[0-9]*\)?)?[0-9_\- \(\)]*$/";
+                break;
+                case "No Verification":
+                        $phoneRegEx = "/.*/";
+                break;
+        }//end switch
+
+        return preg_match($phoneRegEx,$number);
+
+}//end function --validatePhone--
 
 //============================================================================
@@ -496 +548 @@
 
         //This function prepares an array for SQL manipulation.
-        
+
         if(get_magic_quotes_runtime() || get_magic_quotes_gpc()){
-        
-                foreach ($thearray as $key=>$value) 
+
+                foreach ($thearray as $key=>$value)
                         if(is_array($value))
                                 $thearray[$key]= addSlashesToArray($value);
                         else
                                 $thearray[$key] = mysql_real_escape_string(stripslashes($value));
-                                
-        } else  
+
+        } else
                 foreach ($thearray as $key=>$value)
                         if(is_array($value))
-                                $thearray[$key]= addSlashesToArray($value);                             
+                                $thearray[$key]= addSlashesToArray($value);
                         else
                                 $thearray[$key] = mysql_real_escape_string($value);
-        
+
         return $thearray;
-        
+
 }//end function
 
@@ -522 +574 @@
         if(!isset($sqlEncoding))
                 $sqlEncoding = "";
-                
+
         switch ($sqlEncoding){
-        
+
                 case "latin1":
                         $encoding = "ISO-8859-15";
                         break;
-                
+
                 case "utf8":
                 default:
                         $encoding = "UTF-8";
                         break;
-        
+
         }//endswitch
-        
+
         return htmlspecialchars($string, ENT_COMPAT, $encoding);
 
@@ -605 +657 @@
                         $value=$value;
                         break;
-                
-                
+
+
                 case "bbcode":
                         $value=htmlQuotes($value);
-                                                
+
                         // This list needs to be expanded
                         $bbcodelist["[b]"] = "<strong>";
@@ -615 +667 @@
                         $bbcodelist["[br]"] = "<br />";
                         $bbcodelist["[space]"] = "&nbsp;";
-                        
+
                         foreach($bbcodelist as $bbcode => $translation)
                                 $value = str_replace($bbcode, $translation, $value);
-                                                        
-                        break;
-                        
+
+                        break;
+
                 default:
                         $value=htmlQuotes($value);
@@ -639 +691 @@
 
         function nl_langinfo($constant){
-        
-                return $constant;       
-                
+
+                return $constant;
+
         }//end function
 
         function nl_setup(){
-        
+
                 $date = mktime(0,0,0,10,7,2007);
-                
+
                 for($i = 1; $i<=7; $i++){
-                
+
                         define("ABDAY_".$i, date("D", $date));
                         define("DAY_".$i, date("l"), $date);
-                        
+
                         $date = strtotime("tomorrow", $date);
                 }//end for
-                
-                
+
+
                 for($i = 1; $i<=12; $i++){
-                        
+
                         $date = mktime(0, 0, 0, $i, 1, 2007);
-                        
+
                         define("ABMON_".$i, date("M", $date));
                         define("MON_".$i, date("F"), $date);
-                
+
                 }//end for
-                                
+
         }//end function
 
         nl_setup();
-        
+
 }//end if
 ?>

trunk/phpbms/include/db.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev: 249 $ | $LastChangedBy: brieb $
@@ -41 +41 @@
                 //we may want to do more than connect via mysql;
                 var $type="mysql";
-                                
+
                 // mysql vars;
                 var $db_link;
@@ -49 +49 @@
                 var $dbpass;
                 var $pconnect=true;
-                
+
                 var $showError=false;
                 var $logError=true;
                 var $stopOnError=true;
                 var $errorFormat="xhtml";
-                
+
                 var $error = NULL;
-                                
+
                 function db($connect = true, $hostname = NULL, $schema = NULL, $user = NULL, $pass = NULL, $pconnect = NULL, $type = "mysql"){
-                        
+
                         if($type!="mysql")
                         $this->type=$type;
@@ -69 +69 @@
                                         if($hostname!=NULL)
                                                 $this->hostname = $hostname;
-                                        
+
                                         if(defined("MYSQL_DATABASE"))
                                                 $this->schema = MYSQL_DATABASE;
                                         if($schema!=NULL)
                                                 $this->schema = $schema;
-                
+
                                         if(defined("MYSQL_USER"))
                                                 $this->dbuser = MYSQL_USER;
                                         if($schema!=NULL)
                                                 $this->dbuser = $user;
-                
+
                                         if(defined("MYSQL_USERPASS"))
                                                 $this->dbpass = MYSQL_USERPASS;
                                         if($schema!=NULL)
                                                 $this->dbpass = $pass;
-                
+
                                         if(defined("MYSQL_PCONNECT"))
                                                 $this->pconnect = MYSQL_PCONNECT;
                                         if($pconnect!=NULL)
                                                 $this->pconnect = $pconnect;
-                                break;                          
+                                break;
                         }
-                                                
+
                         if($connect){
                                 if($this->connect()){
@@ -97 +97 @@
                                                 return $this->db_link;
                                         else
-                                                return false;                           
+                                                return false;
                                 } else
                                         return false;
@@ -106 +106 @@
                 function connect(){
                         // This functions connects to the database.  It uses pconnect if the variable is set;
-                                                
+
                         if($this->pconnect)
                                 $this->db_link = @ mysql_pconnect($this->hostname,$this->dbuser,$this->dbpass);
                         else
                                 $this->db_link = @ mysql_connect($this->hostname,$this->dbuser,$this->dbpass);
+
                         if(!$this->db_link){
+
                                 $error = new appError(-400,"Could not connect to database server.\n\n".$this->getError(),"",$this->showError,$this->stopOnError,false,$this->errorFormat);
                                 return false;
-                        } else                  
+
+                        } else
                                 return $this->db_link;
-                }
-
-                
+
+                }//end function connect
+
+
                 function selectSchema($schema=NULL){
                         if($schema!=NULL)
                                 $this->schema=$schema;
-                                
+
                         if(! @ mysql_select_db($this->schema,$this->db_link)){
-                                $error = new appError(-410,"Could not open schema ".$this->schema,"",$this->showError,$this->stopOnError,false,$this->errorFormat);     
+                                $error = new appError(-410,"Could not open schema ".$this->schema,"",$this->showError,$this->stopOnError,false,$this->errorFormat);
                                 return false;
                         } else
-                                return true;                                                    
+                                return true;
                 }
 
@@ -134 +138 @@
                         switch($this->type){
                                 case "mysql":
-                                        if(!isset($this->db_link)) 
-                                                if(!$this->dataB()) die($this->error);
+                                        if(!isset($this->db_link))
+                                                if(!$this->db()) die($this->error);
                                         $queryresult = @ mysql_query($sqlstatement,$this->db_link);
                                         if(!$queryresult){
@@ -141 +145 @@
                                                 $error = new appError(-420,$this->getError($this->db_link)."\n\nStatement: ".$sqlstatement,"",$this->showError,$this->stopOnError,$this->logError,$this->errorFormat);
                                                 return false;
-                                        }                                       
-                                break;
-                        }//end case
-                        
+                                        }
+                                break;
+                        }//end case
+
                         $this->error=NULL;
                         return $queryresult;
@@ -153 +157 @@
 
                         switch($this->type){
-                                case "mysql":                   
+                                case "mysql":
                                         @ mysql_query("SET NAMES ".$encoding, $this->db_link);
                                         break;
-                                        
+
                         }//endswitch
 
@@ -163 +167 @@
 
                 function getError($link = NULL){
-                        
-                        switch($this->type){
-                                case "mysql":
-                                        $thereturn = mysql_error($link);
+
+                        switch($this->type){
+                                case "mysql":
+                                        if($link)
+                                                $thereturn = @ mysql_error($link);
+                                        else
+                                                $thereturn = @ mysql_error();
                                 break;
                         }//end switch --type--
-                        
-                        return $thereturn;
-                        
+
+                        return $thereturn;
+
                 }//end method --getError--
-                
+
 
                 function numRows($queryresult){
@@ -200 +207 @@
                 }//end function
 
-                
+
                 function startTransaction(){
-                        
-                        switch($this->type){
-                                
+
+                        switch($this->type){
+
                                 case "mysql":
                                         $this->query("START TRANSACTION;");
                                 break;
-                        
+
                         }//end switch
-                        
+
                 }//end method --startTransaction--
-                
-                
+
+
                 function commitTransaction(){
-                        
-                        switch($this->type){
-                                
+
+                        switch($this->type){
+
                                 case "mysql":
                                         $this->query("COMMIT;");
                                 break;
-                        
+
                         }//end switch
-                        
+
                 }//end method --startTransaction--
-                
-                
+
+
                 function rollbackTransaction(){
-                        
-                        switch($this->type){
-                                
+
+                        switch($this->type){
+
                                 case "mysql":
                                         $this->query("ROLLBACK;");
                                 break;
-                        
+
                         }//end switch
-                        
+
                 }//end method --startTransaction--
-                
+
 
                 function seek($queryresult,$rownum){
@@ -278 +285 @@
                         return $thereturn;
                 }//end function
-                
-                
+
+
                 function tableInfo($tablename){
                         //this function returns a multi-dimensional array describing the fields in a given table
@@ -291 +298 @@
                                                         $thereturn[$name]["type"] = @ mysql_field_type($queryresult,$offset);
                                                         $thereturn[$name]["length"] = mysql_field_len($queryresult,$offset);
-                                                        $thereturn[$name]["flags"] = mysql_field_flags($queryresult,$offset);                                                   
+                                                        $thereturn[$name]["flags"] = mysql_field_flags($queryresult,$offset);
                                                 }
                                         }
@@ -305 +312 @@
                                 case "mysql":
                                         $thereturn = @ mysql_insert_id($this->db_link);
-                                break;                  
+                                break;
                         }
-                        
+
                         return $thereturn;
                 }
-                
+
                 function affectedRows(){
                         $thereturn = false;
@@ -316 +323 @@
                                 case "mysql":
                                         $thereturn = @ mysql_affected_rows($this->db_link);
-                                break;                  
+                                break;
                         }
-                        
+
                         return $thereturn;
                 }
-                
+
 }//end db class
 ?>

trunk/phpbms/include/fields.php

@@ -451 +451 @@
                                 ?><option value="0" <?php
                                 if ($this->value==0 || $this->value==""){
-                                        echo " selected=\"selected\" "?>>&lt;none&gt;</option><?php
+                                        echo " selected=\"selected\" ";
                                 }//end if --value--
+                                ?>>&lt;none&gt;</option><?php
                         }//end if --hasblank--
 

trunk/phpbms/include/imports.php

@@ -1 +1 @@
 <?php
         class phpbmsImport{
-                
+
                 var $table;
                 var $error = "";
@@ -10 +10 @@
                 var $data;
                 var $revertID = 0;
-                
+
                 // Do not manually override
                 var $transactionRecords = array();
                 var $tempFileID = 0;
                 var $pageType = "main";
-                
+
                 function phpbmsImport($table, $importType = "csv"){
-                        
+
                         $this->table = $table;
                         $this->importType = $importType;
@@ -25 +25 @@
                                 break;
                         }//end switch
-                        
+
                         $this->table->db->logError = true;
                         //So, that, when there is a db error, it will go all the way through and not just stop
                         $this->table->db->stopOnError = false;
-                        //Won't display db errors, just log them.       
+                        //Won't display db errors, just log them.
                         $this->table->db->showError = false;
                         if(isset($_POST["pageType"]))
                                 $this->pageType = $_POST["pageType"];
-                        
+
                         if(isset($_POST["tempFileID"]))
                                 $this->tempFileID = ((int)$_POST["tempFileID"]);
-                        
+
                 }//end method --imports--
-                
+
                 function _parseFromData($data){
-                        
+
                         switch($this->importType){
-                                
+
                                 case "csv":
-                                        
+
                                         if(is_readable($data)){
                                                 $contents = $this->_getFile($data);
-                                        
+
                                                 if(is_readable($contents)){
                                                         $this->docError = "invalid csv document";
                                                         return false;
                                                 }//end if
-                                                
+
                                         }//end if
-                                        
+
                                         $this->parser->parse($data);
-                                                
+
                                         if(!count($this->parser->titles) || !count($this->parser->data)){
                                                 $this->docError = "invalid csv document";
-                                                return false;   
+                                                return false;
                                         }//end if
-                                        
+
                                         return true;
                                 break;
-                        
+
                         }//end swtich
-                
+
                 }//end method --_parseFromFile--
-                
-                
+
+
                 function _getTransactionData(){
                 //needs to be changed for more complicated tables
@@ -75 +75 @@
                         foreach($this->transactionIDs as $theid)
                                 $inStatement .= $theid.",";
-                        
+
                         if($inStatement){
-                                
+
                                 $inStatement = substr($inStatement, 0, -1);
-                        
+
                                 $querystatement = "
                                         SELECT
@@ -88 +88 @@
                                                 `id` IN (".$inStatement.");
                                         ";
-                                
+
                                 $queryresult = $this->table->db->query($querystatement);
-                                
+
                                 while($therecord = $this->table->db->fetchArray($queryresult))
                                         $this->transactionRecords[] = $therecord;
-                                        
-                        }//end if 
-                        
+
+                        }//end if
+
                 }//end method --_getTransactionData--
-                
-                
+
+
                 function _getFile($fileName){
                         if(function_exists('file_get_contents')){
@@ -106 +106 @@
                                 $file = addslashes(fread(fopen($fileName, 'r'), filesize($fileName)));
                         }//end if
-                        
+
                         return $file;
                 }//end method --_getFile--
-                
+
                 //DO NOT CALL IN TRANSACTION
                 function _storeTempCSV($fileName){
-                        
+
                         $querystatement = "
                                 INSERT INTO
@@ -136 +136 @@
                                                 '".$_SESSION["userinfo"]["id"]."',
                                                 '".$_SESSION["userinfo"]["id"]."'
-                                                
+
                                         )
                                 ";
-                        
+
                         $this->table->db->query($querystatement);
-                        
+
                         $id = $this->table->db->insertId();
-                        
+
                         if($id)
                                 $this->tempFileID = ((int) $id);
                         else
                                 $this->error .= '<li> inserting temporary file failure </li>';
-                        
+
                 }//end method --_storeTempCSV--
-                
-                
+
+
                 function _getTempCSV($tempFileID){
-                        
+
                         if($tempFileID){
-                                
+
                                 $querystatement = "
                                         SELECT
@@ -164 +164 @@
                                                 id = ".((int)$tempFileID)."
                                         ";
-                                
+
                                 $queryresult = $this->table->db->query($querystatement);
-                                
+
                                 $therecord = $this->table->db->fetchArray($queryresult);
-                                
+
                                 return $therecord["file"];
-                        
+
                         }//end if
-                        
+
                         return false;
-                        
+
                 }//end method --_getTempCSV--
-                
+
                 //DO NOT CALL IN TRANSACTION
                 function _removeTempCSV($tempFileID = 0){
-                        
+
                         $querystatement = "
                                 DELETE FROM
@@ -192 +192 @@
                                         );
                                 ";
-                                
+
                         $queryresult = $this->table->db->query($querystatement);
-                        
+
                         $querystatement = "
                                 ALTER TABLE
@@ -200 +200 @@
                                 AUTO_INCREMENT = ".((int) $tempFileID).";
                                 ";
-                        
+
                         $queryresult = $this->table->db->query($querystatement);
-                        
+
                 }//end method --_removeTempCSV--
-                
+
                 //DO NOT USE THIS METHOD INSIDE AN OPEN TRANSACTION.
                 //IT WILL AUTOMATICALLY COMMIT THE TRANSACTION
                 function _revertAutoIncrement($revertID = 0){
-                        
+
                         //check to see if there is a revert id (i.e. there was a valid insert)
                         if($revertID)
                                 if(is_numeric($revertID)){
-                                        
+
                                         $querystatement = "
                                                 ALTER TABLE
@@ -218 +218 @@
                                                 AUTO_INCREMENT = ".((int) $revertID).";
                                                 ";
-                                        
+
                                         $this->table->db->query($querystatement);
-                                        
+
                                 }//end if
-                        
+
                 }//end method --_revertAutoIncrement--
-                
-                
+
+
                 function importRecords($rows, $titles){
-                        
+
                         switch($this->importType){
-                                
-                                case "csv":                     
+
+                                case "csv":
                                         //count total fieldnames (top row of csv document)
                                         $fieldNum = count($titles);
-                                        
+
                                         //the file starts at line number 1, but since line 1 is
                                         //supposed to be the fieldnames in the table(s), the lines
                                         //being insereted start @ 2.
                                         $rowNum = 2;
-                                        
+
                                         //get the data one row at a time
                                         foreach($rows as $rowData){
-                                                
-                                                $theid = 0;
-                                                
+
+                                                $theid = 0; // set for when verifification does not pass
+                                                $verify = array(); //set for when number of field rows does not match number of titles
+
                                                 //trim off leading/trailing spaces
                                                 $trimmedRowData = array();
+
                                                 foreach($rowData as $name => $data)
                                                         $trimmedRowData[$name] = trim($data);
-                                                
+
                                                 //check to see if number of fieldnames is consistent for each row
                                                 $rowFieldNum = count($trimmedRowData);
-                                                
+
                                                 //if valid, insert, if not, log error and don't insert.
-                                                if($rowFieldNum == $fieldNum)
-                                                        $theid = $this->table->insertRecord($trimmedRowData);
-                                                else
+                                                if($rowFieldNum == $fieldNum){
+                                                        $verify = $this->table->verifyVariables($trimmedRowData);
+                                                        if(!count($verify))
+                                                                $theid = $this->table->insertRecord($trimmedRowData);
+                                                }else
                                                         $this->error .= '<li> incorrect amount of fields for line number '.$rowNum.'.</li>';
-                                                
+
                                                 if($theid){
                                                         //keep track of the ids in the transaction to be able to select them
                                                         //for preview purposes
                                                         $this->transactionIDs[] = $theid;
-                                                        
+
                                                         //get first id to correct auto increment
                                                         if(!$this->revertID)
@@ -268 +272 @@
                                                 }else
                                                         $this->error .= '<li> failed insert for line number '.$rowNum.'.</li>';
-                                                
+
+                                                foreach($verify as $error)
+                                                        $this->error .= '<li class="subError">'.$error.'</li>';
+
                                                 $rowNum++;
-                                                
+
                                         }//end foreach
                                 break;
-                                
+
                         }//end switch
-                        
+
                 }//end method --importRecords--
-                
-                
+
+
                 function displayTransaction($recordsArray, $fieldsArray){
                 //needs to be changed for more complicated tables
@@ -317 +324 @@
                                 <?php
                         }//end if
-                        
+
                 }//end method --displayTransaction--
-                
-                
+
+
                 function processImportPage(){
-                        
+
                         $this->table->getTableInfo();
-                        
+
                         if(!isset($_POST["command"])){
-                                
+
                                 //happens upon first coming to page
-                                
+
                                 //remove any other temporary csv files in the `files` table
                                 //present from previous imports
                                 $this->_removeTempCSV();
-                                
+
                                 //check to see if user has the rights to be here.
                                 //If not, kick him to the no access page.
                                 if(!hasRights($this->table->importroleid))
                                         goURL(APP_PATH."noaccess.php");
-                                
+
                         }else{
                                 //form has been submitted
                                 switch($_POST["command"]){
-                                        
+
                                         //cancel button pressed.
                                         case "cancel":
@@ -354 +361 @@
                                                 }//end if
                                         break;
-                                
+
                                         case "upload":
-                                                
+
                                                 //check for valid file upload
                                                 if(!$_FILES["import"]["error"] && ($_FILES["import"]["size"] > 0)){
-                                                        
+
                                                         //check and parse the file
                                                         if($this->_parseFromData($_FILES["import"]["tmp_name"])){
-                                                                
+
                                                                 //start transaction
                                                                 $this->table->db->startTransaction();
-                                                                
+
                                                                 $this->importRecords($this->parser->data, $this->parser->titles);
-                                                                
+
                                                                 //get data for preview purposes
                                                                 $this->_getTransactionData();
                                                                 //"undo" any inserts
                                                                 $this->table->db->rollbackTransaction();
-                                                                
+
                                                                 //DO NOT CALL IN TRANSACTION
                                                                 //ALTER TABLES AUTO COMMIT AND THE FILE NEEDS TO CARRY
@@ -378 +385 @@
                                                                 $this->_revertAutoIncrement($this->revertID);
                                                                 $this->_storeTempCSV($_FILES["import"]["tmp_name"]);
-                                                                
+
                                                         }//end if
-                                                        
+
                                                 }else
                                                         $this->docError .= "failed file upload";
-                                                
+
                                                 //switch page types
                                                 $this->pageType = "confirm";
-                                                
+
                                                 if(!$this->error && !$this->docError){
                                                         $therecord["phpbmsStatus"] = "Confirm Import";
@@ -394 +401 @@
                                                 }else
                                                         $therecord["phpbmsStatus"] = "Import Error";
-                                                
+
                                         break;
-                                        
+
                                         case "import":
-                                                
+
                                                 //get the contents of the stored csv document
                                                 $CSVcontents = $this->_getTempCSV($this->tempFileID);
-                                                
+
                                                 //parser uses newline character to be able to parse the last line
                                                 if(substr($CSVcontents,-1,1) != "\n")
                                                         $CSVcontents .= "\n";
-                                                
-                                                
+
+
                                                 $this->parser->parse($CSVcontents);
-                                                
+
                                                 $this->importRecords($this->parser->data, $this->parser->titles);
-                                                
+
                                                 $this->table->db->commitTransaction();
-                                                
+
                                                 //DO NOT CALL IN TRANSACTION
-                                                
+
                                                 //get rid of temporary csv document
                                                 $this->_removeTempCSV($this->tempFileID);
-                                                
+
                                                 $therecord["phpbmsStatus"] = "Record(s) Imported";
                                                 //change page type
                                                 $this->pageType = "main";
                                         break;
-                                        
+
                                 }//end command switch
-                                        
+
                         }// end if
-                        
+
                         //display the title
                         $therecord["title"] = $this->table->displayname." Import";
                         return $therecord;
-                        
+
                 }//end method --imports--
-                
+
         }//end class --imports--
-        
-        
+
+
         //this class is to have different buttons, and no created/modified.
         if(class_exists("phpbmsForm")){
                 class importForm extends phpbmsForm{
-                        
+
                         function importForm($action = NULL, $method="post", $name="record", $onsubmit="return validateForm(this);", $dontSubmit = true){
-                                
+
                                 parent::phpbmsForm($action,$method,$name,$onsubmit,$dontSubmit);
-                                
+
                         }//end method --importForm--
-                        
-                        function startForm($pageTitle, $pageType){
-                
-                                ?><form action="<?php echo str_replace("&","&amp;",$this->action) ?>" method="<?php echo $this->method?>" name="<?php echo $this->name?>" onsubmit="<?php echo $this->onsubmit?>" <?php 
+
+                        function startForm($pageTitle, $pageType, $numberOfRecords = 0){
+
+                                ?><form action="<?php echo str_replace("&","&amp;",$this->action) ?>" method="<?php echo $this->method?>" name="<?php echo $this->name?>" onsubmit="<?php echo $this->onsubmit?>" <?php
                                         if(isset($this->enctype)) echo ' enctype="'.$this->enctype.'" ';
                                         if(isset($this->id)) echo ' id="'.$this->id.'" ';
-                                ?>><?php 
+                                ?>><?php
                                 if($this->dontSubmit){
                                         ?><div id="dontSubmit"><input type="submit" value=" " onclick="return false;" /></div><?php
                                 } ?>
-                                <div id="topButtons"><?php $this->showButtons(1, $pageType); ?></div>
-                                <h1 id="h1Title"><span><?php echo $pageTitle ?></span></h1><?php        
-                                
+                                <div id="topButtons"><?php $this->showButtons(1, $pageType, $numberOfRecords); ?></div>
+                                <h1 id="h1Title"><span><?php echo $pageTitle ?></span></h1><?php
+
                         }//end method --startForm--
-                        
-                        function showButtons($ids = 1, $pageType = "main"){
+
+                        function showButtons($ids = 1, $pageType = "main", $numberOfRecords = 0){
                                 ?>
                                 <div class="importCancels">
                                         <?php if($pageType == "main"){ ?>
-                                        <input <?php if($ids==1) {?>accesskey="i"<?php }?> title="Upload (alt+u)" id="uploadButton<?php echo $ids?>" name="command" type="submit" value="upload" class="Buttons" />
+                                        <input <?php if($ids==1) {?>accesskey="u"<?php }?> title="Upload (alt+u)" id="uploadButton<?php echo $ids?>" name="command" type="submit" value="upload" class="Buttons" />
                                         <input id="cancelButton<?php echo $ids?>" name="command" type="submit" value="cancel" class="Buttons" <?php if($ids==1) {?>accesskey="x" <?php }?> title="(access key+x)" />
                                         <?php }else{?>
-                                        <input type="submit" class="Buttons" value="import" name="command" id="import<?php echo $ids?>" title="commit"/>
+                                        <input type="submit" class="Buttons" value="import" name="command" id="import<?php echo $ids?>" title="commit" <?php echo ($numberOfRecords? '':'disabled="disabled"') ?>/>
                                         <input type="submit" class="Buttons" value="cancel" name="command" id="cancelButton<?php echo $ids?>" title="rollback"/>
                                         <?php }//end if ?>
                                 </div><?php
                         }//end method --showButtons--
-                
+
                 }//end class --importForm--
         }

trunk/phpbms/include/jstransport.php

@@ -1 +? @@
-<?php 
+<?php
         $loginNoKick=true;
         $loginNoDisplayError=true;
-        require_once("session.php");    
-        
+        require_once("session.php");
+
         //phone formating
-        ?>phoneRegExpression=<?php 
+        ?>phoneRegExpression=<?php
         switch(PHONE_FORMAT){
                 case "US - Loose":
@@ -11 +11 @@
                 break;
                 case "US - Strict":
-                        ?>/^[2-9]\d{2}-\d{3}-\d{4}$/;<?php              
+                        ?>/^[2-9]\d{2}-\d{3}-\d{4}$/;<?php
                 break;
                 case "UK - Loose":
                         ?>/^((\(?0\d{4}\)?\s?\d{3}\s?\d{3})|(\(?0\d{3}\)?\s?\d{3}\s?\d{4})|(\(?0\d{2}\)?\s?\d{4}\s?\d{4}))(\s?\#(\d{4}|\d{3}))?$/;<?php
-                break;  
+                break;
                 case "International":
                     ?>/^(\(?\+?[0-9]*\)?)?[0-9_\- \(\)]*$/;<?php
-                break;  
-        } 
-                
+                break;
+                case "No Verification":
+                        ?>/.*/;<?php
+                break;
+        }
+
         //date formating
         ?>APP_PATH="<?php echo htmlQuotes(APP_PATH)?>";<?php
@@ -26 +29 @@
         //date formating
         ?>DATE_FORMAT="<?php echo htmlQuotes(DATE_FORMAT)?>";<?php
-        
+
         //time formating
         ?>TIME_FORMAT="<?php echo htmlQuotes(TIME_FORMAT)?>";<?php
@@ -40 +43 @@
 
         ?>LOGIN_REFRESH=<?php echo LOGIN_REFRESH?>;<?php
-        
+
         if(defined("TERM1_DAYS")){
         ?>TERM1_DAYS=<?php echo TERM1_DAYS?>;<?php
         }//end if
-        
-        ?>MONTH_NAMES_LONG= [ <?php 
-                
+
+        ?>MONTH_NAMES_LONG= [ <?php
+
                 $mNames = "";
                 for($i=0; $i < 11; $i++)
                         $mNames .= ', "'.strftime("%B", mktime(0, 0, 0, $i+1, 1, 1974)).'"';
                 $mNames = substr($mNames, 2);
-                
+
                 echo $mNames;
-        
-        ?> ];<?php 
+
+        ?> ];<?php
 
         if(isset($phpbms->modules["bms"])){
-        
+
                 ?>TERM1_DAYS=<?php echo TERM1_DAYS?>;<?php
-        
+
         }//end if
-        
+
 
 ?>

trunk/phpbms/include/login_include.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        function verifyLogin($username,$password,$db){
-                $thereturn = "Login Failed";
-                
-                $querystatement = "SELECT id, firstname, lastname, email, phone, department, employeenumber, admin
-                                                FROM users 
-                                                WHERE login=\"".mysql_real_escape_string($username)."\" 
-                                                AND password=ENCODE(\"".mysql_real_escape_string($password)."\",\"".mysql_real_escape_string(ENCRYPTION_SEED)."\") 
-                                                AND revoked=0 AND portalaccess=0";
-                                                
-                $queryresult = $db->query($querystatement);
-                                
-                if($db->numRows($queryresult)){
-                        
+class login{
+
+        var $db;
+
+        function login($db){
+
+                $this->db = $db;
+
+        }//end function init
+
+
+        function verify($username, $password){
+
+                $querystatement = "
+                        SELECT
+                                id,
+                                firstname,
+                                lastname,
+                                email,
+                                phone,
+                                department,
+                                employeenumber,
+                                admin
+                        FROM
+                                users
+                        WHERE
+                                login = '".mysql_real_escape_string($username)."'
+                                AND password = ENCODE('".mysql_real_escape_string($password)."','".mysql_real_escape_string(ENCRYPTION_SEED)."')
+                                AND revoked = 0
+                                AND portalaccess = 0";
+
+                $queryresult = $this->db->query($querystatement);
+
+                if($this->db->numRows($queryresult)){
+
                         //We found a record that matches in the database
                         // populate the session and go in
-                        $_SESSION["userinfo"]=$db->fetchArray($queryresult);
-                        
+                        $_SESSION["userinfo"] = $this->db->fetchArray($queryresult);
+
                         // Next get the users roles, and populate the session with them
-                        $_SESSION["userinfo"]["roles"][]=0;
-                        $querystatement = "SELECT roleid FROM rolestousers WHERE userid=".$_SESSION["userinfo"]["id"];
-                        $rolesqueryresult = $db->query($querystatement);
-                        
-                        while($rolerecord=$db->fetchArray($rolesqueryresult))
+                        $_SESSION["userinfo"]["roles"][] = 0;
+                        $querystatement = "
+                                SELECT
+                                        roleid
+                                FROM
+                                        rolestousers
+                                WHERE userid=".$_SESSION["userinfo"]["id"];
+
+                        $rolesqueryresult = $this->db->query($querystatement);
+
+                        while($rolerecord = $this->db->fetchArray($rolesqueryresult))
                                 $_SESSION["userinfo"]["roles"][]=$rolerecord["roleid"];
-                        
-                
-                        $querystatement = "UPDATE users SET modifieddate=modifieddate, lastlogin=Now() WHERE id = ".$_SESSION["userinfo"]["id"];
-                        $updateresult = $db->query($querystatement);
 
-                        $_SESSION["tableparams"]=array();
+                        //update lastlogin
+                        $ip = $_SERVER["REMOTE_ADDR"];
+
+                        $updatestatement = "
+                                UPDATE
+                                        users
+                                SET
+                                        modifieddate = modifieddate,
+                                        lastlogin = Now(),
+                                        `lastip` = '".$ip."'
+                                WHERE
+                                        id = ".$_SESSION["userinfo"]["id"];
+
+                        $this->db->query($updatestatement);
+
+                        $_SESSION["tableparams"] = array();
 
                         goURL(DEFAULT_LOAD_PAGE);
-                } else          
-                return "Login Failed";
-        }
+
+                } else  {
+
+                        //log login attempt
+                        $log = new phpbmsLog("Login attempt failed for user '".$username."'", "SECURITY");
+
+                        return "Login Failed";
+
+                }//endif numrows
 
 
-// Start Code
-//=================================================================================================================
-        
-        $failed="";
-        if (isset($_POST["name"])) {
-                $variables=addSlashesToArray($_POST);
-                $failed=verifyLogin($variables["name"],$variables["password"],$db);
-        } else 
-                $_POST["name"]="";
-?>
+        }//end function verify
+
+}//end class

trunk/phpbms/include/session.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
+
+// Turn on/or off debugging
 @ define("APP_DEBUG",true);
 if(APP_DEBUG)
         error_reporting(E_ALL);
 
+
+// Error Class - This class reports errors.  It can also log these errors
+// to the phpBMS log table in some cases.
 class appError{
+
         var $number=0;
         var $title="";
@@ -48 +54 @@
         var $logerror=true;
         var $format="xhtml";
-        
+
+        //init
         function appError($number=0,$details="",$title="",$display=false,$stop=true,$logerror=true,$format="xhtml"){
+
                 $this->title = $title;
-                
-                
                 $this->details = $details;
-                
                 $this->stop = $stop;
-                                
+
                 $this->logerror = $logerror;
                 $this->format = $format;
                 $this->number = $number;
-                                
+
+                // find a predetermined title;
                 if($this->number<0){
+
                         switch($number){
+                                case -300:
+                                        $this->title = "settings.php file not readable";
+                                        $this->details =
+                                        'If this is the initial installation of the program,
+                                        you may wan to run the installer.  Use your web browser to navigate to:<br /><br />
+
+                                        <a href="'.APP_PATH.'install">phpBMS Installation</a><br /><br />
+
+                                        If your application already has a settings.php file in the main phpbms directory, you may need to give your web server rights to read the file.';
+                                        break;
                                 case -400:
                                 case -410:
@@ -71 +88 @@
                                 case -460:
                                         $this->title="Database Error";
-                                break;
-                        }
-                } 
-                
+                                        break;
+                        }//end case;
+
+                }//endif this->number
+
                 if($display || APP_DEBUG) $this->display($format);
                 if($logerror) $this->logError();
                 if($this->stop) exit;
-        }
-        
-        function display($format=NULL){
-
-                if($format==NULL)
-                        $format=$this->format;
-        
+
+        }//eend function init
+
+
+        //This function outputs the error to screen either in
+        // XHTML, plain text, or JSON format
+        function display($format = NULL){
+
+                if($format == NULL)
+                        $format = $this->format;
+
                 switch(strtolower($format)){
+
                         case "json":
 
-                                echo "{\n";
-                                echo "\"error\" : { \"id\" : ".$this->number;
-                                if($this->title)
-                                        echo ", \"title\" : \"".addslashes($this->title)."\"";
-                                if($this->details)
-                                        echo ", \"details\" : \"".addslashes($this->details)."\"";
-                                echo "\n}";
-
-                        break;
-                        
+                                $return["id"] = $this->number;
+                                $return["title"] = $this->title;
+                                $return["details"] = $this->details;
+
+                                echo json_encode($return);
+
+                                break;
+
                         case "xhtml":
 
-                                $this->details = str_replace("\n","<br />", htmlspecialchars($this->details,ENT_COMPAT,"UTF-8"));
+                                // Unsure if this line is needed, as it limits what we can do with detail print out
+                                //$this->details = str_replace("\n","<br />", htmlspecialchars($this->details,ENT_COMPAT,"UTF-8"));
 
                                 if(defined("APP_PATH")){
+
                                         if(!defined("STYLESHEET"))
                                                 define("STYLESHEET","mozilla");
-                                ?><link href="<?php echo APP_PATH ?>common/stylesheet/<?php echo STYLESHEET ?>/base.css" rel="stylesheet" type="text/css" /><?php
+
+                                        ?><link href="<?php echo APP_PATH ?>common/stylesheet/<?php echo STYLESHEET ?>/base.css" rel="stylesheet" type="text/css" /><?php
+
                                 } else {
-                                        //if the app_path is not defined, we can try including the mozilla stylesheet, relative to 
+
+                                        //if the app_path is not defined, we can try including the mozilla stylesheet, relative to
                                         // the assumed phpbms root
-                                ?><link href="common/stylesheet/mozilla/base.css" rel="stylesheet" type="text/css" /><?php 
+                                        ?><link href="common/stylesheet/mozilla/base.css" rel="stylesheet" type="text/css" /><?php
+
                                 }//end if
+
                                 ?><div class="bodyline">
                                         <h1><span>phpBMS Error: <?php echo $this->number; if($this->title) echo " ".$this->title?></span></h1>
@@ -118 +146 @@
                                         </div>
                                         <?php  } //end if?>
-                                </div><?php 
-
-                        break;
-                        
+                                </div><?php
+
+                                break;
+
                         default:
-                        
+
                                 echo "phpBMS Error: ".$this->number;
                                 if($this->title) echo ": ".$this->title;
                                 if($this->details) echo  " - ".$this->details;
-                                
-                        break;
+
+                                break;
                 }//end switch
         }// end dispaly function
-        
+
+
+        // this function logs the error in the phpBMS log table
         function logError(){
+
                 $message = $_SERVER["REQUEST_URI"]."\n";
                 $message .= $this->number;
+
                 if($this->title)
                         $message.=": ".$this->title;
+
                 if($this->details)
                         $message.="\n\n".$this->details;
-                                                
+
                 $log = new phpbmsLog($message,"ERROR");
+
         }//end logError
-        
+
 }//end appError class
 
+
+// This is the class for logging items tot the phpBMS
+// log table;
 class phpbmsLog{
-        
-        var $db=NULL;
-        var $type="ERROR";
-        var $value="";
-        var $userid=2;
-        
+
+        var $db = NULL;
+        var $type = "ERROR";
+        var $value = "";
+        var $userid = 2;
+
         function phpbmsLog($value=NULL,$type=NULL,$userid=NULL,$db=NULL,$sendLog=true){
 
@@ -158 +195 @@
                 if($db){
                         if(is_object($db)){
-                                $this->db=$db;
-        
+
+                                $this->db = $db;
+
                                 $this->db->showError=false;
                                 $this->db->logError=false;
                                 $this->db->stopOnError=false;
-                        }
-                }
-                else{
+
+                        }//endif object
+
+                } else {
+
                         if(class_exists("db")){
+
                                 $this->db= new db(false);
-        
+
                                 $this->db->showError=false;
                                 $this->db->logError=false;
                                 $this->db->stopOnError=false;
-        
+
                                 $this->db->connect();
                                 $this->db->selectSchema();
-                        } else 
+
+                        } else
                                 return false;
-                }
-                
+
+                }//endif db
+
                 if($value)
-                        $this->value=$value;
+                        $this->value = $value;
+
                 if($type)
-                        $this->type=$type;
+                        $this->type = $type;
+
                 if($userid)
-                        $this->userid=((int) $userid);
-                
+                        $this->userid = ((int) $userid);
+
                 if($sendLog)
                         return $this->sendLog();
                 else
                         return true;
-                
-        }//end function
-        
+
+        }//end function init
+
+
+        // inserts record into log table
         function sendLog(){
-                        
-                $ip=$_SERVER["REMOTE_ADDR"];
-        
-                $querystatement="INSERT INTO `log` (`type`,`value`,`userid`,`ip`) VALUES (";
-                $querystatement.="\"".mysql_real_escape_string($this->type)."\", ";
-                $querystatement.="\"".mysql_real_escape_string($this->value)."\", ";
-                $querystatement.=$this->userid.", ";
-                $querystatement.="\"".$ip."\")";
-                
-                $this->db->query($querystatement);
-                
-        }
-}//end phpbmslog
-
-
-
+
+                $ip = $_SERVER["REMOTE_ADDR"];
+
+                $insertstatement = "
+                        INSERT INTO
+                                `log`
+                        (`type`, `value`, `userid`, `ip`) VALUES (
+                                '".mysql_real_escape_string($this->type)."',
+                                '".mysql_real_escape_string($this->value)."',
+                                ".$this->userid.",
+                                '".$ip."'
+                        )";
+
+                $this->db->query($insertstatement);
+
+        }//end function sendLog
+
+}//end class phpbmslog
+
+
+// This class handles the loading of the database, session and application
+// variables, as well as verifying API level logins
 class phpbmsSession{
 
-        var $db=null;
+        var $db = null;
 
         function loadDBSettings($reportError = true){
+
                 // This functions looks for the settings.php file, and loads
                 // the database variables as constants.  As an added benefit
                 // it adds the phpBMS root as an included path.
-                
-                $path="";
-                $count=1;
+
 
                 //need to look for settings file... only go up a total of 10 directories
-                $currdirectory= getcwd();
-                
-                while(!file_exists("settings.php") and ($count<10)){
+                $currdirectory = getcwd();
+
+                //Prep the setting of the application path;
+                $currentURL = explode("/",$_SERVER["PHP_SELF"]);
+                array_pop($currentURL);
+
+                $count = 0;
+                $path = "";
+
+                //We need to find the applications root
+                while(!file_exists("phpbmsversion.php") && $count < 9){
+
                         $path.="../";
                         @ chdir("../");
                         $count++;
-                }
-                
+
+                }//end while
+
+                //Now set the Web location (APP_PATH)
+                $appPath = "/";
+                for($i = 0; $i < count($currentURL) - $count; $i++)
+                        if($currentURL[$i])
+                                $appPath .= $currentURL[$i]."/";
+
+                define("APP_PATH", $appPath);
+
                 $settingsfile =  @ fopen("settings.php","r");
+
                 if($settingsfile){
-                        //loop through the settings file and load variables into the session 
+
+                        //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);
+
+                                $line = NULL;
+                                $key = NULL;
+                                $value = NULL;
+                                $line = @ fscanf($settingsfile,"%[^=]=%[^[]]",$key,$value);
+
                                 if ($line){
+
                                         $key=trim($key);
                                         $value=trim($value);
-                                        if($key!="" and !strpos($key,"]")){     
+
+                                        if($key!="" and !strpos($key,"]")){
+
                                                 $startpos=strpos($value,"\"");
                                                 $endpos=strrpos($value,"\"");
+
                                                 if($endpos!=false)
                                                         $value=substr($value,$startpos+1,$endpos-$startpos-1);
-                                                if(strpos($key,"mysql_")===0){
+
+                                                if(strpos($key,"mysql_")===0)
                                                         define(strtoupper($key),$value);
-                                                }
-                                        }
-                                }
-                        }
-                        
+
+                                        }//endif key
+
+                                }//endif line
+
+                        }//endwhile
+
                         @ fclose($settingsfile);
 
@@ -261 +342 @@
 
                         //this adds the phpbms root to the include path
-                        if ( ! defined( "PATH_SEPARATOR" ) ) {
-                          
-                          //if we cannot determin the OS, we will assume its unix
-                          if(!isset($_ENV["OS"]))
-                                  $_ENV["OS"] = "unix";
-                          
-                          if ( strpos( $_ENV["OS"], "Win" ) !== false )
-                                define( "PATH_SEPARATOR", ";" );
-                          else 
-                                define( "PATH_SEPARATOR", ":" );
-                          
+                        if ( !defined( "PATH_SEPARATOR" ) ) {
+
+                                //if we cannot determin the OS, we will assume its unix
+                                if(!isset($_ENV["OS"]))
+                                        $_ENV["OS"] = "unix";
+
+                                if ( strpos( $_ENV["OS"], "Win" ) !== false )
+                                        define( "PATH_SEPARATOR", ";" );
+                                else
+                                        define( "PATH_SEPARATOR", ":" );
+
                         }//end if
 
-                        $pathToAdd=@ getcwd();
-                        ini_set("include_path",ini_get("include_path").PATH_SEPARATOR.$pathToAdd);
-                        
-                        //Now to set the path
-                        $pathrev = strrev($_SERVER["PHP_SELF"]);
-                        $choppos=0;
-
-                        for($x=0;$x<$count;$x++)
-                                $choppos = strpos($pathrev,"/",$choppos+1);
-                        define("APP_PATH",strrev(substr($pathrev,$choppos)));
-                        
+                        $pathToAdd = @ getcwd();
+
+                        //Now we include the root application path to php's include path
+                        if(ini_set("include_path", ini_get("include_path").PATH_SEPARATOR.$pathToAdd) === false && $reportError)
+                                $error = new appError(-310, "Your implementation of PHP does not allow changing of the include path. You may need to modify your PHP settings to allow phpBMS to modify this php ini setting. If you are using a web hosting company, you may need to contact them to allow this.", "Cannot add to include path", true, true, false);
+
+
+                        //return directory to current directory
                         @ chdir ($currdirectory);
+
                         return $path;
+
                 } else {
+
                         if($reportError)
-                                $error= new appError(-300,"You may need to run the install process, or set the permission on your settings file correctly.","Settings File Could Not Be Read",true,true,false);
+                                $error = new appError(-300,"","",true,true,false);
+
                         return false;
-                }
+
+                }//endif settingsfile
+
         }//end function
-        
+
+
         function loadSettings($encoding = "utf8"){
-                // We are going to make sure that we are using utf8 
+
+                // We are going to make sure that we are using utf8
                 // but it works only in mySQL 5, so we supress errors
                 // when trying it.
                 if($this->db==NULL)
                         $error=new appError(-310,"","Database not loaded");
-                
+
                 $this->db->logError = false;
                 $this->db->stopOnError = false;
-        
+
                 $this->db->setEncoding($encoding);
-        
+
                 $this->db->logError = true;
-        
+
                 $querystatement = "SELECT name,value FROM settings";
 
@@ -313 +399 @@
 
                 if(!$queryresult){
+
                         $error= new appError(-310,"If you have not ran the update script for phpBMS, please run it before logging in.","Could Not Retrieve Settings From Database");
                         return false;
+
                 } else {
+
                         while($therecord=$this->db->fetchArray($queryresult)){
-                        
+
                                 //old versions used a reserved constant in certain php versions
                                 if($therecord["name"] == "currency_symbol")
                                         $therecord["name"] = "currency_sym";
-                                        
+
                                 if(!defined(strtoupper($therecord["name"])))
                                         define(strtoupper($therecord["name"]),$therecord["value"]);
@@ -330 +419 @@
                         if(!isset($_SERVER['REQUEST_URI'])) {
                                 $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
-                                
+
                                 if(!defined("HOUR_FORMAT"))
                                         define("HOUR_FORMAT","%I");
-                        
+
                                 // Append the query string if it exists and isn't null
                                 if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']))
@@ -342 +431 @@
 
                         return true;
-                }
-        }
-
-
+
+                }//endif queryresult
+
+        }//end function
+
+
+        // This is in a function in case we want to do sessions differently in the future
         function startSession(){
-                // This is in a function in case we want to do sessions differently in the future               
-                
+
                 session_name("phpBMS".preg_replace('/\W/',"",APPLICATION_NAME)."v096ID");
                 session_start();
-        }
-
-
-        function verifyAPIlogin($user,$pass){
-                $thereturn=false;
+
+        }//end function startSesion
+
+
+        function verifyAPIlogin($user, $pass){
+
+                $thereturn = false;
                 $this->db->stopOnError = false;
-                
-                $querystatement = "SELECT id, firstname, lastname, email, phone, department, employeenumber, admin
-                                                FROM users 
-                                                WHERE login!=\"Scheduler\" AND login=\"".mysql_real_escape_string($user)."\" 
-                                                AND password=ENCODE(\"".mysql_real_escape_string($pass)."\",\"".mysql_real_escape_string(ENCRYPTION_SEED)."\") 
-                                                AND revoked=0 AND portalaccess=1";
+
+                $querystatement = "
+                        SELECT
+                                id,
+                                firstname,
+                                lastname,
+                                email,
+                                phone,
+                                department,
+                                employeenumber,
+                                admin
+                        FROM
+                                users
+                        WHERE
+                                login != 'Scheduler'
+                                AND login = '".mysql_real_escape_string($user)."'
+                                AND password = ENCODE('".mysql_real_escape_string($pass)."', '".mysql_real_escape_string(ENCRYPTION_SEED)."')
+                                AND revoked = 0
+                                AND portalaccess = 1";
+
                 $queryresult = $this->db->query($querystatement);
+
                 if(!$queryresult) {
+
                         $error = new appError(-720,"","Error retrieving user record",true,true,true,"json");
                         return false;
-                }
-                
+
+                }//endif
+
                 if($this->db->numRows($queryresult)){
+
                         //We found a record that matches in the database
                         // populate the session and go in
-                        $_SESSION["userinfo"]=$this->db->fetchArray($queryresult);
-                
-                        $querystatement="UPDATE users SET modifieddate=modifieddate, lastlogin=Now() WHERE id = ".$_SESSION["userinfo"]["id"];
-                        $queryresult=@ $this->db->query($querystatement);
-                        if(!$queryresult) {
+                        $_SESSION["userinfo"] = $this->db->fetchArray($queryresult);
+
+                        $querystatement = "
+                                UPDATE
+                                        users
+                                SET
+                                        modifieddate=modifieddate,
+                                        lastlogin=Now()
+                                WHERE
+                                        id = ".$_SESSION["userinfo"]["id"];
+
+                        $queryresult = @ $this->db->query($querystatement);
+
+                        if(!$queryresult)
                                 $error = new appError(-730,"","Error Updating User Login Time",true,true,true,"json");
-                        } else
-                                $thereturn=true;
-                }
-                return $thereturn;      
-        }
-        
-}//end loginSession class
-
-
-// Start Code
-//=================================================================================================================
-//php <4.3.0 compatibility
-if(!function_exists("mysql_real_escape_string")){
-        function mysql_real_escape_string($string){
-                return mysql_escape_string($string);
-        }
-        
-   function utf8_replaceEntity($result){
-           $value = (int)$result[1];
-           $string = '';
-          
-           $len = round(pow($value,1/8));
-          
-           for($i=$len;$i>0;$i--){
-                   $part = ($value & (255>>2)) | pow(2,7);
-                   if ( $i == 1 ) $part |= 255<<(8-$len);
-                  
-                   $string = chr($part) . $string;
-                  
-                   $value >>= 6;
-           }
-          
-           return $string;
-   }
-  
-        if(!function_exists("mysql_real_escape_string")){
-                function html_entity_decode($string){
-                        return preg_replace_callback('/&#([0-9]+);/u','utf8_replaceEntity',$string);
-                }//end function
-        }//end if
-
-}// end PHP<4.3 compatibility
+                        else
+                                $thereturn = true;
+
+                }//endif numrows
+
+                return $thereturn;
+
+        }//end function verifyAPIlogin
+
+
+        //Check to see if install folders are present.  If so, do not continue.
+        function checkForInstallDirs($errorFormat = "xhtml"){
+
+                //first lets check for the main programs install folder
+                if(file_exists("install") && is_dir("install"))
+                        $error = new appError(-353,"You must remove the install directory and all modules' install directories before phpBMS can run.","Main Install Directory Present",true,true,true,$errorFormat);
+
+                $thedir= @ opendir("modules");
+
+                while($entry = readdir($thedir)){
+
+                        if($entry != "." && $entry != ".." && $entry != "base" && $entry != "sample" && is_dir("modules/".$entry)){
+
+                                if(file_exists("modules/".$entry."/install") && is_dir("modules/".$entry."/install")){
+
+                                        $error = new appError(-354,"You must remove the install directory and all modules' install directories before phpBMS can run.","Module '".$entry."' Install Directory Present",true,true,true,$errorFormat);
+
+                                }//endif
+
+                        }//endif
+
+                }//end if
+
+        }//end function checkForInstallDirs
+
+}//end phpbmsSession class
+
 
 
 // Start Login verification Code
-//=================================================================================================================
+//==============================================================================
 if(!isset($sqlEncoding))
         $sqlEncoding = "utf8";
 
 if(!defined("noStartup")){
+
         $scriptname = basename($_SERVER["PHP_SELF"]);
         $phpbmsSession = new phpbmsSession;
-        
+
         //Testing for API login
         if(strpos($scriptname,"api_")!==false){
                 if(isset($_POST["phpbmsusername"]) && isset($_POST["phpbmspassword"])){
+
                         $phpbmsSession->loadDBSettings(APP_DEBUG);
-                        
+
+                        if(!APP_DEBUG)
+                                $phpbmsSession->checkForInstallDirs("json");
+
                         include_once("include/db.php");
                         $db = new db();
                         $phpbmsSession->db = $db;
 
-                        include_once("common_functions.php");                   
+                        include_once("common_functions.php");
                         $phpbmsSession->loadSettings($sqlEncoding);
                         $phpbms = new phpbms($db);
-        
-        
+
+
                         if(!$phpbmsSession->verifyAPILogin($_POST["phpbmsusername"],$_POST["phpbmspassword"]))
                                 $error = new appError(-700,"","Login credentials incorrect",true,true,true,"json");
+
                 } else
                         $error= new appError(-710,"","No login credentials passed",true,true,true,"json");
+
         } else {
-        
+
                 $phpbmsSession->loadDBSettings(APP_DEBUG);
-        
-        
+
+                if(!APP_DEBUG)
+                        $phpbmsSession->checkForInstallDirs();
+
+                //start database
                 include_once("include/db.php");
                 $db = new db();
-                
+
                 $phpbmsSession->db = $db;
-                
+
+                //load application settings from table
                 $phpbmsSession->loadSettings($sqlEncoding);
-                
+
                 include_once("common_functions.php");
                 $phpbms = new phpbms($db);
-                
+
                 if(!isset($noSession))
                         $phpbmsSession->startSession();
-                
+
                 if (!isset($_SESSION["userinfo"]) && $scriptname != "index.php") {
-                
+
                         if(isset($loginNoKick)){
+
                                 if(!isset($loginNoDisplayError))
                                         exit();
+
                         } else{
+
                                 goURL(APP_PATH."index.php");
-                        }
-                }
-                
-        }
-        
-        $db->stopOnError=true;
+
+                        }//endif
+
+                }//endif iseet userinfo
+
+        }//endif
+
+        $db->stopOnError = true;
+
 }//end if
 

trunk/phpbms/include/tables.php

@@ -39 +39 @@
 
 
-class phpbmsTable{
-        
-        var $db = NULL;
-        var $backurl = NULL;
-        
-        // The table definition record id.
-        var $id=0;
-        
-        var $fields = array();
-
-        function phpbmsTable($db,$tabledefid = 0,$backurl = NULL){
-        
-                if(is_object($db))
-                        if(get_class($db)=="db")
-                                $this->db = $db;
-                if($this->db === NULL)
-                        $error = new appError(-800,"database object is required for parameter 1.","Initializing phpbmsTable Class");
-
-                $this->id = ((int) $tabledefid);
-                
-                if($backurl == NULL)
-                        $this->backurl = APP_PATH."search.php?id=".$this->id;
-                else 
-                        $this->backurl = $backurl;
-                        
-                if(!$this->getTableInfo())
-                        $error = new appError(-810,"Table definition not found for id ".$this->id,"Initializing phpbmsTable Class");
-        }
-        
-        
-        function getTableInfo(){
-                $querystatement = "SELECT * FROM tabledefs WHERE id=".$this->id;
-                
-                $queryresult = $this->db->query($querystatement);
-                
-                if($this->db->numRows($queryresult)){
-                        foreach($this->db->fetchArray($queryresult) as $key => $value)
-                                $this->$key = $value;
-                        
-                        $this->fields = $this->db->tableInfo($this->maintable);
-                        
-                        return true;                                            
-                } else
-                        return false;
-        }
-        
-        function getDefaultByType($fieldtype){
-                        $default = NULL;
-                        
-                        switch ($fieldtype){
-                                case "blob":
-                                case "string":
-                                        $default = "";
-                                break;
-                                case "real":
-                                case "int":
-                                        $default = 0;
-                                break;
-                                case "date":
-                                        $default=dateToString(mktime(),"SQL");
-                                break;
-                                case "time":
-                                        $default=timeToString(mktime(),"SQL");
-                                break;
-                                case "year":
-                                        $default=strftime("%Y");
-                                break;
-                                case "datetime":
-                                case "timestamp":
-                                        $default = dateToString(mktime(),"SQL")." ".timeToString(mktime(),"24 Hour");
-                                break;
-                        }
-                        
-                        return $default;
-                        
-        }
-        
-        function prepareFieldForSQL($value,$type,$flags){
-                        switch ($type){
-                                
-                                case "blob":
-                                case "string":
-                                        if($value === "" or $value === NULL){
-                                                if(strpos($flags,"not_null") === false)
-                                                        $value = NULL;
-                                                else
-                                                        $value = "''";
-                                        } else                                  
-                                                $value = "'".$value."'";
-                                break;
-                                
-                                case "real":
-                                        if($value === "" or $value === NULL){
-                                                if(strpos($flags,"not_null") === false)
-                                                        $value = NULL;
-                                                else
-                                                        $value = 0;
-                                        } else                                  
-                                                $value = (real) $value;
-                                break;
-                                
-                                case "int":
-                                        if($value === "" or $value === NULL){
-                                                if(strpos($flags,"not_null") === false)
-                                                        $value = NULL;
-                                                else
-                                                        $value = 0;
-                                        } else
-                                                $value = (int) $value;
-                                break;
-                                
-                                case "date":
-                                        if($value === "" or $value === NULL){
-                                                if(strpos($flags,"not_null") === false)
-                                                        $value = NULL;
-                                                else
-                                                        $value = "'".dateToString(mktime(),"SQL")."'";
-                                        } else
-                                                $value = "'".sqlDateFromString($value)."'";
-                                break;
-
-                                case "time":
-                                        if($value === "" or $value === NULL){
-                                                if(strpos($flags,"not_null") === false)
-                                                        $value = NULL;
-                                                else
-                                                        $value = "'".timeToString(mktime(),"SQL")."'";
-                                        } else
-                                                $value = "'".sqlTimeFromString($value)."'";
-                                break;
-                                
-                                case "year":
-                                        if($value === "" or $value === NULL)
-                                                if(strpos($flags,"not_null") === false)
-                                                        $value = NULL;
-                                                else
-                                                        $value = strftime("%Y");
-                                break;
-                                
-                                case "datetime":
-                                case "timestamp":
-                                        if($value === "" or $value === NULL){
-                                                if(strpos($flags,"not_null") === false)
-                                                        $value = NULL;
-                                                else
-                                                        $value = "'".dateToString(mktime(),"SQL")." ".timeToString(mktime(),"24 Hour")."'";
-                                        } else{
-                                                $datetimearray = explode(" ",$value);
-                                                if(count($datetimearray) > 1){
-                                                        $value = "'".sqlDateFromString($datetimearray[0])." ".sqlTimeFromString($datetimearray[1])."'";
-                                                } else 
-                                                $value = "'".$value."'";
-                                        }
-                                break;
-                                case "password":
-                                        $value = "ENCODE('".$value."','".ENCRYPTION_SEED."')";
-                                break;          
-                        }//end case
-
-
-                        if($value === NULL)
-                                $value = "NULL";
-                        return $value;
-        }//end method
-        
-        
-        function getDefaults(){
-                $therecord = array();
-                
-                foreach($this->fields as $fieldname => $thefield){
-                        switch($fieldname){
-                                case "id":
-                                case "modifiedby":                      
-                                case "modifieddate":
-                                        $therecord[$fieldname] = NULL;
-                                break;
-                                
-                                case "createdby":
-                                        $therecord["createdby"] = $_SESSION["userinfo"]["id"];
-                                break;
-                                                                
-                                default:
-                                        if(strpos($thefield["flags"],"not_null") === false)
-                                                $therecord[$fieldname] = NULL;
-                                        else {
-                                                $therecord[$fieldname] = $this->getDefaultByType($thefield["type"]);
-                                        }
-                                break;
-                        }//end switch
-                }//end foreach
-                
-                return $therecord;
-        }
-        
-        
-        function getRecord($id = 0){
-                $id = (int) $id;
-                
-                $querystatement = "SELECT ";
-                                
-                foreach($this->fields as $fieldname => $thefield){
-                        if(isset($thefield["select"]))
-                                $querystatement .= "(".$thefield["select"].") AS `".$fieldname."`, ";
+        class phpbmsTable{
+
+                var $db = NULL;
+                var $backurl = NULL;
+                var $verifyErrors = array();
+
+                // The table definition record id.
+                var $id=0;
+
+                var $fields = array();
+
+                function phpbmsTable($db,$tabledefid = 0,$backurl = NULL){
+
+                        if(is_object($db))
+                                if(get_class($db)=="db")
+                                        $this->db = $db;
+                        if($this->db === NULL)
+                                $error = new appError(-800,"database object is required for parameter 1.","Initializing phpbmsTable Class");
+
+                        $this->id = ((int) $tabledefid);
+
+                        if($backurl == NULL)
+                                $this->backurl = APP_PATH."search.php?id=".$this->id;
                         else
-                                $querystatement .= "`".$fieldname."`, ";
-                }//end foreach
-                $querystatement = substr($querystatement, 0, strlen($querystatement)-2);
-                
-                $querystatement .= " FROM `".$this->maintable."` WHERE `".$this->maintable."`.`id` = ".$id;
-                                
-                $queryresult = $this->db->query($querystatement);
-                
-                if($this->db->numRows($queryresult))
-                        $therecord = $this->db->fetchArray($queryresult);
-                else 
-                        $therecord = $this-> getDefaults();
-                
-                return $therecord;
-        }//end getRecord function
-        
-        
-        function updateRecord($variables, $modifiedby = NULL){
-                $variables = addSlashesToArray($variables);
-                
-                if($modifiedby === NULL)
-                        if(isset($_SESSION["userinfo"]["id"]))
-                                $modifiedby = $_SESSION["userinfo"]["id"];
-                        else
-                                $error = new appError(-840,"Session Timed Out.","Creating New Record");
-
-                if(!isset($variables["id"]))
-                        $error = new appError(-820,"id not set","Updating Record");
-                
-                $updatestatement = "UPDATE `".$this->maintable."` SET ";
-                
-                foreach($this->fields as $fieldname => $thefield){
-                        if(!isset($thefield["select"])){
+                                $this->backurl = $backurl;
+
+                        if(!$this->getTableInfo())
+                                $error = new appError(-810,"Table definition not found for id ".$this->id,"Initializing phpbmsTable Class");
+                }
+
+
+                function getTableInfo(){
+                        $querystatement = "SELECT * FROM tabledefs WHERE id=".$this->id;
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                foreach($this->db->fetchArray($queryresult) as $key => $value)
+                                        $this->$key = $value;
+
+                                $this->fields = $this->db->tableInfo($this->maintable);
+
+                                return true;
+                        } else
+                                return false;
+                }
+
+                function getDefaultByType($fieldtype){
+                                $default = NULL;
+
+                                switch ($fieldtype){
+                                        case "blob":
+                                        case "string":
+                                                $default = "";
+                                        break;
+                                        case "real":
+                                        case "int":
+                                                $default = 0;
+                                        break;
+                                        case "date":
+                                                $default=dateToString(mktime(),"SQL");
+                                        break;
+                                        case "time":
+                                                $default=timeToString(mktime(),"SQL");
+                                        break;
+                                        case "year":
+                                                $default=strftime("%Y");
+                                        break;
+                                        case "datetime":
+                                        case "timestamp":
+                                                $default = dateToString(mktime(),"SQL")." ".timeToString(mktime(),"24 Hour");
+                                        break;
+                                }
+
+                                return $default;
+
+                }
+
+                function prepareFieldForSQL($value,$type,$flags){
+                                switch ($type){
+
+                                        case "blob":
+                                        case "string":
+                                                if($value === "" or $value === NULL){
+                                                        if(strpos($flags,"not_null") === false)
+                                                                $value = NULL;
+                                                        else
+                                                                $value = "''";
+                                                } else
+                                                        $value = "'".$value."'";
+                                        break;
+
+                                        case "real":
+                                                if($value === "" or $value === NULL){
+                                                        if(strpos($flags,"not_null") === false)
+                                                                $value = NULL;
+                                                        else
+                                                                $value = 0;
+                                                } else
+                                                        $value = (real) $value;
+                                        break;
+
+                                        case "int":
+                                                if($value === "" or $value === NULL){
+                                                        if(strpos($flags,"not_null") === false)
+                                                                $value = NULL;
+                                                        else
+                                                                $value = 0;
+                                                } else
+                                                        $value = (int) $value;
+                                        break;
+
+                                        case "date":
+                                                if($value === "" or $value === NULL){
+                                                        if(strpos($flags,"not_null") === false)
+                                                                $value = NULL;
+                                                        else
+                                                                $value = "'".dateToString(mktime(),"SQL")."'";
+                                                } else
+                                                        $value = "'".sqlDateFromString($value)."'";
+                                        break;
+
+                                        case "time":
+                                                if($value === "" or $value === NULL){
+                                                        if(strpos($flags,"not_null") === false)
+                                                                $value = NULL;
+                                                        else
+                                                                $value = "'".timeToString(mktime(),"SQL")."'";
+                                                } else
+                                                        $value = "'".sqlTimeFromString($value)."'";
+                                        break;
+
+                                        case "year":
+                                                if($value === "" or $value === NULL)
+                                                        if(strpos($flags,"not_null") === false)
+                                                                $value = NULL;
+                                                        else
+                                                                $value = strftime("%Y");
+                                        break;
+
+                                        case "datetime":
+                                        case "timestamp":
+                                                if($value === "" or $value === NULL){
+                                                        if(strpos($flags,"not_null") === false)
+                                                                $value = NULL;
+                                                        else
+                                                                $value = "'".dateToString(mktime(),"SQL")." ".timeToString(mktime(),"24 Hour")."'";
+                                                } else{
+                                                        $datetimearray = explode(" ",$value);
+                                                        if(count($datetimearray) > 1){
+                                                                $value = "'".sqlDateFromString($datetimearray[0])." ".sqlTimeFromString($datetimearray[1])."'";
+                                                        } else
+                                                        $value = "'".$value."'";
+                                                }
+                                        break;
+                                        case "password":
+                                                $value = "ENCODE('".$value."','".ENCRYPTION_SEED."')";
+                                        break;
+                                }//end case
+
+
+                                if($value === NULL)
+                                        $value = "NULL";
+                                return $value;
+                }//end method
+
+
+                function getDefaults(){
+                        $therecord = array();
+
+                        foreach($this->fields as $fieldname => $thefield){
                                 switch($fieldname){
                                         case "id":
-                                        case "creationdate":
+                                        case "modifiedby":
+                                        case "modifieddate":
+                                                $therecord[$fieldname] = NULL;
+                                        break;
+
                                         case "createdby":
-                                        break;
+                                                $therecord["createdby"] = $_SESSION["userinfo"]["id"];
+                                        break;
+
+                                        default:
+                                                if(strpos($thefield["flags"],"not_null") === false)
+                                                        $therecord[$fieldname] = NULL;
+                                                else {
+                                                        $therecord[$fieldname] = $this->getDefaultByType($thefield["type"]);
+                                                }
+                                        break;
+                                }//end switch
+                        }//end foreach
+
+                        return $therecord;
+                }
+
+
+                function getRecord($id = 0){
+                        $id = (int) $id;
+
+                        $querystatement = "SELECT ";
+
+                        foreach($this->fields as $fieldname => $thefield){
+                                if(isset($thefield["select"]))
+                                        $querystatement .= "(".$thefield["select"].") AS `".$fieldname."`, ";
+                                else
+                                        $querystatement .= "`".$fieldname."`, ";
+                        }//end foreach
+                        $querystatement = substr($querystatement, 0, strlen($querystatement)-2);
+
+                        $querystatement .= " FROM `".$this->maintable."` WHERE `".$this->maintable."`.`id` = ".$id;
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult))
+                                $therecord = $this->db->fetchArray($queryresult);
+                        else
+                                $therecord = $this-> getDefaults();
+
+                        return $therecord;
+                }//end getRecord function
+
+
+                function prepareVariables($variables){
+
+                        return $variables;
+
+                }//end method --prepareVariables--
+
+
+                function verifyVariables($variables){
+
+                        $thereturn = array();
+
+                        if(!isset($this->verifyErrors))
+                                $this->verifyErrors = array();
+
+                        if(isset($variables["id"]))
+                                if(!is_numeric($variables["id"]) && $variables["id"])
+                                        $this->verifyErrors[] = "The `id` field must be numeric or equivalent to zero (although positive is reccomended).";
+
+                        if(isset($variables["inactive"]))
+                                if($variables["inactive"] && $variables["inactive"] != 1)
+                                        $this->verifyErrors[] = "The `inactive` field must be a boolean (equivalent to 0 or exactly 1).";
                                         
-                                        case "modifiedby":
-                                                $updatestatement .= "`modifiedby` = ".((int) $modifiedby).", ";
-                                        break;
-        
-                                        case "modifieddate":
-                                                $updatestatement .= "`modifieddate` = NOW(), ";
-                                        break;
-                                        
-                                        default:
-                                                if(!isset($variables[$fieldname]) && strpos($thefield["flags"],"not_null") !== false)
-                                                        $variables[$fieldname] = $this->getDefaultByType($thefield["type"],true);
-                                                
-                                                if(isset($variables[$fieldname]))
-                                                        $updatestatement .= "`".$fieldname."` = ".$this->prepareFieldForSQL($variables[$fieldname],$thefield["type"],$thefield["flags"]).", ";
-                                        break;
-                                }//end switch field name
-                        }//end if
-                }//end foreach
-                $updatestatement = substr($updatestatement, 0, strlen($updatestatement)-2);
-                
-                $updatestatement .= " WHERE `id`=".((int) $variables["id"]);
-
-                $updateresult = $this->db->query($updatestatement);
-                
-                return true;
-        }
-        
-        
-        function insertRecord($variables,$createdby = NULL, $overrideID = false){
-        
-                if($createdby === NULL)
-                        if(isset($_SESSION["userinfo"]["id"]))
-                                $createdby = $_SESSION["userinfo"]["id"];
+                        if(count($this->verifyErrors))
+                                $thereturn = $this->verifyErrors;
+
+                        unset($this->verifyErrors);
+
+                        return $thereturn;
+
+                }//end method --verifyVariables--
+
+
+                function updateRecord($variables, $modifiedby = NULL){
+
+                        $variables = addSlashesToArray($variables);
+
+                        if($modifiedby === NULL)
+                                if(isset($_SESSION["userinfo"]["id"]))
+                                        $modifiedby = $_SESSION["userinfo"]["id"];
+                                else
+                                        $error = new appError(-840,"Session Timed Out.","Creating New Record");
+
+                        if(!isset($variables["id"]))
+                                $error = new appError(-820,"id not set","Updating Record");
+
+                        $updatestatement = "UPDATE `".$this->maintable."` SET ";
+
+                        foreach($this->fields as $fieldname => $thefield){
+                                if(!isset($thefield["select"])){
+                                        switch($fieldname){
+                                                case "id":
+                                                case "creationdate":
+                                                case "createdby":
+                                                break;
+
+                                                case "modifiedby":
+                                                        $updatestatement .= "`modifiedby` = ".((int) $modifiedby).", ";
+                                                break;
+
+                                                case "modifieddate":
+                                                        $updatestatement .= "`modifieddate` = NOW(), ";
+                                                break;
+
+                                                default:
+                                                        if(!isset($variables[$fieldname]) && strpos($thefield["flags"],"not_null") !== false)
+                                                                $variables[$fieldname] = $this->getDefaultByType($thefield["type"],true);
+
+                                                        if(isset($variables[$fieldname]))
+                                                                $updatestatement .= "`".$fieldname."` = ".$this->prepareFieldForSQL($variables[$fieldname],$thefield["type"],$thefield["flags"]).", ";
+                                                break;
+                                        }//end switch field name
+                                }//end if
+                        }//end foreach
+                        $updatestatement = substr($updatestatement, 0, strlen($updatestatement)-2);
+
+                        $updatestatement .= " WHERE `id`=".((int) $variables["id"]);
+
+                        $updateresult = $this->db->query($updatestatement);
+
+
+                        return true;
+                }
+
+
+                function insertRecord($variables,$createdby = NULL, $overrideID = false){
+
+                        if($createdby === NULL)
+                                if(isset($_SESSION["userinfo"]["id"]))
+                                        $createdby = $_SESSION["userinfo"]["id"];
+                                else
+                                        $error = new appError(-840,"Session Timed Out.","Creating New Record");
+
+
+                        $variables = addSlashesToArray($variables);
+
+                        $fieldlist = "";
+                        $insertvalues = "";
+                        foreach($this->fields as $fieldname => $thefield){
+                                if(!isset($thefield["select"])){
+                                        switch($fieldname){
+                                                case "id":
+                                                        if(isset($variables["id"]))
+                                                                if($overrideID && $variables["id"]){
+                                                                        $fieldlist .= "id, ";
+                                                                        $insertvalues .= ((int) $variables["id"]).", ";
+                                                                }//endif
+                                                        break;
+
+                                                case "createdby":
+                                                case "modifiedby":
+                                                        $fieldlist .= $fieldname.", ";
+                                                        $insertvalues .= ((int) $createdby).", ";
+                                                        break;
+
+                                                case "creationdate":
+                                                case "modifieddate":
+                                                        $fieldlist .= $fieldname.", ";
+                                                        $insertvalues .= "NOW(), ";
+                                                        break;
+
+                                                default:
+                                                        if(!isset($variables[$fieldname]) && strpos($thefield["flags"],"not_null") !== false)
+                                                                $variables[$fieldname] = $this->getDefaultByType($thefield["type"],true);
+
+                                                        if(isset($variables[$fieldname])){
+                                                                $fieldlist .= "`".$fieldname."`, ";
+                                                                $insertvalues .= $this->prepareFieldForSQL($variables[$fieldname],$thefield["type"],$thefield["flags"]).", ";
+                                                        }//endif - fieldname
+                                                        break;
+                                        }//end switch field name
+                                }//end if
+                        }//end foreach
+                        $fieldlist = substr($fieldlist, 0, strlen($fieldlist)-2);
+                        $insertvalues = substr($insertvalues, 0, strlen($insertvalues)-2);
+
+                        $insertstatement = "INSERT INTO ".$this->maintable." (".$fieldlist.") VALUES (".$insertvalues.")";
+                        $insertresult = $this->db->query($insertstatement);
+
+                        if($insertresult)
+                                return $this->db->insertId();
                         else
-                                $error = new appError(-840,"Session Timed Out.","Creating New Record");
-
-                
-                $variables = addSlashesToArray($variables);
-
-                $fieldlist = "";
-                $insertvalues = "";
-                foreach($this->fields as $fieldname => $thefield){
-                        if(!isset($thefield["select"])){
-                                switch($fieldname){
-                                        case "id":
-                                                if(isset($variables["id"]))
-                                                        if($overrideID && $variables["id"]){
-                                                                $fieldlist .= "id, ";
-                                                                $insertvalues .= ((int) $variables["id"]).", ";
-                                                        }//endif
-                                                break;
-                                        
-                                        case "createdby":
-                                        case "modifiedby":
-                                                $fieldlist .= $fieldname.", ";                                  
-                                                $insertvalues .= ((int) $createdby).", ";
-                                                break;
-        
-                                        case "creationdate":
-                                        case "modifieddate":
-                                                $fieldlist .= $fieldname.", ";
-                                                $insertvalues .= "NOW(), ";
-                                                break;
-                                        
-                                        default:
-                                                if(!isset($variables[$fieldname]) && strpos($thefield["flags"],"not_null") !== false)
-                                                        $variables[$fieldname] = $this->getDefaultByType($thefield["type"],true);
-                                                
-                                                if(isset($variables[$fieldname])){
-                                                        $fieldlist .= "`".$fieldname."`, ";
-                                                        $insertvalues .= $this->prepareFieldForSQL($variables[$fieldname],$thefield["type"],$thefield["flags"]).", ";
-                                                }//endif - fieldname
-                                                break;
-                                }//end switch field name
-                        }//end if
-                }//end foreach
-                $fieldlist = substr($fieldlist, 0, strlen($fieldlist)-2);
-                $insertvalues = substr($insertvalues, 0, strlen($insertvalues)-2);
-
-                $insertstatement = "INSERT INTO ".$this->maintable." (".$fieldlist.") VALUES (".$insertvalues.")";
-                $insertresult = $this->db->query($insertstatement);
-                
-                if($insertresult)
-                        return $this->db->insertId();
-                else
-                        return false;
-        }
-        
-        
-        function processAddEditPage(){
-                if(!isset($_POST["command"])){
-                        
-                        if(isset($_GET["id"])){
-                                //editing
-                                if(!hasRights($this->editroleid))
-                                        goURL(APP_PATH."noaccess.php");
-                                else
-                                        return $this->getRecord((integer) $_GET["id"]);
-                        } else {
-                                if(!hasRights($this->addroleid))
-                                        goURL(APP_PATH."noaccess.php");
-                                else    
-                                        return $this->getDefaults();
+                                return false;
+                }
+
+
+                function processAddEditPage(){
+                        if(!isset($_POST["command"])){
+
+                                if(isset($_GET["id"])){
+                                        //editing
+                                        if(!hasRights($this->editroleid))
+                                                goURL(APP_PATH."noaccess.php");
+                                        else
+                                                return $this->getRecord((integer) $_GET["id"]);
+                                } else {
+                                        if(!hasRights($this->addroleid))
+                                                goURL(APP_PATH."noaccess.php");
+                                        else
+                                                return $this->getDefaults();
+                                }
                         }
-                }
-                else
-                {
-                        switch($_POST["command"]){
-                                case "cancel":
-                                        // if we needed to do any clean up (deleteing temp line items)
-                                        if(!isset($_POST["id"])) $_POST["id"]=0;
-
-                                        $theurl = $this->backurl;
-                                        
-                                        if(isset($_POST["id"]))
-                                                $theurl .= "#".((int) $_POST["id"]);
-                                        goURL($theurl);                                 
-                                break;
-                                case "save":
-                                        if($_POST["id"]) {
-                                                $this->updateRecord($_POST);                                            
-                                                $theid = $_POST["id"];
-                                                //get record
-                                                $therecord = $this->getRecord($theid);
-                                                $therecord["phpbmsStatus"]="Record Updated";
-
-                                                return $therecord;
-                                        }
-                                        else {
-                                                $theid = $this->insertRecord($_POST);
-                                                
-                                                //get record
-                                                $therecord=$this->getRecord($theid);
-                                                $therecord["phpbmsStatus"] = "<div style=\"float:right;margin-top:-3px;\"><button type=\"button\" class=\"smallButtons\" onclick=\"document.location='".str_replace("&","&amp;",$_SERVER["REQUEST_URI"])."'\">add new</button></div>";
-                                                $therecord["phpbmsStatus"] .= "Record Created";
-                                                
-                                                return $therecord;
-                                        }
-                                break;
-                        }//end command switch                   
-                }// end if
-        }// end function
-}
+                        else
+                        {
+                                switch($_POST["command"]){
+                                        case "cancel":
+                                                // if we needed to do any clean up (deleteing temp line items)
+                                                if(!isset($_POST["id"])) $_POST["id"]=0;
+
+                                                $theurl = $this->backurl;
+
+                                                if(isset($_POST["id"]))
+                                                        $theurl .= "#".((int) $_POST["id"]);
+                                                goURL($theurl);
+                                        break;
+                                        case "save":
+
+                                                $variables = $this->prepareVariables($_POST);
+                                                $errorArray = $this->verifyVariables($variables);
+
+                                                if($_POST["id"]) {
+
+                                                        $theid = $variables["id"];
+
+                                                        if(!count($errorArray)){
+
+                                                                $this->updateRecord($variables);
+
+                                                                //get record
+                                                                $therecord = $this->getRecord($theid);
+                                                                $therecord["phpbmsStatus"] = "Record Updated";
+                                                        }else{
+                                                                foreach($errorArray as $error)
+                                                                        $logError = new appError(-900, $error, "Verification Error");
+
+                                                                //get record
+                                                                $therecord = $this->getRecord($theid);
+                                                                $therecord["phpbmsStatus"] = "Data Verification Error";
+                                                        }//end if
+
+
+
+                                                        return $therecord;
+                                                }
+                                                else {
+
+                                                        $theid = 0;
+
+                                                        if(!count($errorArray)){
+                                                                $theid = $this->insertRecord($variables);
+                                                                //get record
+                                                                $therecord = $this->getRecord($theid);
+                                                                $therecord["phpbmsStatus"] = "<div style=\"float:right;margin-top:-3px;\"><button type=\"button\" class=\"smallButtons\" onclick=\"document.location='".str_replace("&","&amp;",$_SERVER["REQUEST_URI"])."'\">add new</button></div>";
+                                                                $therecord["phpbmsStatus"] .= "Record Created";
+                                                        }else{
+                                                                foreach($errorArray as $error)
+                                                                        $logError = new appError(-900, $error, "Verification Error");
+
+                                                                //get record
+                                                                $therecord = $this->getRecord($theid);
+                                                                $therecord["phpbmsStatus"] .= "Data Verification Error";
+                                                        }//end if
+
+                                                        return $therecord;
+                                                }
+                                        break;
+                                }//end command switch
+                        }// end if
+                }// end function
+        }//end class
 ?>

trunk/phpbms/index.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -39 +39 @@
         require_once("include/session.php");
         require_once("include/login_include.php");
-        
-        $pageTitle = APPLICATION_NAME." Log in";
-        
+
+
+        if(isset($_POST["name"]) && isset($_POST["password"])){
+
+                $login = new login($db);
+                $failed = $login->verify($_POST["name"], $_POST["password"]);
+
+        } else {
+
+                $failed = "";
+                $_POST["name"] = "";
+
+        }//endif
+
+        $pageTitle = formatVariable(APPLICATION_NAME)." Log in";
+
         $phpbms->cssIncludes[] = "pages/login.css";
         $phpbms->jsIncludes[] = "common/javascript/login.js";
-        
+
         $phpbms->showMenu = false;
-        $phpbms->showFooter = false;    
-        
+        $phpbms->showFooter = false;
+
         include("header.php");
 ?>
-        
+
         <div id="loginbox" class="bodyline" >
+
                 <h1><span><?php echo APPLICATION_NAME;?></span></h1>
                 <?php if ($failed) {?><div class="standout" id="failed"><?php echo $failed?></div><?php } ?>
+
                 <noscript>
                         <p class="standout" align="center">JavaScript is disabled.</p>
                         <p> Please check browser requirements.</p>
                 </noscript>
-                
+
                 <form name="form1" method="post" action="<?php echo $_SERVER["PHP_SELF"]?>">
-                        <fieldset>
-                                <legend>Log In</legend>
-                                <p>
-                                        <label for="username">name</label><br />
-                                        <input name="name" type="text" id="username" size="25" maxlength="64" value="<?php echo htmlQuotes($_POST["name"])?>" disabled="disabled"/>
+
+                        <p>
+                                <label for="username">name</label><br />
+                                <input name="name" type="text" id="username" size="25" maxlength="64" value="<?php echo htmlQuotes($_POST["name"])?>" disabled="disabled"/>
+                        </p>
+
+                        <p>
+                                <label for="password">password</label><br />
+                                <input name="password" type="password" id="password" size="25" maxlength="24" disabled="disabled"/>
+                        </p>
+
+
+                        <p id="moreinfoButtonP"><button id="moreinfoButton" type="button" class="graphicButtons buttonInfo"><span>more info</span></button></p>
+                        <p id="buttonP"><button class="Buttons" type="submit" id="loginButton" disabled="disabled">Log In</button></p>
+
+                </form>
+
+
+                <div id="moreinfo" >
+
+                        <div class="box">
+
+                                <h2><a href="http://www.phpbms.org" title="phpBMS"><span class="alt">phpBMS</span></a></h2>
+
+                                <h3>Business Management Web Application</h3>
+
+                                <p class="tiny">
+                                        <a href="requirements.php">browser requirements</a> |
+                                        <a href="info.php">about phpBMS</a>
                                 </p>
-                                
-                                <p>
-                                        <label for="password">password</label><br />
-                                        <input name="password" type="password" id="password" size="25" maxlength="24" disabled="disabled"/>
-                                </p>
-                                
-                        </fieldset>
-                        <p id="buttonP"><button class="Buttons" type="submit" id="loginButton" disabled="disabled">Log In</button></p>
-                </form>         
-                <p id="moreinfoButtonP"><button id="moreinfoButton" type="button" class="graphicButtons buttonInfo"><span>more info</span></button></p>
-                <div id="moreinfo" >
-                        <div class="box">
-                        <h2><a href="http://www.phpbms.org" title="phpBMS"><span class="alt">phpBMS</span></a></h2>
-                        <h3>Business Management Web Application</h3>
-                        <p class="tiny">
-                                <a href="requirements.php">browser requirements</a> |
-                                <a href="info.php">program info</a>
-                        </p>
+
                         </div>
                 </div>
         </div>
 
-                
+
         <?php if(DEMO_ENABLED=="true"){?>
+
         <div id="demobox" class="bodyline">
+
                 <h2>Demonstration Mode</h2>
+
                 <p>
-                        Use the following user credentials to log into phpBMS. Each user 
+                        Use the following user credentials to log into phpBMS. Each user
                         highlights a different security access level.
                 </p>
+
                 <dl>
                         <dt>Shipping Personnel</dt>
@@ -101 +127 @@
                                 username: shipping<br />
                                 password: shipping
-</dd>
+                        </dd>
+
                         <dt>Sales Personnel</dt>
-                        <dd>username: sales<br />
-                        password: sales</dd>
+                        <dd>
+                                username: sales<br />
+                                password: sales
+                        </dd>
+
                         <dt>Sales Manager</dt>
-                        <dd>username: salesmanager<br />
+                        <dd>
+                                username: salesmanager<br />
                                 password: salesmanager
-                     </dd>
+                        </dd>
                 </dl>
         </div>
+
         <?php } include("footer.php")?>

trunk/phpbms/info.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        $loginNoKick=true;
-        $loginNoDisplayError=true;
+        $loginNoKick = true;
+        $loginNoDisplayError = true;
 
         require_once("include/session.php");
-        
-        
-        function displayVersions($db){
-                $querystatement="SELECT displayname,version from modules ORDER BY id";
-                $queryresult=$db->query($querystatement);
 
-                if($queryresult){
-                        while($therecord=$db->fetchArray($queryresult)){
-                                if($therecord["displayname"]!="Base"){
-                                        echo $therecord["displayname"].": ";
-                                        echo "v".$therecord["version"]."<br />";
-                                } else
-                                        echo "<span class=\"important\">v".$therecord["version"]."</span><br /><br />";
-                        }
-                }
-        }
-        
+        class versions{
+
+                var $db;
+                var $queryresult;
+
+                function versions($db){
+
+                        $this->db = $db;
+
+                }//end function init
+
+                function get(){
+
+                        $querystatement = "
+                                SELECT
+                                        `name`,
+                                        `displayname`,
+                                        `version`
+                                FROM
+                                        `modules`
+                                ORDER BY
+                                        `id`";
+
+                        $this->queryresult = $this->db->query($querystatement);
+
+                }//end function get
+
+
+                function show(){
+
+                        if(!$this->queryresult)
+                                return false;
+
+                        while($therecord = $this->db->fetchArray($this->queryresult)){
+
+                                if($therecord["name"] != "base")
+                                        echo formatVariable($therecord["displayname"]).": v".$therecord["version"]."<br />";
+                                else
+                                        echo '<p class="important">v'.$therecord["version"].'</p>';
+
+                        }//endwhile
+
+                        return true;
+
+                }//end function show
+
+        }//end class
+
+        $versions = new versions($db);
+        $versions->get();
+
         $pageTitle="phpBMS Information";
         $phpbms->cssIncludes[] = "pages/info.css";
-        
+
         $phpbms->showMenu = false;
         $phpbms->showFooter = false;
-        
+
         include("header.php");
-        
+
 ?><div class="bodyline" id="container">
+
+        <div id="phpBMSLogo" class="box small">
+                <?php $versions->show() ?>
+        </div>
+
         <h1>About phpBMS</h1>
-        <p>phpBMS is commercial open source, web-based, business management software.</p>
-        
-        <div id="phpBMSLogo" class="box small">
-                <?php if(isset($db)) displayVersions($db)?>
-        </div>
-        
+        <p>phpBMS is commercial, open source, web-based, business management software.</p>
+
         <div id="companyInfo">
-                <p class="small">
-                        Copyright &copy; 2004 -2007 Kreotek, llc. All Rights Reserved.
-                        phpBMS, and the phpBMS logo are trademarks of Kreotek, llc. 
+                <p >
+                        Copyright &copy; <?php echo date("Y")?> Kreotek, LLC. All Rights Reserved.
+                        phpBMS, and the phpBMS logo are trademarks of Kreotek, LLC.
                         Software is licensed under a <a href="license.txt">modified BSD license</a>.
                 </p>
-                
+
                 <h3>Kreotek, LLC</h3>
-                <p class="small">
+                <p>
                         610 Quantum<br />
-                        Rio Rancho, NM 87124
+                        Rio Rancho, NM 87124 USA
+                </p>
+                <p><a href="http://www.kreotek.com">http://www.kreotek.com</a></p>
+                <p>
+                        sales: <a href="mailto:sales@kreotek.com">sales@kreotek.com</a><br />
+                        support: <a href="mailtosupport@kreotek.com">support@kreotek.com</a>
                 </p>
                 <p>
-                        web: <a href="http://www.kreotek.com">http://www.kreotek.com</a><br />
-                        sales: <a href="mailto:sales@kreotek.com">sales@kreotek.com</a><br />
-                        support: <a href="mailtosupport@kreotek.com">support@kreotek.com</a><br />
-                        phone: <strong>1-800-731-8026</strong>
+                        U.S. and Canada Toll Free<br />
+                        1-800-731-8026
+
+                <p>
+                        Outside US and Canada<br />
+                        +1-505-994-6388
                 </p>
+
                 <h3>phpBMS Open Source Project</h3>
                 <p>
-                        project web site: <a href="http://www.kreotek.com">http://www.phpbms.org</a><br />
-                        project forums: <a href="mailto:sales@kreotek.com">sales@kreotek.com</a><br />
+                        community web site: <a href="http://www.kreotek.com">http://www.phpbms.org</a><br />
+                        community forums: <a href="http://www.phpbms.org/forum">http://www.phpbms.org/forum</a><br />
                 </p>
         </div>
-        
-                <h2>Source Code</h2>
-                <ul>
-                        <li><strong>phpBMS</strong> - Commercial Open Source Business Management Web Appllication (<a href="http://www.kreotek.com">www.phpbms.org</a>)</li>
-                        <li><strong>fpdf</strong> - A PHP class which allows to generate PDF files with pure PHP (<a href="http://www.fpdf.org">www.fpdf.org</a>)</li>
-                    <li><strong>moo.fx</strong> - Super lightweight JavaScript effects library (<a href="http://moofx.mad4milk.net/">moofx.mad4milk.net</a>) </li>
-                        <li><strong>mochikit</strong> - A lightweight JavaScript library (<a href="http://mochichit.com/">mochikit.com</a>) - phpBMS utilizes modified parts mochikit code and it's programming structure.</li>
-                        <li><strong>parseCSV</strong> - An easy to use PHP class to read and write CSV data properly.(<a href="http://code.google.com/p/parsecsv-for-php/" >code.google.com/p/parsecsv-for-php/</a>)</li>
-                </ul>
-                <h2>Technologies</h2>
-                <ul>
-                        <li><strong>php</strong> -  A widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML.  (<a href="http://www.php.net">www.php.net</a>)</li>
-                        <li><strong>MySQL</strong> - An open source relational database management system (RDBMS) that uses Structured Query Language (SQL) (<a href="http://www.mysql.org">www.mysql.org</a>)</li>
-                        <li><strong>AJAX</strong> - Asynchronous Javascript And XML is a group of technologies that help browser based applications behave more like applications you run from your desktop.</li>
-                </ul>
 
-        <p align="right">
-                <input type="button" value="Back" class="Buttons" onclick="document.location='<?php echo APP_PATH; if(isset($_SESSION["userinfo"])) echo DEFAULT_LOAD_PAGE?>'" id="loginButton"/>
-        </p>
+        <h2>Source Code</h2>
+        <ul>
+                <li>
+                        <h3>phpBMS (<a href="http://www.phpbms.org">www.phpbms.org</a>)</h3>
+                        <p>Commercial Open Source Business Management Web Appllication</p>
+                </li>
+
+                <li>
+                        <h3>fpdf (<a href="http://www.fpdf.org">www.fpdf.org</a>)</h3>
+                        <p>A PHP class which allows to generate PDF files with pure PHP</p>
+                </li>
+
+                <li>
+                        <h3>moo.fx (<a href="http://moofx.mad4milk.net/">moofx.mad4milk.net</a>)</h3>
+                        <p>Super lightweight JavaScript effects library</p>
+                </li>
+
+                <li>
+                        <h3>mochikit (<a href="http://mochichit.com/">mochikit.com</a>)</h3>
+                        <p>A lightweight JavaScript library - phpBMS utilizes modified parts of mochikit code and it's programming structure for JavaScript as inspiration.</p>
+                </li>
+
+                <li>
+                        <h3>parseCSV (<a href="http://code.google.com/p/parsecsv-for-php/" >code.google.com/p/parsecsv-for-php/</a>)</h3>
+                        <p>An easy to use PHP class to read and write CSV data properly.</p>
+                </li>
+        </ul>
+
+        <p align="right"><input type="button" value="Log In" class="Buttons" onclick="document.location='./'" id="loginButton" /></p>
+
 </div><?php include("footer.php") ?>

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
 ?>

trunk/phpbms/modules/base/adminsettings.php

@@ -86 +86 @@
         $theform->addField($theinput);
 
-        $theinput = new inputField("currency_sym",$therecord["currency_sym"],"currency symbol",true,NULL,4,1);
+        $theinput = new inputField("currency_sym",$therecord["currency_sym"],"currency symbol",true,NULL,5,5);
         $theform->addField($theinput);
 
@@ -225 +225 @@
                                 <option value="UK - Loose" <?php if($therecord["phone_format"] == "UK - Loose")  echo "selected=\"selected\"";?>>UK - Loose</option>
                                 <option value="International" <?php if($therecord["phone_format"] == "International")  echo "selected=\"selected\"";?>>International</option>
+                                <option value="No Verification" <?php if($therecord["phone_format"] == "No Verification")  echo "selected=\"selected\"";?>>No Verification</option>
                         </select>
                 </p>

trunk/phpbms/modules/base/cron.php

@@ -1 +? @@
-<?php 
+<?php
         $loginNoKick=true;
         $loginNoDisplayError=true;
-        
+
         include("../../include/session.php");
-                
+
         $now = gmdate('Y-m-d H:i', strtotime('now'));
-        
-        $querystatment="SELECT id,name,crontab,job,startdatetime,enddatetime FROM scheduler WHERE inactive=0 AND startdatetime<NOW() AND (enddatetime>NOW() OR enddatetime IS NULL);";
+
+        $querystatment = "
+                SELECT
+                        id,
+                        name,
+                        crontab,
+                        job,
+                        startdatetime,
+                        enddatetime
+                FROM
+                        scheduler
+                WHERE
+                        inactive = 0
+                        AND startdatetime < NOW()
+                        AND (enddatetime > NOW() OR enddatetime IS NULL)";
+
         $queryresult=$db->query($querystatment);
-        
+
         while($schedule_record=$db->fetchArray($queryresult)){
+
                 $datetimearray=explode(" ",$schedule_record["startdatetime"]);
                 $schedule_record["startdate"]=stringToDate($datetimearray[0],"SQL");
@@ -16 +31 @@
 
                 if($schedule_record["enddatetime"]){
+
                         $datetimearray=explode(" ",$schedule_record["enddatetime"]);
                         $schedule_record["enddate"]=stringToDate($datetimearray[0],"SQL");
                         $schedule_record["endtime"]=stringToTime($datetimearray[1],"24 Hour");
-                }
-
-                $validTimes=getTimes($schedule_record);
+
+                }//endif enddateiem
+
+                $validTimes = getTimes($schedule_record);
+
                 if(is_array($validTimes) && in_array($now, $validTimes)){
+
                         $success = @ include($schedule_record["job"]);
+
                         if($success){
+
                                 $updatestatement="UPDATE scheduler SET lastrun=NOW() WHERE id=".$schedule_record["id"];
                                 $db->query($updatestatement);
-                                $log = new phpbmsLog("Secheduled Job ".$schedule_record["name"]." (".$schedule_record["id"].") completed","SCHEDULER",-2);
-                        } else {
-                                $log = new phpbmsLog("Secheduled Job ".$schedule_record["name"]." (".$schedule_record["id"].") returned errors","SCHEDULER",-2);
-                        }
-                                
-                }               
-        }
-        
+                                $log = new phpbmsLog("Scheduled Job ".$schedule_record["name"]." (".$schedule_record["id"].") completed","SCHEDULER",-2);
+
+                        } else {
+
+                                $log = new phpbmsLog("Scheduled Job ".$schedule_record["name"]." (".$schedule_record["id"].") returned errors","SCHEDULER",-2);
+
+                        }//endif success
+
+                }//endif is_array();
+
+        }//endwhile
+
+
         function getTimes($recordarray){
-        
+
                 $dayInt = array('*',1,2,3,4,5,6,7);
                 $dayLabel = array('*',"Monday","Tuesday","Wedensday","Thursday","Friday","Saturday","Sunday");
@@ -43 +69 @@
                 $metricsVar = array("*", "/", "-", ",");
                 $metricsVal = array(' every ','',' thru ',' and ');
-                        
+
                 $dateTimes = array();
                 $ints   = explode('::', str_replace(' ','',$recordarray["crontab"]));
@@ -59 +85 @@
                         $theDay = str_replace('*/','',$days);
                         $dayName[] = str_replace($dayInt, $dayLabel, $theDay);
-                } elseif($days != '*') { 
+                } elseif($days != '*') {
                         if(strstr($days, ',')) {
                                 $exDays = explode(',',$days);
                                 foreach($exDays as $k1 => $dayGroup) {
                                         if(strstr($dayGroup,'-')) {
-                                                $exDayGroup = explode('-', $dayGroup); 
+                                                $exDayGroup = explode('-', $dayGroup);
                                                 for($i=$exDayGroup[0];$i<=$exDayGroup[1];$i++) {
                                                         $dayName[] = str_replace($dayInt, $dayLabel, $i);
@@ -73 +99 @@
                                 }
                         } elseif(strstr($days, '-')) {
-                                $exDayGroup = explode('-', $days); 
+                                $exDayGroup = explode('-', $days);
                                 for($i=$exDayGroup[0];$i<=$exDayGroup[1];$i++) {
                                         $dayName[] = str_replace($dayInt, $dayLabel, $i);
@@ -80 +106 @@
                                 $dayName[] = str_replace($dayInt, $dayLabel, $days);
                         }
-                        
+
                         // check the day to be in scope:
                         if(!in_array($today['weekday'], $dayName)) {
@@ -88 +114 @@
                         return false;
                 }
-                
-                
+
+
                 // derive months part
                 if($mons == '*') {
@@ -104 +130 @@
                         // this month is not in one of the multiplier months
                         if(!in_array($today['mon'],$compMons)) {
-                                return false;   
+                                return false;
                         }
                 } elseif($mons != '*') {
@@ -127 +153 @@
                                 $monName[] = $mons;
                         }
-                        
+
                         // check that particular months are in scope
                         if(!in_array($today['mon'], $monName)) {
@@ -133 +159 @@
                         }
                 }
-                
+
 
                 // derive dates part
@@ -147 +173 @@
                                 $i += $mult;
                         }
-                        
+
                         if(!in_array($today['mday'], $dateName)) {
-                                return false;   
+                                return false;
                         }
                 } elseif($dates != '*') {
@@ -158 +184 @@
                                                 $exDateGroup = explode('-', $dateGroup);
                                                 for($i=$exDateGroup[0];$i<=$exDateGroup[1];$i++) {
-                                                        $dateName[] = $i; 
+                                                        $dateName[] = $i;
                                                 }
                                         } else {
@@ -167 +193 @@
                                 $exDateGroup = explode('-', $dates);
                                 for($i=$exDateGroup[0];$i<=$exDateGroup[1];$i++) {
-                                        $dateName[] = $i; 
+                                        $dateName[] = $i;
                                 }
                         } else {
                                 $dateName[] = $dates;
                         }
-                        
+
                         // check that dates are in scope
                         if(!in_array($today['mday'], $dateName)) {
@@ -178 +204 @@
                         }
                 }
-                
+
                 // derive hours part
                 $currentHour = date('G', strtotime('00:00'));
@@ -213 +239 @@
                         }
                 }
-                
+
                 // derive minutes
                 $currentMin = date('i', strtotime($recordarray["starttime"]));
@@ -239 +265 @@
                                 $i += $mult;
                         }
-                        
+
                 } elseif($mins != '*') {
                         if(strstr($mins, ',')) {
@@ -261 +287 @@
                                 $minName[] = $mins;
                         }
-                } 
+                }
 
                 // prep some boundaries - these are not in GMT b/c gmt is a 24hour period, possibly bridging 2 local days
@@ -281 +307 @@
                         $hourSeen++;
                         foreach($minName as $kMin=>$min) {
-                                if($hr < $currentHour || $hourSeen == 25) 
+                                if($hr < $currentHour || $hourSeen == 25)
                                         $theDate = date('Y-m-d', strtotime('+1 day'));
                                 else
@@ -287 +313 @@
 
                                 $tsGmt = strtotime($theDate.' '.str_pad($hr,2,'0',STR_PAD_LEFT).":".str_pad($min,2,'0',STR_PAD_LEFT).":00"); // this is LOCAL
-                                $validJobTime[] = gmdate('Y-m-d H:i', $tsGmt);                          
+                                $validJobTime[] = gmdate('Y-m-d H:i', $tsGmt);
                         }
                 }
                 sort($validJobTime);
 
-                return $validJobTime;           
+                return $validJobTime;
         }//end function
 ?>

trunk/phpbms/modules/base/general_import.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev: 258 $ | $LastChangedBy: brieb $
@@ -43 +43 @@
         include("include/imports.php");
         include("include/parsecsv.lib.php");
-        
-        //if you need to overide the phpbmsTable class make sure to include the modules file
-        
-        //              include("modules/[modulename]/include/[tablename].php");
-
-
-        //If the addedit page will be accessd directly from a page other than the 
-        // basic search results page, you may want to grab and pass the previous URL
-        //with the following code
-
-        //===================================================
-        if(!isset($_GET["backurl"])) 
-                $backurl = NULL; 
-        else{ 
-                $backurl = $_GET["backurl"];
-                if(isset($_GET["refid"]))
-                        $backurl .= "?refid=".$_GET["refid"];
-        }
-        //===================================================
-
-        if(isset($_GET["id"]))
-                $tabledefid = ((int)$_GET["id"]);
-        
-
-        //Here you invoke the table and import classes.  If you are going to use the standard phpbmsTable class
-        // for updates and the such you would access it like this
-        
-                        $thetable = new phpbmsTable($db,$tabledefid);
-                        $import = new phpbmsImport($thetable);
-        
-        //if you are going to overide the class you would instantiate
-        // like this
-        
-        //              $thetable = new [tablename]($db,[table definition id],$backurl);
-        //              $import = new [importname]($thetable);
-        
-        //and if you are setting the backurl, make sure you pass that as well
-        // like this:
-        
-        //              $thetable = new [tablename]($db,[table definition id],$backurl);
-        
-        
-        //Next we process the form (if submitted) and 
+
+
+        $tabledefid = (int) $_GET["id"];
+
+        $querystatement = "
+                        SELECT
+                                `modules`.`name` AS `modulename`,
+                                `tabledefs`.`maintable` AS `maintable`
+                        FROM
+                                `tabledefs` INNER JOIN `modules` ON `tabledefs`.`moduleid` = `modules`.`id`
+                        WHERE
+                                `tabledefs`.`id` = '".$tabledefid."';
+                        ";
+
+        $queryresult = $db->query($querystatement);
+
+        $thereturn = $db->fetchArray($queryresult);
+
+        //try to include table specific functions
+        if(file_exists("../".$thereturn["modulename"]."/include/".$thereturn["maintable"].".php"))
+                include("../".$thereturn["modulename"]."/include/".$thereturn["maintable"].".php");
+
+        //next, see if the table class exists
+        if(class_exists($thereturn["maintable"])){
+                $classname = $thereturn["maintable"];
+                $thetable = new $classname($db,$tabledefid);
+        } else
+                $thetable = new phpbmsTable($db,$tabledefid);
+
+        //finally, check to see if import class exists
+        if(class_exists($thereturn["maintable"]."Import")){
+                $classname = $thereturn["maintable"]."Import";
+                $import = new $classname($thetable);
+        } else
+                $import = new phpbmsImport($thetable);
+
+        //Next we process the form (if submitted) and
         // return the current record as an array ($therecord)
         // or if this is a new record, it returns the defaults
@@ -96 +90 @@
 
         $pageTitle = ($therecord["title"])?$therecord["title"]:"General Table Import";
-        
+
         // Next, we set up to include any
         // additional css or javascript files we will be using
@@ -106 +100 @@
 
         // if you need to define a body onlload function, do so with the phpbms property
-        
+
         //              $phpbms->onload[] = "initializePage()";
 
@@ -112 +106 @@
         // Next we need to define any special fields that will be used in the form
         // A list of field objects (with documentation)is available in the /include/fields.php
-        // file.  
-        
+        // file.
+
         // We need to define them here in the head
         // so that any necessay javascript is loaded appropriately.
-        
+
                 //Form Elements
                 //==============================================================
-                
+
                 // Create the form
                 $theform = new importForm();
@@ -125 +119 @@
                 //if you need to set specific form vaiables (like enctype, or extra onsubmit
                 // you can set those form properties here.
-                
-                // for each field we will use, create the field object and add it to 
-                // the forms list.
-                //$theinput = new inputDatePicker("orderdate", $therecord["orderdate"], "order date");
-                //$theform->addField($theinput);
-                //
-                //$theinput = new inputCheckBox("weborder",$therecord["weborder"],NULL, false, false);
-                //$theform->addField($theinput);
-                //
-                //$theinput = new inputField("accountnumber",$therecord["accountnumber"],  "account number" ,false, "integer", 20, 64);
-                //$theform->addField($theinput);
-
-
-                // if you neeed to add additional attributes toa field, it's easy.
-                //$theinput = new inputBasicList("type",$therecord["type"],array("Quote"=>"Quote","Order"=>"Order","Invoice"=>"Invoice","VOID"=>"VOID"), $displayName = NULL, $displayLabel = true);
-                //$theinput->setAttribute("onchange","checkType(this)");
-                //$theinput->setAttribute("class","important");
-                //$theform->addField($theinput);
+
 
                 // lastly, use the jsMerge method to create the final Javascript formatting
                 $theform->jsMerge();
                 //==============================================================
-                //End Form Elements     
-
-        include("header.php");  
-        
+                //End Form Elements
+
+        include("header.php");
+
 ?><div class="bodyline">
-        <!-- 
+        <!--
                 Next we start the form.  This also prints the H1 with title, and top save,cancel buttons
                 If you need to have other buttons, or need a specific top, you will need to create your form manually.
         -->
-        <?php $theform->startForm($pageTitle, $import->pageType)?>
+        <?php $theform->startForm($pageTitle, $import->pageType, count($import->transactionRecords))?>
 
         <div id="leftSideDiv">
@@ -164 +141 @@
                 <!-- /* This next input also determines whether the file/import fieldset will be displayed or if the preview sections will be displayed*/ -->
                 <input id="pageType" name="pageType" type="hidden" value="<?php echo $import->pageType?>" />
-                
+
                 <?php
                 if($import->pageType == "main"){ ?>
@@ -175 +152 @@
                                         <input id="import" name="import" type="file" size="64"/><br/>
                                 </p>
-                                
+
                                 <div id="info0" class="info">
                                         <p>
@@ -201 +178 @@
                 <?php
                 }//end if
-                
+
                 if($import->error && $import->pageType != "main"){
                         ?>
@@ -216 +193 @@
         </div>
         <div id="createmodifiedby" >
-        <?php   
+        <?php
                 //Last, we show the create/modifiy with the bottom save and cancel buttons
                 // and then close the form.
-                $theform->showButtons(2, $import->pageType);
+                $theform->showButtons(2, $import->pageType, count($import->transactionRecords));
                 ?></div><?php
                 $theform->endForm();

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

@@ -43 +43 @@
 class settings{
         var $db;
-        
+
         function settings($db){
-        
+
                 $this->db = $db;
-        
-        }
-        
-        
+
+        }
+
+
         function getSettings(){
                 $therecord = array();
-                
+
                 $querystatement = "SELECT `name`, `value` FROM `settings`";
                 $queryresult = $this->db->query($querystatement);
-                
+
                 while($setting = $this->db->fetchArray($queryresult))
                         $therecord[$setting["name"]] = $setting["value"];
-                        
+
                 return $therecord;
         }
-        
-        
+
+
         function updateSettings($variables){
-        
+
                 global $phpbms;
-                
+
                 if(!isset($variables["persistent_login"])) $variables["persistent_login"]=0;
-                
+
                 //include any procesing that needs to be done by modules
                 foreach($phpbms->modules as $module => $moduleinfo)
@@ -77 +77 @@
                                         $extraUpdate = new $class($this->db);
                                         $variables = $extraUpdate->updateSettings($variables);
-                                        
+
                                 }//end if
-        
+
                 // Update the settings records
                 foreach($variables as $settingname => $settingvalue){
                         if(defined(strtoupper($settingname))){
                                 if(constant(strtoupper($settingname)) != $settingvalue){
-                                
+
                                         $updatestatement = "
-                                                UPDATE 
-                                                        settings 
-                                                SET 
-                                                        value ='".$settingvalue."' 
-                                                WHERE 
+                                                UPDATE
+                                                        settings
+                                                SET
+                                                        value ='".$settingvalue."'
+                                                WHERE
                                                         name='".mysql_real_escape_string($settingname)."'";
-                                                        
+
                                         $updateresult = $this->db->query($updatestatement);
-                                        
+
                                         if(!$this->db->affectedRows()){
 
                                                 //check to see why the update did not work
                                                 $querystatement = "
-                                                        SELECT 
+                                                        SELECT
                                                                 name
                                                         FROM
@@ -105 +105 @@
                                                         WHERE
                                                                 name = '".mysql_real_escape_string($settingname)."'";
-                                                
+
                                                 $queryresult = $this->db->query($querystatement);
-                                                
+
                                                 if(!$this->db->numRows($queryresult)){
-                                                
+
                                                         //insert the setting if need be
                                                         $insertstatement ="
@@ -120 +120 @@
                                                                                 '".mysql_real_escape_string($settingname)."'
                                                                         }";
-                                                                        
+
                                                         $this->db-query($insertstatement);
-                                                        
+
                                                 }//end if
-                                        
+
                                         }//end if
-                                        
+
                                 }//end if
                         }
                 }//end foreach
-                
+
                 // deal with logo graphic.
                 if(isset($_FILES["printedlogo"])){
-                        if($_FILES["printedlogo"]["type"] == "image/png" || $_FILES["printedlogo"]["type"] == "image/jpeg"){
+
+                        $validFileTypes = array(
+                                "image/png",
+                                "image/x-png",
+                                "image/jpg",
+                                "image/jpeg",
+                                "imagep/jpeg",
+                        );
+
+                        if(in_array($_FILES["printedlogo"]["type"], $validFileTypes)){
+
                                 if (function_exists('file_get_contents')) {
+
                                         $file = mysql_real_escape_string(file_get_contents($_FILES['printedlogo']['tmp_name']));
+
                                 } else {
+
                                         // If using PHP < 4.3.0 use the following:
                                         $file = mysql_real_escape_string(fread(fopen($_FILES['printedlogo']['tmp_name'], 'r'), filesize($_FILES['printedlogo']['tmp_name'])));
-                                }
+
+                                }//endif
+
                                 if($_FILES["printedlogo"]["type"] == "image/jpeg")
                                         $name = "logo.jpg";
                                 else
                                         $name = "logo.png";
-                                        
-                                $querystatement="UPDATE `files` SET `file` = '".$file."', `type` = '".$_FILES["printedlogo"]["type"]."', `name`='".$name."' WHERE id=1";
-                                $queryresult=$this->db->query($querystatement);
-                        }
-                }               
+
+                                $updatestatement = "
+                                        UPDATE
+                                                `files`
+                                        SET
+                                                `file` = '".$file."',
+                                                `type` = '".$_FILES["printedlogo"]["type"]."',
+                                                `name`='".$name."'
+                                        WHERE
+                                                id = 1";
+
+                                $this->db->query($updatestatement);
+
+                        }//endif file types
+
+                }//endif file exists
 
                 return true;
-                
+
         }//end method
-        
+
 
         function updateEncyptionSeed($newseed,$currpassword,$userid){
-        
+
                 $userid = (int) $userid;
-        
+
                 //first let's make sure the password matches
                 $querystatement="SELECT id FROM users WHERE id=".$userid." AND password=ENCODE('".$currpassword."','".ENCRYPTION_SEED."')";
@@ -165 +191 @@
                 if(!$this->db->numRows($queryresult))
                         return "Encryption Seed not Updated: Invalid Current Password";
-                
+
                 //let's update the encryption seed then
                 $querystatement="UPDATE settings SET value='".$newseed."' WHERE name='encryption_seed'";
                 $queryresult=$this->db->query($querystatement);
-                        
+
                 //last, reencode the current password
                 $querystatement="UPDATE users SET password=ENCODE('".$currpassword."','".$newseed."') WHERE id=".$userid;
@@ -177 +203 @@
                 $querystatement="UPDATE users SET password = ENCODE(DECODE(password,'".ENCRYPTION_SEED."'),'".$newseed."') WHERE id !=".$userid;
                 $queryresult=$this->db->query($querystatement);
-                        
+
                 return "Encryption Seed Updated.";
-        }       
+        }
 
 
@@ -185 +211 @@
 
                 $variables = addSlashesToArray($variables);
-                
+
                 switch($variables["command"]){
                         case "update settings":
@@ -191 +217 @@
                                         $statusmessage="Settings Updated";
                         break;
-                        
+
                         case "update encryption seed":
                                 if(isset($variables["changeseed"]))
@@ -201 +227 @@
 
         }//end method
-        
-        
+
+
         function displayStylesheets($stylesheet){
 
                 $thedir="../../common/stylesheet";
                 $thedir_stream = @opendir($thedir);
-                
+
                 while($entry = @ readdir($thedir_stream)){
                         if ($entry!="." and  $entry!=".." and is_dir($thedir."/".$entry)) {

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

@@ -40 +40 @@
 if(class_exists("phpbmsTable")){
         class files extends phpbmsTable{
-        
+
+                var $availableRoleIDs = array();
+
                 function getPicture($name){
                         if (function_exists('file_get_contents')) {
@@ -48 +50 @@
                                 $file = addslashes(fread(fopen($_FILES[$name]['tmp_name'], 'r'), filesize($_FILES[$name]['tmp_name'])));
                         }
-                        
+
                         return $file;
                 }
-                
-                function formatVariables($variables){
-        
-                        if($_FILES['upload']["name"]){
-                                
-                                $variables["name"] = $_FILES['upload']["name"];                 
-                                $variables["type"] = $_FILES['upload']['type'];                 
-                                $variables["file"] = $this->getPicture("upload");
-                                
-                        } else {
-                                unset($this->fields["type"]);
-                                unset($this->fields["file"]);
+
+                //populates the list of possible role ids
+                //into $this->availableRoleIDs (an array)
+                function populateRoleArray(){
+
+                        $this->availableRoleIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `roles`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        //next two should also be allowed, but aren't stored in the database
+                        $this->availableRoleIDs[] = 0;//for everyone
+                        $this->availableRoleIDs[] = -100;//for administrators
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableRoleIDs[] = $therecord["id"];
+
+                }//end method --populateRoleArray--
+
+
+                function verifyVariables($variables){
+
+                        //if it is set, we'll have to check, if not, it defaults to 0 which is an acceptable
+                        //value.
+                        if(isset($variables["roleid"])){
+
+                                //either its numeric or == 0
+                                if(is_numeric($variables["roleid"]) || !$variables["roleid"]){
+
+                                        //check to see if the RoleIDs are populated
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();//populate if not
+
+                                        //check to see if the int typecast of the roleid (to allow for values
+                                        //equivalent to 0) is an acceptable role id.
+                                        if(!in_array(((int)$variables["roleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable role id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `roleid` field must be numeric or equivalent to 0.";
                         }//end if
-                        
-                        return $variables;                      
-                
+
+                        return parent::verifyVariables($variables);
+
+                }//end method
+
+
+                function prepareVariables($variables){
+
+                        if(isset($_FILES['upload']))
+                                if($_FILES['upload']["name"]){
+
+                                        $variables["name"] = $_FILES['upload']["name"];
+                                        $variables["type"] = $_FILES['upload']['type'];
+                                        $variables["file"] = $this->getPicture("upload");
+
+                                } else {
+                                        unset($this->fields["type"]);
+                                        unset($this->fields["file"]);
+                                }//end if
+
+                        return $variables;
+
                 }//end function
-        
-        
+
+
                 function updateRecord($variables, $modifiedby = NULL){
-        
-                        $variables = $this->formatVariables($variables);
-        
+
                         $thereturn = parent::updateRecord($variables, $modifiedby);
-                        
+
                         //restore the fields
                         $this->getTableInfo();
-                        
+
                         return $thereturn;
                 }//end method
-                
-                
+
+
                 function insertRecord($variables, $createdby = NULL){
-                
-                        $variables = $this->formatVariables($variables);
-        
+
                         $newid = parent::insertRecord($variables, $createdby);
-                        
+
                         //restore the fields
                         $this->getTableInfo();
-                        
+
                         return $newid;
-                        
+
                 }//end method
-                        
+
         }//end class
 }//end if
@@ -101 +151 @@
 if(class_exists("searchFunctions")){
         class filesSearchFunctions extends searchFunctions{
-        
+
                 function delete_record(){
-                
+
                         $whereclause = $this->buildWhereClause();
                         $attachmentwhereclause = $this->buildWhereClause("attachments.fileid");
-                
+
                         $querystatement = "DELETE FROM attachments WHERE ".$attachmentwhereclause." AND attachments.fileid!=1;";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM files WHERE ".$whereclause." AND files.id!=1;";
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $message = $this->buildStatusMessage();
                         $message.=" deleted";
                         return $message;
                 }
-        
+
         }//end class
 }//end if

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class menus extends phpbmsTable{
-        
-                function formatVariables($variables){
+
+                var $availableRoleIDs = array();
+
+                function checkParentMenuIDs($currentID = 0, $parentID = 0){
+
+                        //cannot be own parent
+                        $currentID = ((int) $currentID);
+                        //current setting of the parentid
+                        $parentID = ((int) $parentID);
+
+                        if(!$parentID)
+                                return true;
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `menu`
+                                WHERE
+                                        `id` = '".$parentID."'
+                                        AND
+                                        `id`!='".$currentID."'
+                                        AND
+                                        `parentid` = '0'
+                                        AND
+                                        (
+                                                `link` = ''
+                                                OR
+                                                `link` IS NULL
+                                        )
+                                        ;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        return $this->db->numRows($queryresult);
+
+                }//end method --getParentMenuIDs--
+
+                //pouplate the id roles array
+                function populateRoleArray(){
+
+                        $this->availableRoleIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `roles`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableRoleIDs[] = 0;//for everyone
+                        $this->availableRoleIDs[] = -100;//for admin
+
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableRoleIDs[] = $therecord["id"];
+
+                }//end method --populateRoleArray()--
+
+
+                function verifyVariables($variables){
+
+                        //table default (0) for `roleid` is ok (i.e. doesn't have to be set)
+                        if(isset($variables["roleid"])){
+
+                                //can either be numeric or equivalent to 0
+                                if(is_numeric($variables["roleid"]) || !$variables["roleid"]){
+
+                                        //check for populated role id array
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        //check to see if the int typecast role id is in one of the available ones
+                                        if(!in_array(((int)$variables["roleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable role id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `roleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        //check parent ids under certain circumstances
+                        //not set is acceptable
+                        if(isset($variables["parentid"])){
+
+                                //can be either numeric or equivalent to 0 and its int typecast must be non-negative
+                                if( !$variables["parentid"] || ((int)$variables["parentid"]) > 0 ){
+
+                                        $id = 0;
+
+                                        //use the current id if it exists (A menu record cannot be its own parent)
+                                        if(isset($variables["id"]))
+                                                if(is_numeric($variables["id"]) && ((int) $variables["id"]) > 0)
+                                                        $id = $variables["id"];
+
+                                        //Select run every time because `id` can be different
+                                        if( !$this->checkParentMenuIDs($id, ((int) $variables["parentid"])) )
+                                                $this->verifyErrors[] = "The `parentid` field does not give an existing/acceptable parent id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `roleid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
+                function prepareVariables($variables){
                         switch($variables["radio"]){
                                 case "cat":
@@ -52 +162 @@
                                 default:
                         }
-                
+
                         return $variables;
                 }
-        
-                
-                function updateRecord($variables, $modifiedby = NULL){
-                        
-                        $variables = $this->formatVariables($variables);
-                
-                        parent::updateRecord($variables, $modifiedby);
-                }
-        
-        
-                function insertRecord($variables, $createdby = NULL){
-                        
-                        $variables = $this->formatVariables($variables);
-                
-                        return parent::insertRecord($variables, $createdby );
-                }
-        
-        
+
+
                 function displayTableDropDown($selectedlink){
-        
+
                         $querystatement="select id, displayname from tabledefs order by displayname";
                         $thequery=$this->db->query($querystatement);
-                        
+
                         echo "<select id=\"linkdropdown\" name=\"linkdropdown\">\n";
                         while($therecord=$this->db->fetchArray($thequery)){
                                 echo "<option value=\"search.php?id=".$therecord["id"]."\" ";
-        
-                                if ($selectedlink == "search.php?id=".$therecord["id"]) 
+
+                                if ($selectedlink == "search.php?id=".$therecord["id"])
                                         echo "selected=\"selected\"";
-        
+
                                 echo " >".$therecord["displayname"]."</option>\n";
                         }
                         echo "</select>\n";
-                
+
                 }//end method
-                
-                
+
+
                 function displayParentDropDown($selectedpid,$id=0){
-        
+
                         if($id=="")$id=0;
                         $querystatement="SELECT id, name FROM menu WHERE id!=".$id." and parentid=0 and (link=\"\" or link is null) ORDER BY displayorder";
                         $thequery=$this->db->query($querystatement);
-        
+
                         echo "<select name=\"parentid\" id=\"parentid\">\n";
                         echo "<option value=\"0\" ";
-        
+
                         if ($selectedpid=="0")
                                 echo "selected=\"selected\"";
-                                
+
                         echo " >-- none --</option>\n";
                         while($therecord=$this->db->fetchArray($thequery)){
                                 echo "<option value=\"".$therecord["id"]."\" ";
-                                if ($selectedpid==$therecord["id"]) 
+                                if ($selectedpid==$therecord["id"])
                                         echo "selected=\"selected\"";
-        
+
                                 echo " >".$therecord["name"]."</option>\n";
                         }
                         echo "</select>\n";
-                        
+
                 }//end method
-        
+
         }//end class
 }//end if
@@ -122 +216 @@
 if(class_exists("searchFunctions")){
         class menuSearchFunctions extends searchFunctions{
-        
+
                 function delete_record(){
-                        
+
                         //passed variable is array of user ids to be revoked
                         $whereclause = $this->buildWhereClause();
                         $verifywhereclause = $this->buildWhereClause("menu.parentid");
-                        
+
                         $querystatement = "SELECT id FROM menu WHERE ".$verifywhereclause;
                         $queryresult = $this->db->query($querystatement);
@@ -136 +230 @@
                                 $queryresult = $this->db->query($querystatement);
                         }
-                        
+
                         $message=$this->buildStatusMessage();
                         $message.=" deleted.";
                         return $message;
                 }
-        
+
         }//end class
 }//end if

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

@@ -45 +45 @@
         var $weekArray = array("First"=>"1", "Second"=>"2", "Third"=>"3", "Fourth"=>"4", "Last"=>"5");
         var $dayOfWeekArray = array();
-        
-        
+
+
         function notes($db,$tabledefid = 0,$backurl = NULL){
 
@@ -57 +57 @@
         }
 
-        
+
         function showWeeklyOptions($therecord,$repeatbase){
                 if($therecord["repeattype"] == "Weekly")
@@ -63 +63 @@
                 else
                         $daysSelected = array(strftime("%u",$repeatbase));
-                        
+
                 $daysAvailable = array(7,1,2,3,4,5,6);
-                
+
                 foreach($daysAvailable as $dayNum){
                         $tempday = ($dayNum != 7)?($dayNum+1):(1);
-                        ?><button id="dayOption<?php echo $dayNum?>" class="<?php 
-                        
+                        ?><button id="dayOption<?php echo $dayNum?>" class="<?php
+
                         if(in_array($dayNum,$daysSelected))
-                                echo "pressed"; 
-                        
-                        ?>Buttons" type="button" value="<?php echo $dayNum?>" onclick="daySelect(this)"><?php 
-                        
+                                echo "pressed";
+
+                        ?>Buttons" type="button" value="<?php echo $dayNum?>" onclick="daySelect(this)"><?php
+
                         echo nl_langinfo(constant("ABDAY_".$tempday));
-                        
+
                         ?></button><?php
                 }
-                        
-                
+
+
         }
-        
+
         function showMonthlyOptions($therecord,$repeatbase){
                 if($therecord["repeattype"] == "Monthly" && $therecord["repeateachlist"])
@@ -88 +88 @@
                 else
                         $daysSelected = array(strftime("%e",$repeatbase));
-                        
-                
+
+
                 for($dayNum = 1; $dayNum <= 31; $dayNum++){
-                        ?><button id="monthDayOption<?php echo $dayNum?>" class="<?php 
-                        
+                        ?><button id="monthDayOption<?php echo $dayNum?>" class="<?php
+
                         if(in_array($dayNum,$daysSelected))
-                                echo "pressed"; 
-                        
-                        ?>Buttons monthDays" type="button" value="<?php echo $dayNum?>" onclick="monthDaySelect(this)" <?php 
-                        
+                                echo "pressed";
+
+                        ?>Buttons monthDays" type="button" value="<?php echo $dayNum?>" onclick="monthDaySelect(this)" <?php
+
                                 if($therecord["repeatontheday"])
                                         echo 'disabled="disabled"';
-                        
-                        ?>><?php 
-                        
+
+                        ?>><?php
+
                         echo $dayNum;
-                        
+
                         ?></button><?php
                         if(($dayNum % 7) == 0) echo "<br />";
-                }                       
-                
+                }
+
         }//end method
 
-        
+
         function showYearlyOptions($therecord,$repeatbase){
                 if($therecord["repeattype"] == "Yearly")
@@ -117 +117 @@
                 else
                         $monthsSelected = array(date("n",$repeatbase));
-                        
+
                 for($monthNum = 1; $monthNum <=12; $monthNum++){
-                        ?><button id="yearlyMonthOption<?php echo $monthNum?>" class="<?php 
-                        
+                        ?><button id="yearlyMonthOption<?php echo $monthNum?>" class="<?php
+
                         if(in_array($monthNum,$monthsSelected))
-                                echo "pressed"; 
-                        
-                        ?>Buttons yearlyMonths" type="button" value="<?php echo $monthNum?>" onclick="yearlyMonthSelect(this)"><?php 
-                        
+                                echo "pressed";
+
+                        ?>Buttons yearlyMonths" type="button" value="<?php echo $monthNum?>" onclick="yearlyMonthSelect(this)"><?php
+
                         echo nl_langinfo(constant("ABMON_".$monthNum));
-                        
+
                         ?></button><?php
                         if(($monthNum % 4) == 0) echo "<br />";
@@ -135 +135 @@
 
                 function newerRepeats($parentid,$id){
-        
+
                         if ($parentid=="NULL")
                                 $parentid=$id;
-                                
+
                         $querystatement="SELECT creationdate FROM notes WHERE id=".((int) $id);
                         $queryresult = $this->db->query($querystatement);
                         $therecord=$this->db->fetchArray($queryresult);
-                
+
                         $querystatement="SELECT id FROM notes WHERE completed=0 AND parentid=".((int) $parentid)." AND creationdate > '".$therecord["creationdate"]."'";
                         $queryresult = $this->db->query($querystatement);
-        
+
                         if($this->db->numRows($queryresult)) return true; else return false;
                 }
-        
-        
+
+
                 function resetRepeating($parentid){
-                        
+
                         $deletstatement="DELETE FROM notes WHERE completed=0 AND parentid=".$parentid;
                         $this->db->query($deletstatement);
-                        
+
                         $updatestatement="UPDATE notes SET parentid=NULL WHERE completed=1 AND parentid=".$parentid;
                         $queryresult = $this->db->query($updatestatement);
 
                 }
-        
-        
+
+
                 function updateTask($id,$completed,$type){
-                
+
                         if($completed)
                                 $compDate="CURDATE()";
                         else
                                 $compDate="NULL";
-                        
+
                         $querystatement="UPDATE notes SET completed=".((int) $completed)." , completeddate=".$compDate." WHERE id=".((int) $id);
                         $queryresult=$this->db->query($querystatement);
-                        
+
                         if($completed && $type == "TS")
                                 $this->repeatTask($id);
-                        
+
                         return "success";
-                        
-                }
-        
-                
+
+                }
+
+
                 function repeatTask($id, $dateToCheck = NULL){
-                        if($dateToCheck == NULL) 
-                                $dateToCheck = mktime(0,0,0);                           
+                        if($dateToCheck == NULL)
+                                $dateToCheck = mktime(0,0,0);
                         //see if we need to grab the parent
                         $querystatement = "SELECT parentid,repeating FROM notes WHERE id=".((int) $id);
@@ -191 +191 @@
                                         return false;
 
-                        $querystatement = "SELECT notes.repeattype, notes.repeatevery, notes.startdate, notes.enddate, notes.firstrepeat, 
+                        $querystatement = "SELECT notes.repeattype, notes.repeatevery, notes.startdate, notes.enddate, notes.firstrepeat,
                                                                 notes.lastrepeat,
-                                                                notes.timesrepeated, notes.repeatontheday, notes.repeatontheweek, notes.repeateachlist, 
+                                                                notes.timesrepeated, notes.repeatontheday, notes.repeatontheweek, notes.repeateachlist,
                                                                 notes.repeatuntil, notes.repeattimes
                                                                 FROM notes WHERE repeating=1 AND id=".((int) $id)." AND type='TS'
@@ -207 +207 @@
                                 else
                                         $startDate = stringToDate($therecord["startdate"],"SQL");
-                                
+
                                 if($dateToCheck <= $startDate)
                                         $dateToCheck = strtotime("tomorrow",$startDate);
 
                                 $dateArray = $this->getValidInRange($startDate,$dateToCheck,$therecord);
-                                
+
                                 foreach($dateArray as $date){
                                         if($date != $startDate){
@@ -219 +219 @@
                                                 else
                                                         $enddate = NULL;
-                                                        
+
                                                 $return = $this->createChildTask($id, $date, stringToDate($therecord["startdate"],"SQL"), $enddate );
                                                 if($return){
@@ -228 +228 @@
                                                                 $updatestatement .= "firstrepeat='".dateToString($date,"SQL")."',";
                                                         $updatestatement .="timesrepeated = timesrepeated+1 WHERE id =".$id;
-                                                        
+
                                                         $this->db->query($updatestatement);
 
@@ -235 +235 @@
                                         }//endif
                                 }//endforeach
-                                
+
                         }//endif
                 }//end method
-        
+
 
                 function getValidInRange($startDate,$endDate,$therecord){
                         $nextDate = $startDate;
-        
+
                         //should pad the end date to make sure we get all weekly repeats
                         $endDate = strtotime("+7 days",$endDate);
-                        
+
                         $validDates = array();
-                                        
+
                         while($nextDate <= $endDate){
-                                                
+
                                 switch($therecord["repeattype"]){
                                         case "Daily":
@@ -256 +256 @@
                                                 $nextDate = strtotime("+".$therecord["repeatevery"]." days",$nextDate);
                                                 break;
-                                                
-                                        case "Weekly":                                                                                  
+
+                                        case "Weekly":
                                                 //==================================================================================
                                                 $weekDayArray = explode("::",$therecord["repeateachlist"]);
-        
+
                                                 //need to start from the sunday of the current week
                                                 $tempDate = strtotime(nl_langinfo( constant("DAY_1") ),$nextDate);
                                                 $tempDate = strtotime("-7 days",$tempDate);
-                                                
+
                                                 foreach($weekDayArray as $weekday){
                                                         if($weekday == 7)
                                                                 $validDates[]=$tempDate;
                                                         else{
-                                                                $weekday++; 
+                                                                $weekday++;
                                                                 $validDates[] = strtotime(nl_langinfo( constant("DAY_".$weekday) ),$tempDate);
                                                         }
                                                 }// endforeach
-                                                                                                                                                                                        
-                                                
+
+
                                                 $nextDate = strtotime("+".$therecord["repeatevery"]." week",$nextDate);
-                                                
-                                                break;
-                                        
+
+                                                break;
+
                                         case "Monthly":
                                                 //==================================================================================
-                                                $dateArray = localtime($nextDate,true);                                         
+                                                $dateArray = localtime($nextDate,true);
                                                 $daysInMonth = date("d", mktime(0,0,0,$dateArray["tm_mon"],0,$dateArray["tm_year"]+1900) );
-                                                
+
                                                 if($therecord["repeateachlist"]){
                                                         $dayArray = explode("::",$therecord["repeateachlist"]);
-                                                        
+
                                                         foreach($dayArray as $theday)
-                                                                $validDates[] = mktime(0,0,0,$dateArray["tm_mon"]+1,$theday,$dateArray["tm_year"]+1900);                                                        
-                                                        
+                                                                $validDates[] = mktime(0,0,0,$dateArray["tm_mon"]+1,$theday,$dateArray["tm_year"]+1900);
+
                                                 } else{
                                                         // check for things like second tuesday or last friday;
                                                         $tempDate = mktime(0,0,0,$dateArray["tm_mon"]+1,1,$dateArray["tm_year"]+1900);
                                                         $weekday = $therecord["repeatontheday"];
-                                                        $weekday = ($weekday == 7)? 1: ($weekday+1);                                                    
+                                                        $weekday = ($weekday == 7)? 1: ($weekday+1);
                                                         if($therecord["repeatontheday"] != strftime("%u",$tempDate));
                                                                 $tempDate = strtotime(nl_langinfo( constant("DAY_".$weekday) ),$tempDate);
-                                                                
+
                                                         while(date("n",$tempDate) == ($dateArray["tm_mon"]+1)){
-                                                        
+
                                                                 if($therecord["repeatontheweek"] == 5){
                                                                         // 5 is the "last" option, so we just need to see if
@@ -305 +305 @@
                                                                         if($daysInMonth - date("d",$tempDate) < 7)
                                                                                 $validDates[] = $tempDate;
-                                                                                
+
                                                                 } else {
                                                                         if( ceil(date("d",$tempDate)/7) == $therecord["repeatontheweek"])
-                                                                                $validDates[] = $tempDate;                                                                              
+                                                                                $validDates[] = $tempDate;
                                                                 }// endif
-        
+
                                                                 $tempDate = strtotime("+7 days",$tempDate);
-        
+
                                                         }// endwhile
                                                 }//endif
-        
+
                                                 $nextDate = strtotime("+".$therecord["repeatevery"]." months", $nextDate);
                                                 break;
-                                                
+
                                         case "Yearly":
                                                 //==================================================================================
                                                 $monthArray = explode("::",$therecord["repeateachlist"]);
                                                 foreach($monthArray as $monthNum){
-                                                        $dateArray = localtime($nextDate,true);                                         
+                                                        $dateArray = localtime($nextDate,true);
                                                         $daysInMonth = date("d", mktime(0,0,0,$monthNum,0,$dateArray["tm_year"]+1900) );
-        
+
                                                         if(!$therecord["repeatontheday"]){
                                                                 $tempDay = ($dateArray["tm_mday"] > $daysInMonth)? $daysInMonth :$dateArray["tm_mday"];
                                                                 $validDates[] = mktime(0,0,0,$monthNum,$tempDay,$dateArray["tm_year"]+1900);
-        
+
                                                         } else {
                                                                 // check for things like second tuesday or last friday;
                                                                 $tempDate = mktime(0,0,0,$monthNum,1,$dateArray["tm_year"]+1900);
-                                                                
+
                                                                 $weekday = $therecord["repeatontheday"];
-                                                                $weekday = ($weekday == 7)? 1: ($weekday+1);                                                    
+                                                                $weekday = ($weekday == 7)? 1: ($weekday+1);
                                                                 if($therecord["repeatontheday"] != strftime("%u",$tempDate));
                                                                         $tempDate = strtotime(nl_langinfo( constant("DAY_".$weekday) ),$tempDate);
-                                                                
-                                                                
+
+
                                                                 while(date("n",$tempDate) == $monthNum){
                                                                         if($therecord["repeatontheweek"] == 5){
@@ -346 +346 @@
                                                                                 if($daysInMonth - date("d",$tempDate) < 7)
                                                                                         $validDates[] = $tempDate;
-                                                                                        
+
                                                                         } else {
                                                                                 if( ceil(date("d",$tempDate)/7) == $therecord["repeatontheweek"])
-                                                                                        $validDates[] = $tempDate;                                                                              
+                                                                                        $validDates[] = $tempDate;
                                                                         }// endif
-                
+
                                                                         $tempDate = strtotime("+7 days",$tempDate);
-                
+
                                                                 }// endwhile
-        
-                                                        }//endif                        
-        
+
+                                                        }//endif
+
                                                 }//endforeach
-        
+
                                                 $nextDate = strtotime("+".$therecord["repeatevery"]." years",$nextDate);
-        
+
                                                 break;
                                 }//endswitch
-                                                        
+
                         }//end while
-                        
+
                         return $validDates;
-                        
+
                 }//end method
-                
+
 
                 function createChildTask($parentid, $newdate, $startdate, $enddate=NULL){
-                        
+
                         //let's check to see if the new task already exists
                         $querystatement = "SELECT id FROM notes WHERE parentid=".$parentid." AND startdate='".dateToString($newdate,"SQL")."'";
@@ -379 +379 @@
                         if($this->db->numRows($queryresult))
                                 return false;
-                                                                
+
                         $newenddate="NULL";
-                        if($enddate)                    
+                        if($enddate)
                                 $newenddate="\"".dateToString($newdate+($enddate-$startdate),"SQL")."\"";
-                                                
+
                         $querystatement="SELECT id,type,subject,content,status,starttime,private,modifiedby,location,importance,endtime,CURDATE() as creationdate,createdby,category,
                                                 attachedtabledefid,attachedid,assignedtoid,assignedtodate,assignedtotime,assignedbyid
                                                 FROM notes WHERE id=".$parentid;
                         $queryresult=$this->db->query($querystatement);
-        
+
                         $therecord=$this->db->fetchArray($queryresult);
-                
+
                         $querystatement="SELECT id FROM notes WHERE parentid=".((int) $parentid)." AND completed=0 AND startdate=\"".dateToString($newdate,"SQL")."\"";
                         $queryresult=$this->db->query($querystatement);
-        
+
                         if($this->db->numRows($queryresult))
-                                return false;           
-                        
+                                return false;
+
                         if(!$therecord["assignedtoid"])
                                 $therecord["assignedtoid"]="NULL";
-                                                
+
                         $querystatement="INSERT INTO notes (parentid,startdate,enddate,completed,completeddate,
                                                 type,subject,content,status,starttime,private,modifiedby,location,importance,endtime,creationdate,createdby,category,
@@ -412 +412 @@
                         else
                                 $querystatement.="NULL, ";
-                        
+
                         $querystatement.=$therecord["private"].", ";
                         $querystatement.=$therecord["modifiedby"].", ";
@@ -430 +430 @@
                                 $querystatement.="\"".$therecord["assignedtodate"]."\", ";
                         else
-                                $querystatement.="NULL, ";                      
+                                $querystatement.="NULL, ";
                         if($therecord["assignedtotime"])
                                 $querystatement.="\"".$therecord["assignedtotime"]."\", ";
@@ -436 +436 @@
                                 $querystatement.="NULL, ";
                         $querystatement.=$therecord["assignedbyid"].") ";
-                        
+
                         $queryresult=$this->db->query($querystatement);
-                        
+
                         return true;
                 }//end method
-        
-        
+
+
                 function getAttachedTableDefInfo($id){
                         if($id){
@@ -452 +452 @@
                                 $therecord["editfile"]="";
                         }
-                                        
-                        return $therecord;      
-                }
-        
-        
+
+                        return $therecord;
+                }
+
+
                 //CLASS OVERRIDES =============================================================================
-        
+
                 function getDefaults(){
                         $therecord = parent::getDefaults();
-                        
+
                         if(isset($_GET["ty"]))
                                 $therecord["type"]=$_GET["ty"];
                         else
                                 $therecord["type"]="NT";
-        
+
                         $therecord["private"]=true;
-        
+
                         $therecord["attachedtabledefid"]=(isset($_GET["tabledefid"]))?$_GET["tabledefid"]:NULL;
                         $therecord["attachedid"]=(isset($_GET["refid"]))?$_GET["refid"]:NULL;
@@ -476 +476 @@
                                 $therecord["attachedid"]=$_GET["cid"];
                         }
-        
+
                         $therecord["repeatevery"] = 1;
                         $therecord["repeattype"] = "Daily";
-                        
+
                         return $therecord;
                 }
-                
-                
-                function formatVariables($variables,$userid){
+
+
+                function verifyVariables($variables){
+
+                        //table default ok
+                        if(isset($variables["type"])){
+                                switch($variables["type"]){
+
+                                        case "NT":
+                                        case "TS":
+                                        case "EV":
+                                                break;
+
+                                        case "SM":
+                                                //for system message, not private
+                                                if(isset($variables["private"]))
+                                                        if($variables["private"])
+                                                                $this->verifyErrors[] = "For records with `type` of 'SM' (System Message), the `private
+                                                                                                field must be equivalent to 0.";
+                                                break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The `type` field given is not an acceptable value. Acceptable values are 'NT', 'TS', 'EV', or 'SM'";
+                                                break;
+
+                                }//end switch
+                        }//end if
+
+                        //Doesn't need to be set... only used if repeating
+
+                        if(isset($variables["repeat"]))
+                                if($variables["repeat"])
+                                        if(isset($variables["startdate"])){
+                                                if($variables["startdate"]){
+
+                                                }else
+                                                        $this->verifyErrors[] = "If a `note` record is set to repeat it must also have a `startdate`.";
+                                        }else
+                                                $this->verifyErrors[] = "If a `note` record is set to repeat it must also have a `startdate`.";
+
+                        if(isset($variables["repeattype"]))
+                                if($variables["repeattype"])//it can be "" or NULL
+                                        switch($variables["repeattype"]){
+
+
+                                                case "Daily":
+                                                case "Weekly":
+                                                case "Monthly":
+                                                case "Yearly":
+                                                        break;
+
+                                                default:
+                                                        $this->verifyErrors[] = "The `repeatetype` field given is not an acceptable value.
+                                                                                        Acceptable values are 'Daily', 'Weekly', 'Monthly', or 'Yearly'";
+                                                        break;
+
+                                        }//end switch
+
+
+                        //check booleans
+                        if(isset($variables["completed"]))
+                                if($variables["completed"] && $variables["completed"] != 1)
+                                        $this->verifyErrors[] = "The `completed` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["private"]))
+                                if($variables["private"] && $variables["private"] != 1)
+                                        $this->verifyErrors[] = "The `private` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["repeating"]))
+                                if($variables["repeating"] && $variables["repeating"] != 1)
+                                        $this->verifyErrors[] = "The `repeating` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
+                function prepareVariables($variables,$userid = NULL){
+
+                        if($userid == NULL)
+                                if(isset($_SESSION["userinfo"]["id"]))
+                                        $userid = $_SESSION["userinfo"]["id"];
+
+                                if($variables["id"]){ //i.e. only on update
+
+                                        unset($this->fields["type"]);
+
+                                        if($variables["typeCheck"]=="TS" && isset($variables["repeating"]) && $variables["lastrepeat"]){
+                                                $variables["lastrepeat"] = NULL;
+                                                $variables["firstrepeat"] = NULL;
+                                                $variables["timesrepeated"] = NULL;
+
+                                                if(isset($variables["completed"]))
+                                                        $variables["completedChange"] = 0;
+
+                                                $this->resetRepeating($variables["id"]);
+                                        }//end if
+
+                                }//end if
 
                                 if(isset($variables["thetype"]))
                                         $variables["type"] = $variables["thetype"];
-                                
+
                                 if(!isset($variables["completed"]))
                                         $variables["completeddate"] = NULL;
-        
+
                                 if($variables["enddate"] == "") {
                                         $variables["enddate"] = NULL;
                                         $variables["endtime"] = NULL;
                                 }
-        
+
                                 if($variables["startdate"] == "") {
                                         $variables["startdate"] = NULL;
                                         $variables["starttime"] = NULL;
                                 }
-                                
+
                                 if(isset($variables["repeating"])) {
-                                        
+
                                         $thename="Every ";
-                                                                        
+
                                         switch($variables["repeattype"]){
                                                 case "Daily":
@@ -512 +608 @@
                                                         else
                                                                 $thename .= " day ";
-                                                        
+
                                                         $variables["repeatechlist"] = NULL;
                                                         $variables["repeatontheday"] = NULL;
                                                         $variables["repeatontheweek"] = NULL;
                                                 break;
-                        
+
                                                 case "Weekly":
                                                         if($variables["repeatevery"] != 1)
@@ -523 +619 @@
                                                         else
                                                                 $thename .= "week on";
-                                                                
+
                                                         foreach(explode("::",$variables["eachlist"]) as $dayNum){
                                                                 $tempday = ($dayNum != 7)?($dayNum+1):(1);
@@ -529 +625 @@
                                                         }
                                                         $thename = substr($thename,0,strlen($thename)-2);
-                        
+
                                                         if(strpos($thename,",") != false)
                                                                 $thename = strrev(preg_replace("/,/","dna ",strrev($thename),1));
-                                                        
+
                                                         $variables["repeateachlist"] = $variables["eachlist"];
                                                         $variables["repeatontheday"] = NULL;
                                                         $variables["repeatontheweek"] = NULL;
                                                 break;
-                        
-                                                case "Monthly":                 
+
+                                                case "Monthly":
                                                         if($variables["repeatevery"] != 1)
                                                                 $thename .= $variables["repeatevery"]." months";
                                                         else
                                                                 $thename .= "month";
-                        
+
                                                         $thename .= " on the";
                                                         if($variables["monthlyWhat"] == 1){
-                                                        
+
                                                                 foreach(explode("::",$variables["eachlist"]) as $dayNum)
                                                                         $thename .=" ".ordinal($dayNum).", ";
-                        
+
                                                                 $thename = substr($thename,0,strlen($thename)-2);
-                        
+
                                                                 if(strpos($thename,",") != false)
                                                                         $thename = strrev(preg_replace("/,/","dna ",strrev($thename),1));
-                        
+
                                                                 $variables["repeateachlist"] = $variables["eachlist"];
                                                                 $variables["repeatontheday"] = NULL;
@@ -562 +658 @@
                                                                         if($value == $variables["monthlyontheweek"])
                                                                                 $thename .= " ".strtolower($key);
-                        
+
                                                                 foreach($this->dayOfWeekArray as $key=>$value)
                                                                         if($value == $variables["monthlyontheday"])
@@ -572 +668 @@
                                                         }
                                                 break;
-                                                
+
                                                 case "Yearly":
                                                         if($variables["repeatevery"] > 1)
@@ -578 +674 @@
                                                         else
                                                                 $thename .= "year";
-                                                        
+
                                                         $thename .= " in";
-                                                        
+
                                                         foreach(explode("::",$variables["eachlist"]) as $monthNum)
                                                                 $thename .=" ".nl_langinfo(constant("MON_".$monthNum)).", ";
-                                                                
+
                                                         $thename = substr($thename,0,strlen($thename)-2);
                                                         if(strpos($thename,",") != false)
                                                                 $thename = strrev(preg_replace("/,/","dna ",strrev($thename),1));
-                                                                
+
                                                         $variables["repeateachlist"] = $variables["eachlist"];
-                        
+
                                                         if(isset($variables["yearlyOnThe"])){
                                                                 $thename .= " on the";
@@ -595 +691 @@
                                                                         if($value == $variables["yearlyontheweek"])
                                                                                 $thename .= " ".strtolower($key);
-                                                                
+
                                                                 foreach($this->dayOfWeekArray as $key=>$value)
                                                                         if($value == $variables["yearlyontheday"])
                                                                                 $thename .= " ".$key;
-                        
+
                                                                 $variables["repeatontheday"] = $variables["yearlyontheday"];
                                                                 $variables["repeatontheweek"] = $variables["yearlyontheweek"];
 
                                                         } else {
-                                                        
+
                                                                 $variables["repeatontheday"] = NULL;
                                                                 $variables["repeatontheweek"] = NULL;
-                                                                
+
                                                         }//end if
                                                 break;
                                         }
-                        
+
                                         switch($variables["repeatend"]){
                                                 case "never":
@@ -617 +713 @@
                                                         $variables["repeattimes"] = NULL;
                                                         break;
-                                                        
+
                                                 case "after":
                                                         $thename .= " for ".$variables["repeattimes"];
-                                                        
+
                                                         $variables["repeatuntil"] = NULL;
                                                         break;
-                                                        
+
                                                 case "on date":
                                                         $thename .= " until ".$variables["repeatuntil"];
@@ -631 +727 @@
                                         $thename = trim($thename).".";
                                         $variables["repeatname"] = $thename;
-                                        
+
                                         $variables["firstrepeat"] = dateToString(stringToDate($variables["firstrepeat"],"SQL"));
                                         $variables["lastrepeat"] = dateToString(stringToDate($variables["lastrepeat"],"SQL"));;
-                                        $variables["timesrepeated"] = NULL;                                     
-                                                                
+                                        $variables["timesrepeated"] = NULL;
+
                                 }else {
 
@@ -645 +741 @@
                                         $variables["repeatuntil"] = NULL;
                                         $variables["repeattimes"] = NULL;
-                                        
+
                                         $variables["firstrepeat"] = NULL;
                                         $variables["lastrepeat"] = NULL;
@@ -654 +750 @@
                                 if($variables["assignedtoid"] != $variables["assignedtochange"]){
                                         if($variables["assignedtoid"] != "")
-                                                $variables["assignedbyid"] = $userid; 
+                                                $variables["assignedbyid"] = $userid;
                                         else
-                                                $variables["assignedbyid"] = 0; 
+                                                $variables["assignedbyid"] = 0;
                                 }//endif
 
                         return $variables;
+
                 }//end method
-                
-                
+
+
                 function updateRecord($variables, $modifiedby = NULL){
-                        
-                        if($modifiedby == NULL)
-                                $modifiedby = $_SESSION["userinfo"]["id"];
-                        
-                        if($variables["typeCheck"]=="TS" && isset($variables["repeating"]) && $variables["lastrepeat"]){
-                                $variables["lastrepeat"] = NULL;
-                                $variables["firstrepeat"] = NULL;
-                                $variables["timesrepeated"] = NULL;
-                                
-                                if(isset($variables["completed"]))
-                                        $variables["completedChange"] = 0;
-                                        
-                                $this->resetRepeating($variables["id"]);
-                        }
-                        
-                        $variables = $this->formatVariables($variables,$modifiedby);
-
-                        parent::updateRecord($variables, $modifiedby);
-
-                        if($variables["typeCheck"]=="TS" && isset($variables["completed"]) && $variables["completedChange"]==0) {                               
+
+                        $thereturn = parent::updateRecord($variables, $modifiedby);
+
+                        $this->getTableInfo();
+
+                        if($variables["typeCheck"]=="TS" && isset($variables["completed"]) && $variables["completedChange"]==0) {
                                         if($variables["parentid"]){
                                                 if(!$this->newerRepeats($variables["parentid"],$variables["id"])){
                                                         $this->repeatTask($variables["parentid"]);
                                                 }
-                                                        
+
                                         } elseif(isset($variables["repeating"])) {
                                                 if(!$this->newerRepeats($variables["id"],$variables["id"])){
                                                         $this->repeatTask($variables["id"]);
                                                 }
-                                                        
+
                                         }//endif elseif
-                        }//endif                                                
-                                                
+                        }//endif
+
+                        return $thereturn;
+
                 }//end endmethod
 
-        
+
                 function insertRecord($variables, $createdby = NULL){
-                        
-                        if($createdby == NULL)
-                                $createdby = $_SESSION["userinfo"]["id"];
-                        
-                        $variables = $this->formatVariables($variables,$createdby);
-                
+
                         $newid = parent::insertRecord($variables, $createdby);
-                        
+
                         if(isset($variables["completed"]) && isset($variables["repeating"]))
                                 $this->repeatTask($newid);
-                        
+
                         return $newid;
                 }//end method
-        
+
         }//end class
 }//end if
@@ -722 +802 @@
 
                 function mark_asread(){
-                
+
                         //passed variable is array of user ids to be revoked
                         $whereclause = $this->buildWhereClause();
-                        
+
                         $querystatement = "UPDATE notes SET notes.completed=1,modifiedby=\"".$_SESSION["userinfo"]["id"]."\" WHERE (".$whereclause.") AND type!=\"SM\";";
                         $queryresult = $this->db->query($querystatement);
@@ -732 +812 @@
 
                         $message.=" marked as completed/read.";
-                        
+
                         //for repeatable tasks, need to repeat dem!
                         $querystatement="SELECT id,parentid FROM notes WHERE type='TS' AND ((parentid IS NOT NULL AND parentid!=0 ) OR `repeating`=1) AND (".$whereclause.")";
                         $queryresult = $this->db->query($querystatement);
                         if ($this->db->numRows($queryresult)){
-                        
+
                                 $thetable = new notes($this->db,12);
 
                                 while($therecord=$db->fetchArray($queryresult)){
-                                        if($variables["parentid"])                                      
+                                        if($variables["parentid"])
                                                 if(!$thetable->newerRepeats($therecord["parentid"],$therecord["id"]))
                                                         $thetable->repeatTask($therecord["parentid"]);
@@ -748 +828 @@
                                                         $thetable->repeatTask($therecord["id"]);
                                 }//endwhile
-                                
+
                         }//endif
-                                        
+
                         return $message;
                 }
-                
-                
+
+
                 //delete notes
                 function delete_record(){
-                        
+
                         //passed variable is array of user ids to be revoked
                         $whereclause = $this->buildWhereClause("notes.id");
-                
+
                         //we need to check for incomplete repeatable child tasks
                         $querystatement="SELECT notes.id, notes.parentid, notes.repeating, notes.completed
                         FROM notes WHERE (".$whereclause.") AND ((notes.createdby=".$_SESSION["userinfo"]["id"]." OR notes.assignedtoid=".$_SESSION["userinfo"]["id"].")
                                                                  OR (".$_SESSION["userinfo"]["admin"]." =1))";
-                                                                 
+
                         $repeatqueryresult = $this->db->query($querystatement);
-                                        
+
                         //repeat where applicable
                         if ($this->db->numRows($repeatqueryresult)){
-                
+
                                 $thetable = new notes($this->db,12);
-                                
+
                                 $repeatArray=array();
                                 $orphanArray= array();
                                 while($therecord=$this->db->fetchArray($repeatqueryresult)){
-                                
+
                                         if($therecord["parentid"] && $therecord["completed"] == 0){
                                                 $repeatArray[] = array("parentid" => $therecord["parentid"], "id"=> $therecord["id"]);
@@ -782 +862 @@
                                                 $orphanArray[] = array("id" => $therecord["id"]);
                                         }//endif elseif
-                                        
+
                                 }//endwhile
-                                
+
                                 foreach($repeatArray as $repeat){
                                         if (!in_array($repeat["parentid"],$orphanArray))
@@ -790 +870 @@
                                                         $thetable->repeatTask($repeat["parentid"]);
                                 }//end foreach
-                                
+
                                 foreach($orphanArray as $orphaner){
                                         $thetable->resetRepeating($orphaner);
                                 }
-                                
+
                         }//end if
 
-                        $querystatement = "DELETE FROM notes WHERE 
+                        $querystatement = "DELETE FROM notes WHERE
                                                                 ((notes.createdby=".$_SESSION["userinfo"]["id"]." OR notes.assignedtoid=".$_SESSION["userinfo"]["id"].")
-                                                                 OR (".$_SESSION["userinfo"]["admin"]." =1)) 
+                                                                 OR (".$_SESSION["userinfo"]["admin"]." =1))
                                                                  AND (".$whereclause.")";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $message = $this->buildStatusMessage();
                         $message.=" deleted";
-                        
+
                         return $message;
-                
-                }       
-        
+
+                }
+
         }//end class
 }//end if

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class relationships extends phpbmsTable{
-                
+
+                var $availableTabledefIDs = array();
+                var $availableTabledefNames = array();
+
+                //function populateds the tabledef ids
+                //and the tabledef names corresponding to those ids
+                function populateTabledefArrays(){
+
+                        $this->availableTabledefIDs = array();
+                        $this->availableTabledefNames = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`,
+                                        `displayname`
+                                FROM
+                                        `tabledefs`
+                                WHERE
+                                        `type` != 'view'
+                                ORDER BY
+                                        `displayname`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult)){
+
+                                        $this->availableTabledefIDs[] = $therecord["id"];
+                                        $this->availableTabledefNames[] = $therecord["displayname"];
+
+                                }//end while
+                        }else{
+                                //if no valid id/names, I put in a value that will
+                                //give the arrays a count but not actually match any integers
+                                $this->availableTabledefIDs[] = "none";
+                                $this->availableTabledefNames[] = "none";
+                        }//end if
+
+                }//end method --populateArrays--
+
+
+                function verifyVariables($variables){
+
+                        //cannot be table default ("")
+                        if(isset($variables["tofield"])){
+                                if($variables["tofield"] === "" || $variables["tofield"] === NULL)
+                                        $this->verifyErrors[] = "The `tofield` field cannot be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `tofield` field must be set.";
+
+                        //cannot be table default ("")
+                        if(isset($variables["fromfield"])){
+                                if($variables["fromfield"] === "" || $variables["fromfield"] === NULL)
+                                        $this->verifyErrors[] = "The `from` field cannot be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `fromfield` field must be set.";
+
+                        //cannot be table default (0)
+                        if(isset($variables["fromtableid"])){
+
+                                //must be a positive number
+                                if(((int) $variables["fromtableid"]) > 0 ){
+
+                                        if(!count($this->availableTabledefIDs))
+                                                $this->populateTableDefArrays();
+
+                                        if(!in_array(((int)$variables["fromtableid"]), $this->availableTabledefIDs))
+                                                $this->verifyErrors[] = "The `fromtableid` field does not give an existing/acceptable parent id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `fromtableid` field must be a positive number.";
+
+                        }else
+                                $this->verifyErrors[] = "The `fromtableid` field must be set.";
+
+                        //cannot be table default (0)
+                        if(isset($variables["totableid"])){
+
+                                //must be a positive number
+                                if(((int) $variables["totableid"]) > 0 ){
+
+                                        if(!count($this->availableTabledefIDs))
+                                                $this->populateTableDefArrays();
+
+                                        if(!in_array(((int)$variables["totableid"]), $this->availableTabledefIDs))
+                                                $this->verifyErrors[] = "The `totableid` field does not give an existing/acceptable to table id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `totableid` field must be a positive number.";
+                        }else
+                                $this->verifyErrors[] = "The `totableid` field must be set.";
+
+                        //check boolean
+                        if(isset($variables["inherit"]))
+                                if($variables["inherit"] && $variables["inherit"] != 1)
+                                        $this->verifyErrors[] = "The `inherit` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
                 function displayTables($fieldname,$selectedid){
-                        
-                        $querystatement="SELECT id, displayname FROM tabledefs WHERE type!=\"view\" ORDER BY displayname";
-                        $thequery=$this->db->query($querystatement);
-                        
+
+                        if(!count($this->availableTabledefIDs) || !count($this->availableTabledefNames))
+                                $this->populateTabledefArrays();
+
                         echo "<select id=\"".$fieldname."\" name=\"".$fieldname."\">\n";
-                        while($therecord=$this->db->fetchArray($thequery)){
-                                echo "  <option value=\"".$therecord["id"]."\"";
-                                        if($selectedid==$therecord["id"]) echo " selected=\"selected\"";
-                                echo ">".$therecord["displayname"]."</option>\n";
+
+                        for($i = 0; $i < count($this->availableTabledefIDs); $i++){
+                                echo "  <option value=\"".$this->availableTabledefIDs[$i]."\"";
+                                        if($selectedid==$this->availableTabledefIDs[$i]) echo " selected=\"selected\"";
+                                echo ">".$this->availableTabledefNames[$i]."</option>\n";
                         }
-                
+
                         echo "</select>\n";
                 }
-        
+
         }//end class
 }//end if

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")) {
         class reports extends phpbmsTable{
-        
+
+                var $availableTabledefIDs = array();
+                var $availableRoleIDs = array();
+
                 function getDefaults(){
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["type"]="report";
-                        
+
                         return $therecord;
-                        
+
                 }
-        
+
+                //populates tabledef id array
+                function populateTabledefArray(){
+
+                        $this->availableTabledefIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `tabledefs`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        //This is for the "global" option
+                        $this->availableTabledefIDs[] = 0;
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableTabledefIDs[] = $therecord["id"];
+
+
+
+                }//end method --populateRoleArray--
+
+                //populates role id array
+                function populateRoleArray(){
+
+                        $this->availableRoleIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `roles`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        //These two are added for no restriction on the role (0) and for
+                        //administrative restrictioin (-100)
+                        $this->availableRoleIDs[] = 0;
+                        $this->availableRoleIDs[] = -100;
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableRoleIDs[] = $therecord["id"];
+
+                }//end method --populateRoleArray--
+
+
+                function verifyVariables($variables){
+
+                        //cannot be table default ("")
+                        if(isset($variables["reportfile"])){
+                                if($variables["reportfile"] === "" || $variables["reportfile"] === NULL)
+                                        $this->verifyErrors[] = "The `reportfile` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `reportfile` field must be set.";
+
+                        //Table default (NULL) OK
+                        if(isset($variables["type"]))
+                                if($variables["type"])//don't care if it's ""
+                                        switch($variables["type"]){
+                                                case "report":
+                                                case "PDF Report":
+                                                case "export":
+                                                        break;
+
+                                                default:
+                                                        $this->verifyErrors[] = "The `type` field is not an accepted value.  It must be 'report', 'PDF Report', or 'export.";
+                                                break;
+
+                                        }//end switch
+
+                        //Table Default (0) ok becuase it means report is globally available to any table
+                        if(isset($variables["tabledefid"])){
+
+                                //must be a non-negative number or NULL/""
+                                if( (!$variables["tabledefid"]) || ((int)$variables["tabledefid"]) > 0 ){
+
+                                        if(!count($this->availableTabledefIDs))
+                                                $this->populateTabledefArray();
+
+                                        if( !in_array((int)$variables["tabledefid"], $this->availableTabledefIDs) )
+                                                $this->verifyErrors[] = "The `tabledefid` field does not give an existing/acceptable to table definition id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `tabledefid` field must be either a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        //Table Default (0) ok becuase it means report is globally available to any user
+                        if(isset($variables["roleid"])){
+
+                                //must be a number or NULL/""
+                                if(is_numeric($variables["roleid"]) || !$variables["roleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if( !in_array((int)$variables["roleid"], $this->availableRoleIDs) )
+                                                $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable to role id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `roleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        return parent::verifyVariables($variables);
+
+                }//end method
+
+
                 function displayTables($fieldname,$selectedid){
-                        
+
                         $querystatement="SELECT id, displayname FROM tabledefs ORDER BY displayname";
-                        $thequery=$this->db->query($querystatement);            
-                                
+                        $thequery=$this->db->query($querystatement);
+
                         echo "<select id=\"".$fieldname."\" name=\"".$fieldname."\">\n";
-                
+
                         echo "<option value=\"0\" ";
                         if ($selectedid=="0") echo "selected=\"selected\"";
                         echo " style=\"font-weight:bold\">global</option>\n";
-                
+
                         while($therecord=$this->db->fetchArray($thequery)){
                                 echo "  <option value=\"".$therecord["id"]."\"";
@@ -65 +180 @@
                                 echo ">".$therecord["displayname"]."</option>\n";
                         }
-                
+
                         echo "</select>\n";
                 }//end method
-        
+
         }//end class
 }//end if

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class roles extends phpbmsTable{
-        
+                
                 function updateRecord($variables, $modifiedby = NULL){  
                         parent::updateRecord($variables, $modifiedby);

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class schedulers extends phpbmsTable{
-        
+
+                var $availableRoleIDs = array();
+
                 function getDefaults(){
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["crontab"]="*::*::*::*::*";
-        
+
                         $therecord["min"]="*";
                         $therecord["hrs"]="*";
@@ -50 +52 @@
                         $therecord["mo"]="*";
                         $therecord["day"]="*";
-                        
-                        $therecord["startdate"]=dateToString(mktime(),"SQL");
-                        $therecord["starttime"]="";
-                
+
+                        $therecord["startdate"] = dateToString(mktime(),"SQL");
+                        $therecord["starttime"] = sqlTimeFromString(timeToString(time()));
+
                         $therecord["enddate"]="";
                         $therecord["endtime"]="";
-                        
+
                         return $therecord;
-                        
+
                 }//end method
-        
-                
+
+
                 function getRecord($id = 0){
                         $therecord = parent::getRecord($id);
-                        
+
                         $datearray=explode(" ",$therecord["startdatetime"]);
                         $therecord["startdate"]=$datearray[0];
                         if(isset($datearray[1])) $therecord["starttime"]=$datearray[1]; else $therecord["starttime"]="";
-                        
+
                         $datearray=explode(" ",$therecord["enddatetime"]);
                         $therecord["enddate"]=$datearray[0];
                         if(isset($datearray[1])) $therecord["endtime"]=$datearray[1]; else $therecord["endtime"]="";
-                
+
                         $cronarray=explode("::",$therecord["crontab"]);
                         if(isset($cronarray[0])) $therecord["min"]=$cronarray[0]; else $therecord["min"]="*";
@@ -79 +81 @@
                         if(isset($cronarray[3])) $therecord["mo"]=$cronarray[3]; else $therecord["mo"]="*";
                         if(isset($cronarray[4])) $therecord["day"]=$cronarray[4]; else $therecord["day"]="*";
-                        
+
                         $therecord["lastrun"]=formatFromSQLDatetime($therecord["lastrun"]);
-                        
+
                         return $therecord;
-        
+
                 }//end method
-                
-        
+
+
+                function verifyVariables($variables){
+
+                        //must have the file that has the job that will
+                        //be run.
+                        if(isset($variables["job"])){
+                                if(!$variables["job"] === "" || $variables["job"] === NULL)
+                                        $this->verifyErrors[] = "The `job` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `job` field must be set.";
+
+                        //checks to see if crontab is in the (somewhat) right format
+                        if(isset($variables["crontab"])){
+                                $explode = explode("::", $variables["crontab"]);
+                                if(count($explode) != 5)
+                                        $this->verifyErrors[] = "The `crontab` field is not of the proper form.  There must be four pairs of '::' in the field's value.";
+                        }//end if
+
+                        return parent::verifyVariables($variables);
+
+                }//end method
+
+
                 function prepareVariables($variables){
-        
+
                         $temparray[0]=$variables["min"];
                         $temparray[1]=$variables["hrs"];
@@ -95 +119 @@
                         $temparray[4]=$variables["day"];
                         $variables["crontab"]=implode("::",$temparray);
-        
+
                         if($variables["startdate"]){
                                 $variables["startdatetime"] = $variables["startdate"];
                                 if($variables["starttime"])
                                         $variables["startdatetime"] .= " ".$variables["starttime"];
-                        }
-                        else
+                        }else
                                 $variables["startdatetime"] = NULL;
-                
+
+
                         if($variables["enddate"]){
                                 $variables["enddatetime"] = $variables["enddate"];
                                 if($variables["endtime"])
                                         $variables["enddatetime"].=" ".$variables["endtime"];
-                        }
-                        else
-                                $variables["enddatetime"] = NULL; 
-        
-                
+                        }else
+                                $variables["enddatetime"] = NULL;
+
+
                         return $variables;
                 }
-                
-                
-                function updateRecord($variables, $modifiedby = NULL){
-        
-                        $variables = $this->prepareVariables($variables);
-                
-                        return parent::updateRecord($variables, $modifiedby);
-                }
-        
-        
-                function insertRecord($variables, $createdby = NULL){
-        
-                        $variables = $this->prepareVariables($variables);
-                
-                        return parent::insertRecord($variables, $createdby);
-                }
-                
+
         }//end class
 }//end if

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

@@ -69 +69 @@
                 if($this->db->numRows($queryresult)){ ?>
 
-                <div class="box" id="systemMessageContainer">
+                <div id="systemMessageContainer">
                         <h2>System Messages</h2>
                         <?php while($therecord = $this->db->fetchArray($queryresult)) {
@@ -76 +76 @@
 
                         ?>
-                        <h3 class="systemMessageLinks"><?php echo htmlQuotes($therecord["subject"])?> <span>[ <?php echo htmlQuotes(formatFromSQLDateTime($therecord["creationdate"]))?> <?php echo htmlQuotes($therecord["createdby"])?>]</span></h3>
-                        <div class="systemMessages">
-                                <p><?php echo $therecord["content"]?></p>
-                        </div>
+                                <div class="systemMessageLinks">
+                                        <h3><?php echo htmlQuotes($therecord["subject"])?></h3>
+                                        <div>by <?php echo htmlQuotes($therecord["createdby"])?> on <?php echo htmlQuotes(formatFromSQLDateTime($therecord["creationdate"]))?></div>
+                                </div>
+                                <div class="systemMessages"><p><?php echo $therecord["content"]?></p></div>
                         <?php }//end while ?>
                 </div>
@@ -113 +114 @@
 
                                 $querystatement.="
-                                        assignedtoid = ".$this->userid."
-                                         OR (
-                                                type = 'TS'
-                                                AND (assignedtoid = 0 OR assignedtoid IS NULL)
-                                                AND createdby = ".$this->userid."
-                                        ) AND (completed = 0
-                                                OR (completed = 1 AND completeddate >= CURDATE())
+                                        ((
+                                                assignedtoid = ".$this->userid."
+                                                OR      (
+                                                        type = 'TS'
+                                                        AND (assignedtoid = 0 OR assignedtoid IS NULL)
+                                                        AND createdby = ".$this->userid."
+                                                        )
+                                        )
+                                                AND     (
+                                                        completed = 0
+                                                        OR      (
+                                                                completed = 1
+                                                                AND completeddate >= CURDATE()
+                                                                )
+                                                        )
                                         )";
 
@@ -129 +138 @@
 
                                 $querystatement.="
-                                        assignedbyid = ".$this->userid."
+                                        (assignedbyid = ".$this->userid."
                                         AND (completed = 0
                                                 OR (completed = 1 AND completeddate >= CURDATE())
-                                        )";
+                                        ))";
 
                                 $title = "Delegations";
@@ -142 +151 @@
 
                 $querystatement.="AND (
-                                        (startdate IS NULL AND enddate IS NULL AND assignedtodate IS NULL) OR
-                                        (startdate IS NOT NULL AND startdate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY)) OR
-                                        (enddate IS NOT NULL AND enddate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY)) OR
-                                        (assignedtodate IS NOT NULL AND assignedtodate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                        (startdate IS NULL AND enddate IS NULL AND assignedtodate IS NULL)
+
+                                        OR (
+                                                (startdate IS NOT NULL AND startdate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                                AND (
+                                                        (enddate IS NOT NULL AND enddate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                                        OR (assignedtodate IS NOT NULL AND assignedtodate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                                )
+                                        )
                                    )";
 
@@ -234 +248 @@
                                                                 case "Now":
                                                                         $section["title"] = "Soon";
-                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d")+7,date("Y"));;
+                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d")+7,date("Y"));
                                                                         break;
 
                                                                 case "Soon":
                                                                         $section["title"] = "Later";
-                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d")+31,date("Y"));;
+//                                                                      $section["date"] = mktime(0,0,0,date("m"),date("d")+31,date("Y"));
+                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d"),2038);
                                                                         break;
 

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class tableDefinitions extends phpbmsTable{
-        
+
+                var $availableRoleIDs = array();
+
                 function getDefaults(){
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["moduleid"]=1;
                         $therecord["deletebutton"]="delete";
@@ -50 +52 @@
                         $therecord["advsearchroleid"]=-100;
                         $therecord["viewsqlroleid"]=-100;
-                        
+
                         return $therecord;
                 }
-                
+
+                //populates $this->availableRoleIDs
+                function populateRoleArray(){
+
+                        $this->availableRoleIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `roles`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableRoleIDs[] = 0;//for everyone
+                        $this->availableRoleIDs[] = -100;//for administrators
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableRoleIDs[] = $therecord["id"];
+
+                }//end method --populateRoleArray--
+
+
+                function verifyVariables($variables){
+
+
+                        //the following ifs are constructed in such a way as to allow
+                        //the integer 0 as an acceptable value
+
+                        if(isset($variables["maintable"])){
+                                if($variables["maintable"] === "" || $variables["maintable"] === NULL)
+                                        $this->verifyErrors[] = "The `maintable` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `maintable` field must be set.";
+
+                        if(isset($variables["addfile"])){
+                                if($variables["addfile"] === "" || $variables["addfile"] === NULL)
+                                        $this->verifyErrors[] = "The `addfile` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `addfile` field must be set.";
+
+                        if(isset($variables["editfile"])){
+                                if($variables["editfile"] === "" || $variables["editfile"] === NULL)
+                                        $this->verifyErrors[] = "The `editfile` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `editfile` field must be set.";
+
+                        if(isset($variables["querytable"])){
+                                if($variables["querytable"] === "" || $variables["querytable"] === NULL)
+                                        $this->verifyErrors[] = "The `querytable` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `querytable` field must be set.";
+
+                        if(isset($variables["defaultwhereclause"])){
+                                if($variables["defaultwhereclause"] === "" || $variables["defaultwhereclause"] === NULL)
+                                        $this->verifyErrors[] = "The `defaultwhereclause` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `defaultwhereclause` field must be set.";
+
+                        if(isset($variables["defaultsortorder"])){
+                                if($variables["defaultsortorder"] === "" || $variables["defaultsortorder"] === NULL)
+                                        $this->verifyErrors[] = "The `defaultsortorder` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `defaultsortorder` field must be set.";
+
+                        if(isset($variables["deletebutton"])){
+                                if($variables["deletebutton"] === "" || $variables["deletebutton"] === NULL)
+                                        $this->verifyErrors[] = "The `delete` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `delete` field must be set.";
+
+                        //table default sufficient
+                        if(isset($variables["type"]))
+                                switch($variables["type"]){
+
+                                        case "table":
+                                        case "view":
+                                        case "system":
+                                        break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of `type` field is invalid. Its value must be
+                                                        'table', 'view', or 'system'.";
+                                        break;
+
+                                }//end switch
+
+                        if(isset($variables["addroleid"])){
+
+                                if(is_numeric($variables["addroleid"]) || !$variables["addroleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if(!in_array(((int)$variables["addroleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `addroleid` field does not give an existing/acceptable role id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `addroleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["editroleid"])){
+
+                                if(is_numeric($variables["editroleid"]) || !$variables["editroleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if(!in_array(((int)$variables["editroleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `editroleid` field does not give an existing/acceptable role id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `editroleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["importroleid"])){
+
+                                if(is_numeric($variables["importroleid"]) || !$variables["importroleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if(!in_array(((int)$variables["importroleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `importroleid` field does not give an existing/acceptable role id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `importroleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["searchroleid"])){
+
+                                if(is_numeric($variables["searchroleid"]) || !$variables["searchroleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if(!in_array(((int)$variables["searchroleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `searchroleid` field does not give an existing/acceptable role id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `searchroleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["advsearchroleid"])){
+
+                                if(is_numeric($variables["advsearchroleid"]) || !$variables["advsearchroleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if(!in_array(((int)$variables["advsearchroleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `advsearchroleid` field does not give an existing/acceptable role id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `advsearchroleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["viewsqlroleid"])){
+
+                                if(is_numeric($variables["viewsqlroleid"]) || !$variables["viewsqlroleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if(!in_array(((int)$variables["viewsqlroleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `viewsqlroleid` field does not give an existing/acceptable role id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `viewsqlroleid` field must benumeric or quivalent to 0.";
+
+                        }//end if
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
                 function insertRecord($variables,$createdby = NULL){
 
                         if(!isset($variables["newid"]))
                                 $variables["newid"] = "";
-                                
+
                         if($variables["newid"]){
-                                //this will set a specific ID to be used.                               
+                                //this will set a specific ID to be used.
                                 $variables["id"] = $variables["newid"];
                                 parent::insertRecord($variables,$createdby,true);
                                 $newid =  $variables["newid"];
-                        
+
                         } else {
-                        
+
                                 $newid = parent::insertRecord($variables,$createdby);
-                                
+
                         }//endif - newid
-                        
+
                         //we need to create the some default supporting records
                         //first a single column.
-                        $querystatement = "INSERT INTO `tablecolumns` 
-                        (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) 
+                        $querystatement = "INSERT INTO `tablecolumns`
+                        (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`)
                         VALUES (".$newid.",'id','".$variables["maintable"].".id','left','',0,'',0,'',NULL,0);";
                         $this->db->query($querystatement);
-                        
+
                         //next default button options
-                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`) 
+                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`)
                         VALUES (".$newid.",'new','1',0,0,0);";
                         $this->db->query($querystatement);
 
-                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`) 
+                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`)
                         VALUES (".$newid.",'edit','1','1',0,0);";
                         $this->db->query($querystatement);
 
-                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`) 
+                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`)
                         VALUES (".$newid.",'printex','1',0,0,0);";
                         $this->db->query($querystatement);
 
-                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`) 
+                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`)
                         VALUES (".$newid.",'select','1',0,0,0);";
                         $this->db->query($querystatement);
-                        
-                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`) 
+
+                        $querystatement = "INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`)
                         VALUES (".$newid.",'import','1',0,0,'-100');";
                         $this->db->query($querystatement);
 
                         //next quicksearch
-                        $querystatement = "INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) 
+                        $querystatement = "INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`)
                         VALUES (".$newid.",'All Records','".$variables["maintable"].".id!=-1',0,0);";
                         $this->db->query($querystatement);
 
                         //and last findfields
-                        $querystatement = "INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) 
+                        $querystatement = "INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`)
                         VALUES (".$newid.",'".$variables["maintable"].".id','id',1,'field');";
                         $this->db->query($querystatement);
-                        
+
                         return $newid;
-                        
+
                 }
         }//end class
@@ -119 +302 @@
 
                 function delete_record(){
-                
+
                         //passed variable is array of user ids to be revoked
                         $whereclause="";
@@ -127 +310 @@
                         $linkedwhereclause = $this->buildWhereClause("tabledefid");
                         $relationshipswhereclause = $this->buildWhereClause("fromtableid")." or ".$this->buildWhereClause("totableid");
-                        
+
                         $querystatement = "DELETE FROM tablecolumns WHERE ".$linkedwhereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM tablefindoptions WHERE ".$linkedwhereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM tableoptions WHERE ".$linkedwhereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM tablesearchablefields WHERE ".$linkedwhereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM usersearches WHERE ".$linkedwhereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM relationships WHERE ".$relationshipswhereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM tabledefs WHERE ".$whereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $message = $this->buildStatusMessage();
                         $message.=" deleted.";
-                        return $message;        
+                        return $message;
                 }//end method
 

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class users extends phpbmsTable{
-        
-                function updateRecord($variables, $modifiedby = NULL){  
-                        
+
+                var $usedLoginNames = array();
+
+                function populateLoginNameArray(){
+
+                        $querystatement="
+                                SELECT
+                                        `id`,
+                                        `login`
+                                FROM
+                                        `users`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult)){
+
+                                        $login = $therecord["login"];
+                                        $id = $therecord["id"];
+                                        $this->usedLoginNames[$login]["id"] = $id;
+
+                                }//end while
+                        }else{
+                                //if no valid login names, I put in a value that will
+                                //give the arrays a count but not actually match any realistic login names
+                                $login = "THIS is @ ve|2`/ D|_||\/|B |_0GI|\| and stupid too.";
+                                $id = -1;
+
+                                $this->usedLoginNames[$login]["id"] = $id;
+                        }//end if
+
+                }//end method
+
+
+                function verifyVariables($variables){
+                        //---------[ check login names ]------------------------------
+
+                        if(isset($variables["login"])){
+                                if( $variables["login"] !== "" || $variables["login"] !== NULL ){
+
+                                        if(!count($this->usedLoginNames))
+                                                $this->populateLoginNameArray();
+
+                                        if(!isset($variables["id"]))
+                                                $variables["id"] = 0;
+
+                                        if($variables["id"] < 0)
+                                                $variables["id"] = 0;
+
+                                        //check to see new login name is taken
+                                        $templogin = $variables["login"];// using this because it looks ugly to but the brackets within brackets
+                                        if( array_key_exists($variables["login"], $this->usedLoginNames) ){
+
+                                                if( $this->usedLoginNames[$templogin]["id"] !== $variables["id"] )
+                                                        $this->verifyErrors[] = "The `login` field must give an unique login name.";
+
+                                        }else{
+                                                $this->availableProducts[$templogin]["id"] = -1;// impossible id put in (besides the type will through off the if anyways)
+                                        }//end if
+
+                                }else
+                                        $this->verifyErrors[] = "The `login` field must not be blank.";
+                        }else
+                                $this->verifyErrors[] = "The `login` field must be set.";
+
+                        //---------[ check email ]---------------------------------
+                        if(isset($variables["email"]))
+                                if( $variables["email"] !== NULL && $variables["email"] !== "" && !validateEmail($variables["email"]))
+                                        $this->verifyErrors[] = "The `email` field must have a valid email or must be left blank.";
+
+                        //---------[ check booleans ]---------------------------------
+                        if(isset($variables["revoked"]))
+                                if($variables["revoked"] && $variables["revoked"] != 1)
+                                        $this->verifyErrors[] = "The `revoked` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["portalaccess"]))
+                                if($variables["portalaccess"] && $variables["portalaccess"] != 1)
+                                        $this->verifyErrors[] = "The `portalaccess` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["admin"]))
+                                if($variables["admin"] && $variables["admin"] != 1)
+                                        $this->verifyErrors[] = "The `admin` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
+                function updateRecord($variables, $modifiedby = NULL){
+
                         if($variables["password"])
                                 $this->fields["password"]["type"] = "password";
@@ -48 +136 @@
 
                         unset($this->fields["lastlogin"]);
-                
+
                         parent::updateRecord($variables, $modifiedby);
-                        
+
                         if($variables["roleschanged"]==1)
                                 $this->assignRoles($variables["id"],$variables["newroles"]);
-                        
+
                         //reset field information
                         $this->fields = $this->db->tableInfo($this->maintable);
                 }
 
-        
-                function insertRecord($variables, $createdby = NULL){   
-                        
+
+                function insertRecord($variables, $createdby = NULL){
+
                         $this->fields["password"]["type"] = "password";
                         unset($this->fields["lastlogin"]);
-                                                
+
                         $theid = parent::insertRecord($variables, $createdby);
-        
+
                         //reset field information
                         $this->fields = $this->db->tableInfo($this->maintable);
@@ -71 +159 @@
                         return $theid;
                 }
-                
+
                 function assignRoles($id,$roles){
                         $querystatement="DELETE FROM rolestousers WHERE userid=".$id;
                         $queryresult=$this->db->query($querystatement);
-        
+
                         $newroles=explode(",",$roles);
-        
+
                         foreach($newroles as $therole)
                                 if($therole!=""){
@@ -84 +172 @@
                                 }
                 }
-                
-        
+
+
                 function displayRoles($id,$type){
                         $querystatement="SELECT roles.id,roles.name
-                                                        FROM roles INNER JOIN rolestousers ON rolestousers.roleid=roles.id 
+                                                        FROM roles INNER JOIN rolestousers ON rolestousers.roleid=roles.id
                                                         WHERE rolestousers.userid=".((int) $id);
                         $assignedquery=$this->db->query($querystatement);
-        
+
                         $thelist=array();
-                        
+
                         if($type=="available"){
                                 $excludelist=array();
                                 while($therecord=$this->db->fetchArray($assignedquery))
                                         $excludelist[]=$therecord["id"];
-                                        
+
                                 $querystatement="SELECT id,name FROM roles WHERE inactive=0";
                                 $availablequery=$this->db->query($querystatement);
                                 while($therecord=$this->db->fetchArray($availablequery))
                                         if(!in_array($therecord["id"],$excludelist))
-                                                $thelist[]=$therecord;          
-                        } else 
+                                                $thelist[]=$therecord;
+                        } else
                                 while($therecord=$this->db->fetchArray($assignedquery))
                                         $thelist[]=$therecord;
-                                        
+
                         foreach($thelist as $theoption){
                                 ?>      <option value="<?php echo $theoption["id"]?>"><?php echo htmlQuotes($theoption["name"])?></option>
-                <?php 
+                <?php
                         }
                 }//end function
@@ -120 +208 @@
 
                 function delete_record(){
-                        
+
                         //passed variable is array of user ids to be revoked
                         $whereclause = $this->buildWhereClause();
-                
+
                         $querystatement = "UPDATE users SET revoked=1,modifiedby=".$_SESSION["userinfo"]["id"]." WHERE ".$whereclause.";";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $message = $this->buildStatusMessage();
                         $message.=" revoked access.";
-                        return $message;        
-                }
-
-                
+                        return $message;
+                }
+
+
         }//end class
 }//end if

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

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class userSearches extends phpbmsTable{
-        
+
+                var $availableUserIDs = array();
+                var $availableTabledefIDs = array();
+                var $availableRoleIDs = array();
+
+
+                function populateUserArray(){
+
+                        $this->availableUserIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `users`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableUserIDs[] = 0;//for global
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableUserIDs[] = $therecord["id"];
+
+                }//end method --populateUserArray--
+
+
+                function populateRoleArray(){
+
+                        $this->availableRoleIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `roles`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableRoleIDs[] = 0;//for global
+                        $this->availableRoleIDs[] = -100;//for admin
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableRoleIDs[] = $therecord["id"];
+
+
+                }//end method --populateRoleArray--
+
+
+                function populateTabledefArray(){
+
+                        $this->availableTabledefIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `tabledefs`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult))
+                                        $this->availableTabledefIDs[] = $therecord["id"];
+                        }else
+                                $this->availableTabledefIDs[] = "none";// so the function doesn't keep
+                                //getting called
+
+
+                }//end method --populateRoleArray--
+
+
+                function verifyVariables($variables){
+
+                        //table default (SCH) is sufficient
+                        if(isset($variables["type"])){
+
+                                switch($variables["type"]){
+
+                                        case "SRT":
+                                        case "SCH":
+                                        break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of `type` field is invalid. Its value must be
+                                                        'SRT' or 'SCH'.";
+                                        break;
+
+                                }//end switch
+
+                        }//end if
+
+                        //table default (0) is sufficient
+                        if(isset($variables["userid"])){
+
+                                if( !$variables["userid"] || ((int) $variables["userid"] > 0) ){
+
+                                        if(!count($this->availableUserIDs))
+                                                $this->populateUserArray();
+
+                                        if(!in_array(((int)$variables["userid"]), $this->availableUserIDs))
+                                                $this->verifyErrors[] = "The `userid` field does not give an existing/acceptable user id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `userid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        //The table default is not enough, so it must be set
+                        if(isset($variables["tabledefid"])){
+
+                                if(is_numeric($variables["tabledefid"]) || !$variables["tabledefid"]){
+
+                                        if(!count($this->availableTabledefIDs))
+                                                $this->populateTabledefArray();
+
+                                        if(!in_array(((int)$variables["tabledefid"]), $this->availableTabledefIDs))
+                                                $this->verifyErrors[] = "The `tabledefid` field does not give an existing/acceptable table definition id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `tabledefid` field must be numeric or equivalent to 0.";
+                        }else
+                                $this->verifyErrors[] = "The `tabledefid` field must be set.";
+
+                        //table default (0) is sufficient
+                        if(isset($variables["roleid"])){
+
+                                if(is_numeric($variables["roleid"]) || !$variables["roleid"]){
+
+                                        if(!count($this->availableRoleIDs))
+                                                $this->populateRoleArray();
+
+                                        if(!in_array(((int)$variables["roleid"]), $this->availableRoleIDs))
+                                                $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable role id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `roleid` field must be numeric or equivalent to 0.";
+
+                        }//end if
+
+                        return parent::verifyVariables($variables);
+
+                }//end method
+
+
                 function displayTables($fieldname,$selectedid){
-                
+
                         $querystatement="SELECT id, displayname FROM tabledefs ORDER BY displayname";
                         $thequery=$this->db->query($querystatement);
-                        
+
                         echo "<select id=\"".$fieldname."\" name=\"".$fieldname."\">\n";
                         while($therecord=$this->db->fetchArray($thequery)){
@@ -53 +197 @@
                         echo "</select>\n";
                 }
-                
+
+
                 function updateRecord($variables, $modifiedby = NULL){
-                
+
                         if(isset($variables["makeglobal"]))
                                 $variables["userid"] = 0;
-                                        
+
                         parent::updateRecord($variables, $modifiedby);
                 }
-        
+
         }//end class
 }//end if

trunk/phpbms/modules/base/notes_addedit.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-
-        require_once("../../include/session.php");      
+//var_dump($_POST);
+//exit;
+        require_once("../../include/session.php");
         require_once("include/fields.php");
         require_once("include/tables.php");
         require_once("include/notes.php");
 
-        if(isset($_GET["backurl"])){ 
+        if(isset($_GET["backurl"])){
                 $backurl=$_GET["backurl"];
                 if(isset($_GET["refid"]))
@@ -49 +50 @@
         } else
                 $backurl = NULL;
-                
+
         $thetable = new notes($db,12,$backurl);
         $therecord = $thetable->processAddEditPage();
 
         if(isset($therecord["phpbmsStatus"]))
-                $statusmessage = $therecord["phpbmsStatus"];    
+                $statusmessage = $therecord["phpbmsStatus"];
 
 
@@ -69 +70 @@
                 $theform->onsubmit = "return submitForm(this)";
                 $theform->id = "record";
-                
+
                 $temparray = array("Note"=>"NT","Task"=>"TS","Event"=>"EV","System Message"=>"SM");
                 $theinput = new inputBasicList("thetype",$therecord["type"],$temparray,"type");
@@ -75 +76 @@
                 $theinput->setAttribute("onchange","changeType()");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputField("subject",$therecord["subject"], "title" ,true);
-                $theform->addField($theinput);          
+                $theform->addField($theinput);
 
                 $temparray = array("Highest"=>3,"High"=>2,"Medium"=>1,"Normal"=>0,"Low"=>-1,"Lowest"=>-2);
                 $theinput = new inputBasicList("importance",$therecord["importance"],$temparray,"importance",false);
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputCheckbox("private",$therecord["private"]);
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputDatePicker("startdate",$therecord["startdate"], "start date" ,false, 11, 15, false);
-                $theinput->setAttribute("onchange","checkEndDate();");                          
+                $theinput->setAttribute("onchange","checkEndDate();");
                 $theform->addField($theinput);
 
                 $theinput = new inputTimePicker("starttime",$therecord["starttime"], "start time" ,false,11, 15, false);
-                $theinput->setAttribute("onchange","checkEndDate();");                          
-                $theform->addField($theinput);          
-                
+                $theinput->setAttribute("onchange","checkEndDate();");
+                $theform->addField($theinput);
+
                 $theinput = new inputDatePicker("enddate",$therecord["enddate"], "end date" ,false, 11, 15, false);
                 $theform->addField($theinput);
 
                 $theinput = new inputTimePicker("endtime",$therecord["endtime"], "end time" ,false,11, 15, false);
-                $theform->addField($theinput);          
+                $theform->addField($theinput);
 
                 $theinput = new inputCheckbox("completed",$therecord["completed"],"completed",false,false);
@@ -110 +111 @@
                 $theinput = new inputChoiceList($db, "status",$therecord["status"],"notestatus");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputSmartSearch($db, "assignedtoid", "Pick Active User", $therecord["assignedtoid"], "assigned to", false, 18, 255, false);
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputDatePicker("assignedtodate",$therecord["assignedtodate"], "follow up date");
                 $theform->addField($theinput);
 
                 $theinput = new inputTimePicker("assignedtotime",$therecord["assignedtotime"], "follow up time" ,false,11, 15, false);
-                $theform->addField($theinput);          
+                $theform->addField($theinput);
 
                 $theinput = new inputChoiceList($db, "category",$therecord["category"],"notecategories");
@@ -129 +130 @@
                 else
                         $repeatBase = mktime();
-                
+
                 $theinput = new inputCheckbox("repeating",$therecord["repeating"],"repeat");
                 $theinput->setAttribute("onchange","checkRepeat();");
                 $theform->addField($theinput);
-                
+
                 $temparray = array("Daily"=>"Daily", "Weekly"=>"Weekly", "Monthly"=>"Monthly", "Yearly"=>"Yearly");
                 $theinput = new inputBasiclist("repeattype",$therecord["repeattype"],$temparray,"frequency");
                 $theinput->setAttribute("onchange","changeRepeatType();");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputField("repeatevery",$therecord["repeatevery"],"frequency of repeating",false,"integer",2,4,false);
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputBasiclist("monthlyontheweek",$therecord["repeatontheweek"],$thetable->weekArray,"on the week of",false);
                 $theinput2 = new inputBasiclist("yearlyontheweek",$therecord["repeatontheweek"],$thetable->weekArray,"on the week of",false);
@@ -150 +151 @@
                         $weekNumber = ceil(date("d",$repeatBase)/7);
                         if($weekNumber > 4) $weekNumber = 5;
-                        
+
                         $theinput->value = $weekNumber;
                         $theinput2->value = $weekNumber;
-                                                
+
                 }
                 $theform->addField($theinput);
                 $theform->addField($theinput2);
-                
+
                 $temparray = array();
                 for($i=1; $i<8; $i++)
@@ -186 +187 @@
                 $theinput = new inputField("repeattimes",$therecord["repeattimes"],"repeat until number of times",false,"integer",3,5,false);
                 $theform->addField($theinput);
-                
+
                 if(!$therecord["repeatuntil"])
                         $therecord["repeatuntil"] = dateToString(mktime(),"SQL");
@@ -193 +194 @@
                 $theform->addField($theinput);
                 //end repeat fields
-                                
+
                 $theform->jsMerge();
                 //==============================================================
-                //End Form Elements     
-                
+                //End Form Elements
+
         include("header.php");
-        
+
 ?><div class="bodyline">
         <?php $theform->startForm($pageTitle)?>
@@ -211 +212 @@
                         <input name="thebackurl" id="thebackurl" type="hidden" value="<?php if(isset($_GET["backurl"])) echo $_GET["backurl"]; ?>" />
                 </p>
-                
+
                 <p>
                         <?php $theform->showField("thetype")?>
-                        <input type="hidden" id="typeCheck" name="typeCheck" value="<?php echo $therecord["type"]?>" />         
+                        <input type="hidden" id="typeCheck" name="typeCheck" value="<?php echo $therecord["type"]?>" />
                 </p>
-                
+
                 <p><?php $theform->showField("subject") ?></p>
         </fieldset>
-        
+
         <div id="leftSideDiv">
                 <fieldset>
@@ -234 +235 @@
                                 <label for="startdate" id="starttext">start</label><br />
                                 <input name="dostart" id="startcheck" type="checkbox" value="1" <?php if($therecord["startdate"]) echo "checked=\"checked\"" ?> onclick="dateChecked('start')" class="radiochecks" />
-                                &nbsp;<?php $theform->showField("startdate");?> 
+                                &nbsp;<?php $theform->showField("startdate");?>
                                 &nbsp;<?php $theform->showField("starttime");?>
                         </p>
@@ -240 +241 @@
                                 <label for="enddate" id="endtext">end</label><br />
                                 <input name="doend" id="endcheck" type="checkbox" value="1" <?php if($therecord["enddate"]) echo "checked=\"checked\"" ?> onclick="dateChecked('end')" class="radiochecks" />
-                                &nbsp;<?php $theform->showField("enddate");?>   
+                                &nbsp;<?php $theform->showField("enddate");?>
                                 &nbsp;<?php $theform->showField("endtime");?>
                         </p>
                 </fieldset>
-                
+
                 <div id="thecompleted" class="fauxP">
                         <p>
@@ -251 +252 @@
                                 <?php $theform->showField("completeddate")?>
                         </p>
-                        <p id="thestatus"><?php $theform->showField("status") ?></p>                    
+                        <p id="thestatus"><?php $theform->showField("status") ?></p>
                 </div>
-                
+
                 <fieldset>
                         <legend><label for="ds-assignedtoid">assigned to</label></legend>
@@ -275 +276 @@
                         <p><?php $theform->showField("assignedtodate");?> &nbsp; <?php $theform->showField("assignedtotime")?></p>
                 </fieldset>
-                
+
                 <input id="attachedtabledefid" name="attachedtabledefid" type="hidden" value="<?php echo $therecord["attachedtabledefid"]?>" />
                 <fieldset id="theassociated">
@@ -283 +284 @@
                                         <input id="assocarea" type="text" readonly="readonly" class="uneditable" value="<?php echo $attachedtableinfo["displayname"];?>" />
                                 </p>
-                                                                
+
                                 <p>
                                         <label for="attachedid">record id</label><br />
@@ -296 +297 @@
                                 <input name="location" id="location" type="text" value="<?php echo $therecord["location"]?>"/>
                         </p>
-                        
-                        <p><?php $theform->showField("category") ?></p>                 
-                </fieldset>
-                
+
+                        <p><?php $theform->showField("category") ?></p>
+                </fieldset>
+
         </div>
 
@@ -316 +317 @@
 
         <div id="repeatDiv">
-        
+
                 <div <?php if($therecord["parentid"]) echo 'style="display:none;"'?>>
                         <input type="hidden" id="bypass" name="bypass" value=""/>
@@ -325 +326 @@
                         <fieldset>
                                 <legend>repeat</legend>
-                                
+
                                 <p><?php $theform->showField("repeating")?></p>
-                                
+
                                 <div id="repeatOptions" <?php if(!$therecord["repeating"]) echo 'style="display:none"'?>>
-                                
+
                                         <p><?php $theform->showField("repeattype")?></p>
-                
+
                                         <p>every <?php $theform->showField("repeatevery")?> <span id="repeatTypeText">day(s)</span></p>
-                
+
                                         <div id="DailyDiv"></div>
-                
+
                                         <div id="WeeklyDiv">
                                                 <p><?php $thetable->showWeeklyOptions($therecord,$repeatBase)?></p>
                                         </div>
-                
+
                                         <div id="MonthlyDiv">
                                                 <p><input type="radio" id="monthlyEach" name="monthlyWhat" onchange="monthlyChange();" value="1" <?php if(!$therecord["repeatontheday"]) echo 'checked="checked"'?> /><label for="monthlyEach"> each</label></p>
-                                                
+
                                                 <p><?php $thetable->showMonthlyOptions($therecord,$repeatBase)?></p>
-                                                
+
                                                 <p><input type="radio" id="monthlyOnThe" name="monthlyWhat" onchange="monthlyChange();" value="2" <?php if($therecord["repeatontheday"]) echo 'checked="checked"'?> /><label for="monthlyOnThe"> on the</label></p>
                                                 <p>
@@ -351 +352 @@
                                                 </p>
                                         </div>
-                
+
                                         <div id="YearlyDiv">
                                                 <p><?php $thetable->showYearlyOptions($therecord,$repeatBase)?></p>
-                                                
+
                                                 <p><input id="yearlyOnThe" type="checkbox" name="yearlyOnThe" onclick="yearlyOnTheChecked();" value="1" <?php if($therecord["repeattype"]=="Yearly" && $therecord["repeatontheday"]) echo 'checked="checked"'?>/><label for="yearlyOnThe"> on the</label></p>
                                                 <p>
@@ -360 +361 @@
                                                         <?php $theform->showField("yearlyontheday");?>
                                                 </p>
-                                                
+
                                         </div>
                                 </div>
                         </fieldset>
-        
+
                         <fieldset id="repeatEnding" <?php if(!$therecord["repeating"]) echo 'style="display:none"'?>>
                                 <legend>end</legend>
@@ -383 +384 @@
                         <p>This record was created from a repeated task/event.</p>
                         <p>Click the <strong>Edit Repeating Options</strong> button to edit the options for the repeatable parent record.</p>
-                        <p class="notes">Any unsaved changes with the current record will be lost.</p>                  
+                        <p class="notes">Any unsaved changes with the current record will be lost.</p>
                         <p><input id="goparent" name="goparent" type="button" value="Edit Repeating Options..." onclick="goParent('<?php echo getAddEditFile($db,12) ?>')" class="Buttons" /></p>
                 </fieldset>
                 <?php }//endif ?>
         </div>
-        <?php 
+        <?php
                 $theform->showCreateModify($phpbms,$therecord);
                 $theform->endForm();

trunk/phpbms/modules/base/scheduler_addedit.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev: 197 $ | $LastChangedBy: brieb $
@@ -45 +45 @@
         $thetable = new schedulers($db,201);
         $therecord = $thetable->processAddEditPage();
-        
+
         if(isset($therecord["phpbmsStatus"]))
-                $statusmessage = $therecord["phpbmsStatus"];    
-        
+                $statusmessage = $therecord["phpbmsStatus"];
+
         $pageTitle="Scheduler";
-        
+
         $currentpath=getcwd();
-        
+
         $phpbms->cssIncludes[] = "pages/scheduler.css";
 
@@ -58 +58 @@
                 //==============================================================
                 $theform = new phpbmsForm();
-                
+
                 $theinput = new inputCheckbox("inactive",$therecord["inactive"]);
                 $theform->addField($theinput);
@@ -72 +72 @@
                 $theform->addField($theinput);
 
-                $theinput = new inputTimePicker("starttime",$therecord["starttime"], "start time" ,false,11, 15, false);
-                $theinput->setAttribute("onchange","checkEndDate();");                          
-                $theform->addField($theinput);          
-                
+                $theinput = new inputTimePicker("starttime",$therecord["starttime"], "start time" ,true,11, 15, false);
+                //$theinput->setAttribute("onchange","checkEndDate();");
+                $theform->addField($theinput);
+
                 $theinput = new inputDatePicker("enddate",$therecord["enddate"], "end date" ,false, 11, 15, false);
                 $theform->addField($theinput);
 
                 $theinput = new inputTimePicker("endtime",$therecord["endtime"], "end time" ,false,11, 15, false);
-                $theform->addField($theinput);          
+                $theform->addField($theinput);
 
                 $theform->jsMerge();
                 //==============================================================
-                //End Form Elements     
-                        
+                //End Form Elements
+
         include("header.php");
-        
+
 ?><div class="bodyline">
-        <?php $theform->startForm($pageTitle)?> 
-        
+        <?php $theform->startForm($pageTitle)?>
+
         <fieldset id="fsAttributes">
                 <legend>attributes</legend>
@@ -97 +97 @@
                         <input id="id" name="id" type="text" value="<?php echo htmlQuotes($therecord["id"]); ?>" size="10" maxlength="10" readonly="readonly" class="uneditable" />
                 </p>
-                
+
                 <p><?php $theform->showField("inactive");?></p>
 
@@ -105 +105 @@
                 </p>
         </fieldset>
-        
+
         <div id="leftSideDiv">
                 <fieldset>
@@ -116 +116 @@
                         <legend>Scheduled Job</legend>
 
-                        <p><?php $theform->showField("name");?></p>             
+                        <p><?php $theform->showField("name");?></p>
 
                         <p>
@@ -127 +127 @@
                         </p>
                 </fieldset>
-                
+
                 <fieldset>
                         <legend>Interval</legend>
@@ -151 +151 @@
                                 </p>
                         <p class="notes" id="standarNotationP">(Uses standard crontab notation.)</p>
-                        
+
                 </fieldset>
                 <fieldset>
@@ -157 +157 @@
                         <p>
                                 <label for="startdate">start</label><br />
-                                <?php $theform->showField("startdate");?> &nbsp; <?php $theform->showField("starttime");?>      
+                                <?php $theform->showField("startdate");?> &nbsp; <?php $theform->showField("starttime");?>
                         </p>
                         <p>
                                 <label for="enddate">end</label><br />
-                                <?php $theform->showField("enddate");?> &nbsp; <?php $theform->showField("endtime");?>  
+                                <?php $theform->showField("enddate");?> &nbsp; <?php $theform->showField("endtime");?>
                         </p>
                 </fieldset>
         </div>
 
-        <?php 
+        <?php
                 $theform->showCreateModify($phpbms,$therecord);
                 $theform->endForm();

trunk/phpbms/modules/base/scheduler_delete_tempimport.php

@@ -1 +1 @@
 <?php
-if(!class_exists("appError"))
-        include_once("../../include/session.php");
+
+//uncomment for debug purposes
+//if(!class_exists("appError"))
+//      include_once("../../include/session.php");
 
 class cleanImports{
-        
+
         function cleanImports($db){
                 $this->db = $db;
         }//end method --cleanImports--
-        
-        function removeTempCSV($tempFileID = 0){
-                        
-                        $querystatement = "
-                                DELETE FROM
-                                        `files`
-                                WHERE
-                                        `type` = 'phpbms/temp'
-                                        AND
-                                        (
-                                                `id` = ".((int)$tempFileID)."
-                                                OR
-                                                `creationdate` <= NOW() - INTERVAL 30 MINUTE
-                                        );
-                                ";
-                                
-                        $queryresult = $this->db->query($querystatement);
-                        
-                }//end method --_removeTempCSV--
-        
+
+        function removeTempCSV(){
+
+                $querystatement = "
+                        DELETE FROM
+                                `files`
+                        WHERE
+                                `type` = 'phpbms/temp'
+                                AND
+                                `creationdate` <= NOW() - INTERVAL '30' MINUTE
+                                ;
+                        ";
+
+                $queryresult = $this->db->query($querystatement);
+
+        }//end method --_removeTempCSV--
+
 }//end class --cleanImports--
 

trunk/phpbms/modules/base/snapshot.php

@@ -43 +43 @@
         $pageTitle = APPLICATION_NAME;
 
-        $phpbms->cssIncludes[] = "pages/snapshot.css";
+        $phpbms->cssIncludes[] = "pages/base/snapshot.css";
 
         $phpbms->jsIncludes[] = "modules/base/javascript/snapshot.js";
@@ -63 +63 @@
 <div class="bodyline">
         <h1><?php echo $_SESSION["userinfo"]["firstname"]; if($_SESSION["userinfo"]["lastname"]) echo " ".$_SESSION["userinfo"]["lastname"]?>'s Snapshot</h1>
+
         <?php $myBase->showSystemMessages() ?>
 

trunk/phpbms/modules/base/tabs_addedit.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev: 205 $ | $LastChangedBy: brieb $
@@ -46 +46 @@
         
         if(isset($therecord["phpbmsStatus"]))
-                $statusmessage = $therecord["phpbmsStatus"];    
+                $statusmessage = $therecord["phpbmsStatus"];
 
-        $pageTitle="Tab";       
+        $pageTitle="Tab";
         $phpbms->cssIncludes[] = "pages/tabs.css";
 
@@ -54 +54 @@
                 //==============================================================
                 $theform = new phpbmsForm();
-                
+
                 $theinput = new inputField("name",$therecord["name"],NULL,true,NULL,32,64);
                 $theinput->setAttribute("class","important");
@@ -61 +61 @@
                 $theinput = new inputField("displayorder",$therecord["displayorder"],"display order",true,NULL,10,10);
                 $theform->addField($theinput);
-                                
+
                 $theinput = new inputRolesList($db,"roleid",$therecord["roleid"],"access (role)");
-                $theform->addField($theinput);                  
+                $theform->addField($theinput);
 
                 $theinput = new inputChoiceList($db,"tabgroup",$therecord["tabgroup"],"tabgroups", "tab group");
-                $theform->addField($theinput);                  
+                $theform->addField($theinput);
 
                 $theinput = new inputCheckbox("enableonnew",$therecord["enableonnew"],"enable on new");
-                $theform->addField($theinput);                  
-                
+                $theform->addField($theinput);
+
                 $theform->jsMerge();
                 //==============================================================
-                //End Form Elements     
-                
+                //End Form Elements
+
         include("header.php");
-        
+
 ?><div class="bodyline">
-        <?php $theform->startForm($pageTitle)?> 
+        <?php $theform->startForm($pageTitle)?>
         <fieldset id="fsAttributes">
                 <legend>attributes</legend>
@@ -85 +85 @@
                         <input id="id" name="id" type="text" value="<?php echo htmlQuotes($therecord["id"]); ?>" size="10" maxlength="10" readonly="readonly" class="uneditable" />
                 </p>
-                
+
                 <p>
                         <?php $theform->showField("displayorder"); ?><br />
                         <span class="notes">Lower numbers are displayed first.</span>
                 </p>
-                
+
                 <p><?php $theform->showField("roleid")?></p>
 
@@ -96 +96 @@
 
         </fieldset>
-        
+
         <div id="leftSideDiv">
                 <fieldset>
@@ -104 +104 @@
 
                         <p><?php $theform->showField("tabgroup"); ?></p>
-                                
+
                         <p>
                                 <label for="location">location</label><br />
@@ -123 +123 @@
         </div>
 
-        <?php 
+        <?php
                 $theform->showCreateModify($phpbms,$therecord);
                 $theform->endForm();

trunk/phpbms/modules/base/users_addedit.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -45 +45 @@
         $thetable = new users($db,9);
         $therecord = $thetable->processAddEditPage();
-        
+
         if(isset($therecord["phpbmsStatus"]))
-                $statusmessage = $therecord["phpbmsStatus"];    
-        
+                $statusmessage = $therecord["phpbmsStatus"];
+
         $pageTitle="User";
-        
+
         $phpbms->cssIncludes[] = "pages/users.css";
         $phpbms->jsIncludes[] = "modules/base/javascript/users.js";
@@ -58 +58 @@
                 $theform = new phpbmsForm();
                 $theform->onsubmit="return submitForm(this);";
-                
+
                 $theinput = new inputCheckbox("admin",$therecord["admin"],"administrator");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputCheckbox("revoked",$therecord["revoked"],"access revoked");
                 $theform->addField($theinput);
@@ -86 +86 @@
                 $theinput = new inputField("phone",$therecord["phone"],"phone/extension",false,"phone",32,64);
                 $theform->addField($theinput);
-                
+
+                $theinput = new inputField("lastip", $therecord["lastip"], "last log in IP");
+                $theinput->setAttribute("readonly", "readonly");
+                $theinput->setAttribute("class", "uneditable");
+                $theform->addField($theinput);
+
                 $theinput = new inputChoiceList($db,"department",$therecord["department"],"department");
                 $theform->addField($theinput);
@@ -92 +97 @@
                 $theform->jsMerge();
                 //==============================================================
-                //End Form Elements     
-                        
+                //End Form Elements
+
         include("header.php");
-        
+
 ?><div class="bodyline">
-        <?php $theform->startForm($pageTitle)?>         
+        <?php $theform->startForm($pageTitle)?>
         <fieldset id="fsAttributes">
                 <legend>attributes</legend>
-                
+
                 <p>
                         <label for="id">id</label><br />
-                        <input id="id" name="id" type="text" value="<?php echo $therecord["id"]; ?>" size="5" maxlength="5" readonly="readonly" class="uneditable"/>            
+                        <input id="id" name="id" type="text" value="<?php echo $therecord["id"]; ?>" size="5" maxlength="5" readonly="readonly" class="uneditable"/>
                 </p>
 
@@ -117 +122 @@
                 </p>
         </fieldset>
-        
+
         <div id="leftSideDiv">
                 <fieldset id="fsName">
@@ -135 +140 @@
                         <p>
                                 <label for="lastlogin" >last log in</label><br />
-                                <input id="lastlogin" name="lastlogin" type="text" value="<?php echo formatFromSQLDateTime($therecord["lastlogin"]); ?>" size="32" maxlength="64" readonly="readonly" class="uneditable"  />                    
-                        </p>
+                                <input id="lastlogin" name="lastlogin" type="text" value="<?php echo formatFromSQLDateTime($therecord["lastlogin"]); ?>" size="32" maxlength="64" readonly="readonly" class="uneditable"  />
+                        </p>
+
+                        <p><?php $theform->showField("lastip"); ?></p>
 
                         <p>
                                 <label for="password">set new password</label><br />
-                                <input id="password" name="password" type="password" size="32" maxlength="32" />                        
-                        </p>
-                        
+                                <input id="password" name="password" type="password" size="32" maxlength="32" />
+                        </p>
+
                         <p>
                                 <label for="password2">confirm new password</label><br />
@@ -155 +162 @@
 
                         <p><?php $theform->showField("phone");?></p>
-                        
+
                         <p><?php $theform->showField("department");?></p>
 
                         <p>
                                 <label for="employeenumber">employee number</label><br />
-                                <input type="text" id="employeenumber" name="employeenumber" value="<?php echo htmlQuotes($therecord["employeenumber"]) ?>" size="32" maxlength="32" />                 
+                                <input type="text" id="employeenumber" name="employeenumber" value="<?php echo htmlQuotes($therecord["employeenumber"]) ?>" size="32" maxlength="32" />
                         </p>
                 </fieldset>
@@ -190 +197 @@
                         </div>
                         </div>
-                </fieldset>             
+                </fieldset>
                 <?php }?>
-        </div>  
-
-        <?php 
+        </div>
+
+        <?php
                 $theform->showCreateModify($phpbms,$therecord);
                 $theform->endForm();

trunk/phpbms/modules/bms/clients_addedit.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
+
         include("../../include/session.php");
         include("include/tables.php");
@@ -44 +45 @@
         include("include/clients.php");
 
-        if(!isset($_GET["backurl"])) 
-                $backurl = NULL; 
-        else{ 
+        if(!isset($_GET["backurl"]))
+                $backurl = NULL;
+        else{
                 $backurl = $_GET["backurl"];
                 if(isset($_GET["refid"]))
@@ -54 +55 @@
         $thetable = new clients($db,2,$backurl);
         $therecord = $thetable->processAddEditPage();
-        
+
         if(isset($therecord["phpbmsStatus"]))
                 $statusmessage = $therecord["phpbmsStatus"];
-        
+
         $pageTitle=ucwords($therecord["type"]);
 
         if($therecord["inactive"])
                 $pageTitle="Inactive ".$pageTitle;
-                
-                
+
+
         $phpbms->cssIncludes[] = "pages/client.css";
         $phpbms->jsIncludes[] = "modules/bms/javascript/client.js";
@@ -70 +71 @@
                 //==============================================================
                 $theform = new phpbmsForm();
-                
+
                 $phpbms->bottomJS[] = 'var thefirstname=getObjectFromID("firstname");thefirstname.focus();';
-                
+
                 $theinput = new inputCheckbox("inactive",$therecord["inactive"]);
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputBasicList("type",$therecord["type"],array("prospect"=>"prospect","client"=>"client"), "type");
                 $theinput->setAttribute("class","important");
@@ -86 +87 @@
                 }//endif
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputChoiceList($db, "category",$therecord["category"],"clientcategories");
                 $theform->addField($theinput);
@@ -92 +93 @@
                 $theinput = new inputSmartSearch($db, "salesmanagerid", "Pick Active User", $therecord["salesmanagerid"], "sales person");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputChoiceList($db, "leadsource",$therecord["leadsource"],"leadsource", "lead source");
                 $theinput->setAttribute("class","small");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputDataTableList($db, "paymentmethodid",$therecord["paymentmethodid"],"paymentmethods","id","name",
                                                                 "inactive=0", "priority,name", true, "payment method");
@@ -104 +105 @@
                                                                 "inactive=0", "priority,name", true, "shipping method");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputDataTableList($db, "discountid",$therecord["discountid"],"discounts","id","name",
                                                                 "inactive=0", "name", true, "discount");
@@ -112 +113 @@
                                                                 "inactive=0", "name", true, "tax area");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputField("workphone",$therecord["workphone"],"work phone",false,"phone",25,32);
                 $theform->addField($theinput);
@@ -133 +134 @@
                 $theinput = new inputField("webaddress",$therecord["webaddress"],"web address",false,"www",68,128);
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputField("taxid", $therecord["taxid"], "tax id", false, "", 25, 32);
                 $theform->addField($theinput);
@@ -140 +141 @@
                 //==============================================================
                 //End Form Elements
-         
-        include("header.php");  
+
+        include("header.php");
 
         $action = htmlQuotes($_SERVER["REQUEST_URI"]);
@@ -155 +156 @@
 
         <h1 id="h1Title"><span><?php echo $pageTitle ?></span></h1>
-        
+
         <div id="rightSideDiv">
                 <?php if(isset($_GET["invoiceid"])){?>
@@ -161 +162 @@
                         <input name="gotoinvoice" id="gotoinvoice" type="button" value="return to order" onclick="location.href='<?php echo getAddEditFile($db,3) ?>?id=<?php echo $_GET["invoiceid"] ?>'" class="Buttons" />
                 </p>
-                <?php } ?>                      
+                <?php } ?>
                 <fieldset>
                         <legend>attributes</legend>
@@ -170 +171 @@
                                 <input type="hidden" id="creditlimit" name="creditlimit" value="<?php echo $therecord["creditlimit"]?>"/>
                         </p>
-                                
+
                         <p><?php $theform->showField("type");?></p>
-                        
+
                         <p><?php $theform->showField("inactive")?></p>
-                        
+
                         <p id="becameclientDiv" <?php if($therecord["type"]=="prospect") echo "style=\"display:none;\"" ?>>
                                 <label for="becameclient">became a client</label><br />
                                 <input type="text" id="becameclient" name="becameclient" readonly="readonly" class="uneditable" value="<?php echo formatFromSQLDate($therecord["becameclient"])?>" size="8" />
                         </p>
-                        
+
                         <p><?php $theform->showField("category")?></p>
-                        
-                </fieldset>
-        
+
+                </fieldset>
+
                 <fieldset>
                         <legend>sales</legend>
                         <div class="fauxP"><?php $theform->showField("salesmanagerid")?></div>
-                        
+
                         <p><?php $theform->showField("leadsource")?></p>
                 </fieldset>
-                                
+
                 <fieldset>
                         <legend>order defaults</legend>
@@ -220 +221 @@
                 </fieldset>
         </div>
-                
-        <div id="leftSideDiv">          
+
+        <div id="leftSideDiv">
                 <fieldset>
                         <legend>name / company</legend>
@@ -230 +231 @@
                         <p>
                                 <label for="lastname" class="important">last name</label><br />
-                                <input id="lastname" name="lastname" type="text" value="<?php echo htmlQuotes($therecord["lastname"])?>" size="32" maxlength="65" class="important" />                          
+                                <input id="lastname" name="lastname" type="text" value="<?php echo htmlQuotes($therecord["lastname"])?>" size="32" maxlength="65" class="important" />
                         </p>
                         <p>
@@ -236 +237 @@
                                 <input name="company" type="text" id="company" value="<?php echo htmlQuotes($therecord["company"])?>" size="71" maxlength="128" class="important"/>
                         </p>
-                </fieldset>     
-                                                        
-                <fieldset>                                      
+                </fieldset>
+
+                <fieldset>
                         <legend>contact</legend>
 
                         <p class="phonelefts"><?php $theform->showField("workphone")?></p>
-                        
+
                         <p><?php $theform->showField("homephone")?></p>
-                        
+
                         <p class="phonelefts"><?php $theform->showField("mobilephone")?></p>
 
                         <p><?php $theform->showField("fax")?></p>
-                        
+
                         <p><?php $theform->showField("otherphone")?></p>
-                        
+
                         <p><?php $theform->showField("email")?></p>
-                        
+
                         <p><?php $theform->showField("webaddress")?></p>
-                        
+
                         <p><?php $theform->showField("taxid")?></p>
                 </fieldset>
-                
+
                 <fieldset>
                         <legend>
@@ -263 +264 @@
                                 <button type="button" class="graphicButtons buttonMap" id="buttonMap" title="show map"><span>map</span></button>
                         </legend>
-                        
+
                         <p>
                                 <input type="hidden" id="addressid" name="addressid" value="<?php echo $therecord["addressid"]?>"/>
@@ -281 +282 @@
                         <p>
                                 <label for="postalcode">zip/postal code</label><br />
-                                <input name="postalcode" type="text" id="postalcode" value="<?php echo htmlQuotes($therecord["postalcode"])?>" size="12" maxlength="15" />                              
+                                <input name="postalcode" type="text" id="postalcode" value="<?php echo htmlQuotes($therecord["postalcode"])?>" size="12" maxlength="15" />
                         </p>
                         <p>
@@ -287 +288 @@
                                 <input id="country" name="country" type="text" value="<?php echo htmlQuotes($therecord["country"])?>" size="44" maxlength="128" />
                         </p>
-                        
-                </fieldset>
-                
-                
+
+                </fieldset>
+
+
                 <fieldset>
                         <legend><label for="comments">memo</label></legend>
@@ -297 +298 @@
                         </p>
                 </fieldset>
-                
+
         </div><?php $theform->showCreateModify($phpbms,$therecord);?>
         </div>

trunk/phpbms/modules/bms/clients_import.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev: 258 $ | $LastChangedBy: brieb $
@@ -43 +43 @@
         include("include/imports.php");
         include("include/parsecsv.lib.php");
-        
+
         //if you need to overide the phpbmsTable class make sure to include the modules file
-        
+
         include("modules/bms/include/clients.php");
         include("modules/bms/include/addresses.php");
-        include("modules/bms/include/addresstorecord.php");     
-
-        //If the addedit page will be accessd directly from a page other than the 
+        include("modules/bms/include/addresstorecord.php");
+
+        //If the addedit page will be accessd directly from a page other than the
         // basic search results page, you may want to grab and pass the previous URL
         //with the following code
 
         //===================================================
-        if(!isset($_GET["backurl"])) 
-                $backurl = NULL; 
-        else{ 
+        if(!isset($_GET["backurl"]))
+                $backurl = NULL;
+        else{
                 $backurl = $_GET["backurl"];
                 if(isset($_GET["refid"]))
@@ -66 +66 @@
         if(isset($_GET["id"]))
                 $tabledefid = ((int)$_GET["id"]);
-        
+
 
         //Here you invoke the table and import classes.  If you are going to use the standard phpbmsTable class
         // for updates and the such you would access it like this
-        
+
                         //$thetable = new phpbmsTable($db,$tabledefid);
                         //$import = new phpbmsImport($thetable);
-        
+
         //if you are going to overide the class you would instantiate
         // like this
-                        
+
                         $importType = "csv";
                         if(isset($_POST["importType"])){
-                                
+
                                 switch($_POST["importType"]){
-                                        
+
                                         case 0:
                                                 $importType = "csv";
                                         break;
-                                        
+
                                         case 1:
                                                 $importType = "sugarcrm";
                                         break;
-                                        
+
                                 }//end switch
-                                
+
                         }//end if
-        
+
                         $thetable = new clients($db,2,$backurl);
                         $import = new clientsImport($thetable, $importType);
-        
+
         //and if you are setting the backurl, make sure you pass that as well
         // like this:
-        
+
         //              $thetable = new [tablename]($db,[table definition id],$backurl);
-        
-        
-        //Next we process the form (if submitted) and 
+
+
+        //Next we process the form (if submitted) and
         // return the current record as an array ($therecord)
         // or if this is a new record, it returns the defaults
@@ -114 +114 @@
 
         $pageTitle = ($therecord["title"])?$therecord["title"]:"General Table Import";
-        
+
         // Next, we set up to include any
         // additional css or javascript files we will be using
@@ -124 +124 @@
 
         // if you need to define a body onlload function, do so with the phpbms property
-        
+
         //              $phpbms->onload[] = "initializePage()";
 
@@ -130 +130 @@
         // Next we need to define any special fields that will be used in the form
         // A list of field objects (with documentation)is available in the /include/fields.php
-        // file.  
-        
+        // file.
+
         // We need to define them here in the head
         // so that any necessay javascript is loaded appropriately.
-        
+
                 //Form Elements
                 //==============================================================
-                
+
                 // Create the form
                 $theform = new importForm();
@@ -143 +143 @@
                 //if you need to set specific form vaiables (like enctype, or extra onsubmit
                 // you can set those form properties here.
-                
-                // for each field we will use, create the field object and add it to 
+
+                // for each field we will use, create the field object and add it to
                 // the forms list.
-                
+
                 $list = array("phpBMS csv file" => 0, "Sugar CRM (v5.0)" => 1);
                 $default = 0;
@@ -163 +163 @@
                 $theform->jsMerge();
                 //==============================================================
-                //End Form Elements     
-
-        include("header.php");  
-        
+                //End Form Elements
+
+        include("header.php");
+
 ?><div class="bodyline">
-        <!-- 
+        <!--
                 Next we start the form.  This also prints the H1 with title, and top save,cancel buttons
                 If you need to have other buttons, or need a specific top, you will need to create your form manually.
         -->
-        <?php $theform->startForm($pageTitle, $import->pageType)?>
+        <?php $theform->startForm($pageTitle, $import->pageType, count($import->transactionRecords))?>
 
         <div id="leftSideDiv">
@@ -180 +180 @@
                 <!-- /* This next input also determines whether the file/import fieldset will be displayed or if the preview sections will be displayed*/ -->
                 <input id="pageType" name="pageType" type="hidden" value="<?php echo $import->pageType?>" />
-                
+
                 <?php
                 if($import->pageType == "main"){ ?>
                 <fieldset>
                         <legend>import</legend>
-                        
+
                         <p><?php $theform->showField("importType"); ?></p>
-                        
+
                         <div id="uploadlabel">
                                 <p>
@@ -193 +193 @@
                                         <input id="import" name="import" type="file" size="64"/><br/>
                                 </p>
-                                
+
                                 <div id="info0" class="info">
                                         <p>
@@ -244 +244 @@
                 <?php
                 }//end if
-                
+
                 if($import->error && $import->pageType != "main"){
                         ?>
@@ -259 +259 @@
         </div>
         <div id="createmodifiedby" >
-        <?php   
+        <?php
                 //Last, we show the create/modifiy with the bottom save and cancel buttons
                 // and then close the form.
-                $theform->showButtons(2, $import->pageType);
+                $theform->showButtons(2, $import->pageType, count($import->transactionRecords));
                 ?></div><?php
                 $theform->endForm();

trunk/phpbms/modules/bms/include/addresses.php

@@ -41 +41 @@
         class addresses extends phpbmsTable{
 
+                function getName($tabledefid, $recordid){
 
-                function getName($tabledefid, $recordid){
-                
                         switch($tabledefid){
-                        
+
                                 case 2:
                                 default:
                                         $querystatement = "
-                                                SELECT 
+                                                SELECT
                                                         if(clients.lastname!='',concat(clients.lastname,', ',clients.firstname,if(clients.company!='',concat(' (',clients.company,')'),'')),clients.company) AS thename
                                                 FROM
@@ -56 +55 @@
                                                         id = ".$recordid;
                                         break;
-                                                        
+
                         }//endswitch tabledefid
-                
+
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         if($this->db->numRows($queryresult)){
-                        
+
                                 $therecord = $this->db->fetchArray($queryresult);
                                 return htmlQuotes($therecord["thename"]);
-                                
+
                         } else
                                 return "orphaned record: tableDefinitionID=".$tabledefid.", RecordID:".$recordid;
-                
+
                 }//end method - getName
-                
+
 
                 function showAssociations($addressid){
-                        // This function generates a table listing all the records 
+                        // This function generates a table listing all the records
                         // associated with the address record.
-                        
+
                         $querystatement = "
                                 SELECT
@@ -81 +80 @@
                                         addresstorecord.recordid,
                                         addresstorecord.primary,
-                                        addresstorecord.defaultshipto                                   
-                                FROM 
+                                        addresstorecord.defaultshipto
+                                FROM
                                         addresstorecord
                                 WHERE
@@ -89 +88 @@
                                         addresstorecord.tabledefid
                         ";
-                        
+
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         ?>
                         <table class="querytable" cellspacing="0" cellpadding="0" border="0">
@@ -108 +107 @@
                                 </tfoot>
                                 <tbody>
-                                <?php 
+                                <?php
                                         $row =1;
                                         while($therecord = $this->db->fetchArray($queryresult)) {
-                                        
+
                                                 $row = ($row==1)? 2:1;
-                                                
+
                                                 ?><tr class="qr<?php echo $row?>">
                                                         <td><?php echo $therecord["recordid"]?></td>
@@ -121 +120 @@
                                                 </tr>
                                                 <?php
-                                                
-                                        }//endwhile - therecord                                 
+
+                                        }//endwhile - therecord
                                 ?>
                                 </tbody>
                         </table>
                         <?php
-                
+
                 }//end method - showAssociation
 
+        }//end class
 
-                // CLASS OVERRIDES =================================================
-                        
-                function formatVariables($variables){
-                                                
-                        return $variables;                      
-                
-                }//end function
-        
-        
-                function updateRecord($variables, $modifiedby = NULL){
-        
-                        $variables = $this->formatVariables($variables);
-
-                        $thereturn = parent::updateRecord($variables, $modifiedby);
-                                                
-                        return $thereturn;
-                        
-                }//end method
-                
-                
-                function insertRecord($variables, $createdby = NULL){
-                
-                        $variables = $this->formatVariables($variables);
-        
-                        $newid = parent::insertRecord($variables, $createdby);
-                                                                        
-                        return $newid;
-                        
-                }//end method
-                        
-        }//end class
-        
 }//end if
 
 if(class_exists("searchFunctions")){
         class filesSearchFunctions extends searchFunctions{
-        
+
                 function delete_record(){
-                
+
                         $whereclause = $this->buildWhereClause();
                         $attachmentwhereclause = $this->buildWhereClause("attachments.fileid");
-                
+
                         $querystatement = "DELETE FROM attachments WHERE ".$attachmentwhereclause." AND attachments.fileid!=1;";
                         $queryresult = $this->db->query($querystatement);
-                
+
                         $querystatement = "DELETE FROM files WHERE ".$whereclause." AND files.id!=1;";
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $message = $this->buildStatusMessage();
                         $message.=" deleted";
                         return $message;
                 }
-        
+
         }//end class
 }//end if

trunk/phpbms/modules/bms/include/addresstorecord.php

@@ -39 +39 @@
 if(class_exists("addresses")){
         class addresstorecord extends addresses{
-        
+
+                var $availableTabledefIDs = array();
+                var $availableTabledefNames = array();
 
                 function createAddressToRecord($variables, $addressid, $createdby = NULL){
                         // This functions adds the addresstorecord record tying the client and address
                         // records.
-                
+
                         if(!$createdby && isset($_SESSION["userinfo"]["id"]))
                                 $createdby = $_SESSION["userinfo"]["id"];
-                                
+
                         $insertstatement = "
                                 INSERT INTO
@@ -70 +72 @@
                                         NOW(),
                                         ".((int) $createdby).",
-                                        NOW()                                   
+                                        NOW()
                                 )";
-                        
+
                         $insertresult = $this->db->query($insertstatement);
-                        
+
                         if($insertresult)
                                 return $this->db->insertId();
                         else
                                 return false;
-                        
+
                 }//end method - createAddressToRecord
-                
+
                 // CLASS OVERRIDES ===============================================
                 // ===============================================================
                 function getRecord($id){
                         $id = (int) $id;
-                        
+
                         $querystatement = "
                                 SELECT
-                                        *       
-                                FROM 
-                                        addresstorecord
-                                WHERE 
-                                        id = ".$id;                     
-                                        
+                                        *
+                                FROM
+                                        addresstorecord
+                                WHERE
+                                        id = ".$id;
+
                         $queryresult = $this->db->query($querystatement);
-                        if($this->db->numRows($queryresult)) { 
-                        
+                        if($this->db->numRows($queryresult)) {
+
                                 $therecord = $this->db->fetchArray($queryresult);
                                 $addressrecord = parent::getRecord($therecord["addressid"]);
 
                                 unset($addressrecord["id"], $addressrecord["createdby"], $addressrecord["creationdate"], $addressrecord["modifiedby"], $addressrecord["modifieddate"]);
-                                
+
                                 $therecord = array_merge($addressrecord, $therecord);
-                                
-                        } else 
+
+                        } else
                                 $therecord = $this->getDefaults();
 
                         return $therecord;
-        
+
                 }//end method - getRecord
-                
-                
+
+
                 function getDefaults(){
-                
+
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["addressid"] = 0;
                         $therecord["tabledefid"] = 0;
                         $therecord["recordid"] = NULL;
                         $therecord["defaultshipto"] = 0;
-                        $therecord["primary"] = 0;                      
-                        
-                        return $therecord;      
-        
+                        $therecord["primary"] = 0;
+
+                        return $therecord;
+
                 }//end method - getDefauls
-                
-                
-
-                function formatVariables($variables){
-                        
+
+
+                function populateTabledefArrays(){
+
+                        $this->availableTabledefIDs = array();
+                        $this->availableTabledefNames = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`,
+                                        `maintable`
+                                FROM
+                                        `tabledefs`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult)){
+                                        $this->availableTabledefIDs[] = $therecord["id"];
+                                        $this->availableTabledefNames[$therecord["id"]] = $therecord["maintable"];
+                                }//end while
+                        }else{
+                                $this->availableTabledefIDs[] = "none";
+                                $this->availableTabledefNames[] = "none";
+                        }//end if
+
+                }//end method --populateTabledefArray--
+
+
+                function checkRecordID($recordid, $tablename){
+
+                        $recordid = ((int) $recordid);
+                        $tablename = addslashes($tablename);
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `".$tablename."`
+                                WHERE
+                                        `id` = '".$recordid."';
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        return $this->db->numRows($queryresult);
+
+                }//end method --checkRecordID--
+
+
+                function verifyVariables($variables){
+                        //POSSIBLY CHANGE>>>> NOT FINISHIED >>>>
+                        //Check tabledefs
+                        if(isset($variables["tabledefid"])){
+
+                                if(is_numeric($variables["tabledefid"])){
+
+                                        if(!count($this->availableTabledefIDs) || !count($this->availableTabledefNames))
+                                                $this->populateTabledefArrays();
+
+                                        if(in_array($variables["tabledefid"], $this->availableTabledefIDs)){
+
+                                                //check recordid
+                                                if(isset($variables["recordid"])){
+
+                                                        if((int) $variables["recordid"] > 0){
+
+                                                                if(!count($this->availableTabledefIDs) || !count($this->availableTabledefNames))
+                                                                        $this->populateTabledefArrays();
+
+                                                                if(!$this->checkRecordID($variables["recordid"], $this->availableTabledefNames[$variables["tabledefid"]]))
+                                                                        $this->verifyErrors[] = "The `recordid` field does match an id number in ".$this->availableTabledefNames[$variables["tabledefid"]].".";
+
+                                                        }else
+                                                                $this->verifyErrors[] = "The `recordid` field must be a positive number.";
+
+                                                }else
+                                                        $this->verifyErrors[] = "The `recordid` field must be set.";
+
+                                        }else
+                                                $this->verifyErrors[] = "The `tabledefid` field does not give an existing/acceptable table definition id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `tabledefid` field must be numeric.";
+
+                        }else
+                                $this->verifyErrors[] = "The `tabledefid` field must be set.";
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
+                function prepareVariables($variables){
+
                         if(!isset($variables['primary']))
                                 $variables['primary'] = 0;
@@ -136 +229 @@
                         if(!isset($variables['defaultshipto']))
                                 $variables['defaultshipto'] = 0;
-                        
+
                         if(!isset($variables["existingaddressid"]))
                                 $variables["existingaddressid"] = false;
-                                                
-                        return $variables;                      
-                
+
+                        if(isset($variables["id"]))
+                                if($variables["id"]){// if update
+
+                                        $variables["id"] = $variables["addressid"];
+
+                                }//end if
+
+                        return $variables;
+
                 }//end function
 
 
-
-                function updateRecord($variables, $modifiedby = NULL){
-        
-                        $variables = $this->formatVariables($variables);
-
-                        $variables["id"] = $variables["addressid"];
-        
-                        $thereturn = parent::updateRecord($variables, $modifiedby);
-                                                
-                        return $thereturn;
-                        
-                }//end method
-                
-        
                 function insertRecord($variables, $createdby = NULL){
 
-                        $variables = $this->formatVariables($variables);
+                        //$variables = $this->prepareVariables($variables);
 
                         if($variables["existingaddressid"]){
-                        
+
                                 $this->createAddressToRecord($variables, $variables["existingaddressid"], $createdby);
-                                
+
                                 $newAtrID = $variables["existingaddressid"];
-                        
+
                         } else {
 
                                 $newid = parent::insertRecord($variables, $createdby);
-                                
+
                                 //create the addresstorecord
                                 $newAtrID = $this->createAddressToRecord($variables, $newid, $createdby);
-                                
+
                         }//endif - existingaddressid
-                        
+
                         return $newAtrID;
-                                        
+
                 }//end method
-                
+
         }//end class
 }//end if
@@ -192 +278 @@
 
                         $whereclause = $this->buildWhereClause();
-                        
+
                         //We need to itterate trhough each record
-                        // to check for cross-record addresses                  
+                        // to check for cross-record addresses
                         $querystatement = "
                                 SELECT
@@ -201 +287 @@
                                         addresstorecord
                                 WHERE ".$whereclause;
-                        
+
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $removedCount = 0;
                         $deletedCount = 0;
                         $beenMarked = false;
-                        
+
                         while($therecord = $this->db->fetchArray($queryresult)){
 
@@ -213 +299 @@
                                 // cannot be removed
                                 if(!$therecord["primary"] && !$therecord["defaultshipto"]){
-                                
+
                                         //look up address to see if it is associated with other records
                                         $querystatement = "
@@ -224 +310 @@
                                                         AND tabledefid = ".$therecord["tabledefid"]."
                                                         AND recordid != ".$therecord["recordid"];
-                                                        
+
                                         $lookupResult = $this->db->query($querystatement);
 
                                         if(!$this->db->numRows($lookupResult)){
-                                        
+
                                                 //we can safely delete the address (no other associations)
                                                 $deletestatement = "
@@ -237 +323 @@
 
                                                 $this->db->query($deletestatement);
-                                                
+
                                                 $deletedCount++;
                                                 $removedCount--;
-                                                
+
                                         }//end if - numRows
-                                
+
                                         //remove the connecting record
                                         $deletestatement = "
@@ -249 +335 @@
                                                 WHERE
                                                         id =".$therecord["id"];
-                                        
+
                                         $this->db->query($deletestatement);
-                                        
+
                                         $removedCount++;
-                                
+
                                 } else {
-                                
-                                        $beenMarked = true;                     
-                                        
+
+                                        $beenMarked = true;
+
                                 }//endif - primary or defaultshipto
-                                
+
                         }//endwhile - fetchArray
 
                         //next, craft the response
-                        
+
                         $message = "";
-                        
-                        if($removedCount){      
-                                
+
+                        if($removedCount){
+
                                 $message .= $removedCount." address";
-                                
+
                                 if($removedCount > 1)
                                         $message .= "es";
-                                
+
                                 $message .= " dissociated from record. ";
-                                
+
                         }//endif removedCount
-                        
-                        if($deletedCount){      
-                                
+
+                        if($deletedCount){
+
                                 $message .= $deletedCount." address";
-                                
+
                                 if($deletedCount > 1)
                                         $message .= "es";
-                                
+
                                 $message .= " deleted. ";
-                                
+
                         }//endif removedCount
 
@@ -294 +380 @@
                                 $message .= "(Addresses marked primary or default ship to cannot be removed.)";
                         return $message;
-                        
+
                 }//end method - delete
 
-                
+
                 function markPrimary(){
-                
+
                         return $this->_markAs("primary")." primary address.";
-                
+
                 }//end method - markPrimary
-                
-                
+
+
                 function markDefaultShipTo(){
 
@@ -323 +409 @@
                                 WHERE
                                         id =".((int) $this->idsArray[0]);
-                        
+
                         $relatedInfo = $this->db->fetchArray($this->db->query($querystatement));
-                        
+
                         //Next, mark all addresses associated with record as false
                         $updatestatement = "
@@ -335 +421 @@
                                         tabledefid = ".$relatedInfo["tabledefid"]."
                                         AND recordid = ".$relatedInfo["recordid"];
-                                        
+
                         $this->db->query($updatestatement);
-                        
+
                         //Finally, mark the first record.
                         $updatestatement = "
@@ -346 +432 @@
                                 WHERE
                                         id = ".((int) $this->idsArray[0]);
-                        
+
                         $this->db->query($updatestatement);
 
@@ -357 +443 @@
 
                         return $message;
-                        
+
                 }//end method _markAs
 

trunk/phpbms/modules/bms/include/clients.php

@@ -40 +40 @@
 if(class_exists("phpbmsTable")){
         class clients extends phpbmsTable{
-        
+
+                var $availablePaymentMethodIDs = array();
+                var $availableShippingMethodIDs = array();
+                var $availableDiscountIDs = array();
+                var $availableTaxIDs = array();
+                var $availableUserIDs = array();
+                var $verifyErrors = array();
+
                 function checkForInvoices($id){
                         $querystatement="SELECT id FROM invoices WHERE clientid=".((int) $id);
                         $queryresult = $this->db->query($querystatement);
-        
+
                         return !($this->db->numRows($queryresult)===0);
                 }//end method
-        
-        
+
+
                 // CLASS OVERRIDES ===================================================================
                 // ===================================================================================
 
                 function clients($db,$tabledefid = 0,$backurl = NULL){
-                        
+
                         $this->phpbmsTable($db,$tabledefid,$backurl);
-                        
+
                         $this->address = new addresstorecord($db, 306);
-                        
+
                 }//end function - init
-                
+
 
                 function getDefaults(){
@@ -66 +73 @@
 
                         $therecord["type"] = DEFAULT_CLIENTTYPE;
-                        
+
                         if($therecord["type"] == "client") {
 
@@ -74 +81 @@
 
                         }//end if
-                        
+
                         $therecord["webaddress"] = "http://";
-                        
+
                         //now for the address information.
                         $addressinfo = $this->address->getDefaults();
                         unset($addressinfo["id"], $addressinfo["createdby"], $addressinfo["creationdate"], $addressinfo["modifiedby"], $addressinfo["modifieddate"]);
                         $addressinfo["addressid"] = NULL;
-                        
+
                         return array_merge($therecord, $addressinfo);
-                                                
+
                 }//end function - getDefaults
-                
-        
+
+
                 function getRecord($id){
 
                         $id = (int) $id;
-                        
+
                         $therecord = parent::getRecord($id);
-                        
+
                         if($therecord["id"]){
                                 //need to grab the address as well
-                                
+
                                 $querystatement = "
                                         SELECT
@@ -107 +114 @@
 
                                 $queryresult = $this->db->query($querystatement);
-                                
+
                                 $addressinfo = $this->db->fetchArray($queryresult);
 
                                 if($addressinfo) {
-                                        
+
                                         $addressinfo = $this->address->getRecord($addressinfo["id"]);
-                                
+
                                 } else {
 
                                         $addressinfo = $this->address->getDefaults();
                                         $addressinfo["addressid"] = NULL;
-                                        
-                                }//endif                        
+
+                                }//endif
 
                                 unset($addressinfo["id"], $addressinfo["notes"], $addressinfo["email"], $addressinfo["createdby"], $addressinfo["creationdate"], $addressinfo["modifiedby"], $addressinfo["modifieddate"]);
 
                                 $therecord = array_merge($therecord, $addressinfo);
-                        
+
                         }//endif
-                        
+
                         return $therecord;
-                
+
                 }//end function - getRecord
-                
+
+
+                function populatePaymentMethodArray(){
+
+                        $this->availablePaymentMethodIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `paymentmethods`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availablePaymentMethodIDs[] = 0;//for none
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availablePaymentMethodIDs[] = $therecord["id"];
+
+                }//end method --populatePaymentMethodArray--
+
+
+                function populateShippingMethodArray(){
+
+                        $this->availableShippingMethodIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `shippingmethods`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableShippingMethodIDs[] = 0;//for none
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableShippingMethodIDs[] = $therecord["id"];
+
+                }//end method --populateShippingMethodArray--
+
+
+                function populateDiscountArray(){
+
+                        $this->availableDiscountIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `discounts`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableDiscountIDs[] = 0;//for none
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableDiscountIDs[] = $therecord["id"];
+
+                }//end method  --populateDiscountArray--
+
+
+                function populateTaxArray(){
+
+                        $this->availableTaxIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `tax`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableTaxIDs[] = 0;//for none
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableTaxIDs[] = $therecord["id"];
+
+                }//end method  --populateTaxArray--
+
+
+                function populateUserArray(){
+
+                        $this->availableUserIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `users`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableUserIDs[] = 0;//for none
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableUserIDs[] = $therecord["id"];
+
+                }//end method  --populateUserArray--
+
+
+                function verifyVariables($variables){
+
+                        if(isset($variables["type"])){
+                                switch($variables["type"]){
+
+                                        case "prospect":
+
+                                                if(isset($variables["becameclient"])){
+                                                        if($variables["becameclient"] !== "" || $variables["becameclient"] !== NULL)
+                                                                $this->verifyErrors[] = "Records with `type` of 'prospect'
+                                                                        must have the `becameclient` field kept blank.";
+                                                }//end if
+
+                                                if(isset($variables["hascredit"])){
+                                                        if($variables["hascredit"])
+                                                                $this->verifyErrors[] = "Records with `type` of 'prospect'
+                                                                        must have the `hascredit` field kept blank or 0.";
+                                                }//end if
+
+                                                if(isset($variables["creditlimit"])){
+                                                        if($variables["creditlimit"])
+                                                                $this->verifyErrors[] = "Records with `type` of 'prospect'
+                                                                        must have the `creditlimit` field kept blank or 0.";
+                                                }//end if
+
+                                        break;
+
+                                        case "client":
+                                                if(isset($variables["becameclient"])){
+                                                        //Possibly run through string to date functions
+                                                        if(!$variables["becameclient"])
+                                                                $this->verifyErrors[] = "Records with `type` of 'client'
+                                                                        must have not have the `becameclient` field blank.";
+                                                }else
+                                                        $this->verifyErrors[] = "Records with `type` of 'client'
+                                                                must set the `becameclient` field.";
+                                        break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of the `type` field is invalid.
+                                                        It must either be 'prospect' or 'client'.";
+                                        break;
+
+                                }//end switch
+                        }else
+                                $this->verifyErrors[] = "The `type` field must be set.";
+
+                        //check for currency on credit limit (((real value) >= 0 ... non-negative)
+                        if(isset($variables["creditlimit"]))
+                                if(!is_numeric($variables["creditlimit"]) && $variables["creditlimit"])
+                                        $this->verifyErrors[] = "The `creditlimit` field must be a real number or equivalent to zero.";
+
+                        //----------------[ phone & email ]------------------------------------------------------
+                        //check valid email
+                        if(isset($variables["email"]))
+                                if( $variables["email"] !== NULL && $variables["email"] !== "" && !validateEmail($variables["email"]))
+                                        $this->verifyErrors[] = "The `email` field must have a valid email or must be left blank.";
+
+                        //check valid homephone
+                        if(isset($variables["homephone"]))
+                                if( $variables["homephone"] !== NULL && $variables["homephone"] !== "" && !validatePhone($variables["homephone"]))
+                                        $this->verifyErrors[] = "The `homephone` field must have a valid phone number (as set in configuration) or must be left blank.";
+
+                        //check valid workphone
+                        if(isset($variables["workphone"]))
+                                if( $variables["workphone"] !== NULL && $variables["workphone"] !== "" && !validatePhone($variables["workphone"]))
+                                        $this->verifyErrors[] = "The `workphone` field must have a valid phone number (as set in configuration) or must be left blank.";
+
+                        //check valid mobilephone
+                        if(isset($variables["mobilephone"]))
+                                if( $variables["mobilephone"] !== NULL && $variables["mobilephone"] !== "" && !validatePhone($variables["mobilephone"]))
+                                        $this->verifyErrors[] = "The `mobilephone` field must have a valid phone number (as set in configuration) or must be left blank.";
+
+                        //check valid fax
+                        if(isset($variables["fax"]))
+                                if( $variables["fax"] !== NULL && $variables["fax"] !== "" && !validatePhone($variables["fax"]))
+                                        $this->verifyErrors[] = "The `fax` field must have a valid phone number (as set in configuration) or must be left blank.";
+
+                        //check valid otherphone
+                        if(isset($variables["otherphone"]))
+                                if( $variables["otherphone"] !== NULL && $variables["otherphone"] !== "" && !validatePhone($variables["otherphone"]))
+                                        $this->verifyErrors[] = "The `otherphone` field must have a valid phone number (as set in configuration) or must be left blank.";
+
+                        //check bool on has credit
+                        if(isset($variables["hascredit"]))
+                                if($variables["hascredit"] && $variables["hascredit"] != 1)
+                                        $this->verifyErrors[] = "The `hascredit` field must be a boolean (equivalent to 0 or exactly 1).";
+
+
+                        //----------------[ Order Defaults]------------------------------------------------------
+
+                        //Payement Method
+                        if(isset($variables["paymentmethodid"])){
+
+                                if( !$variables["paymentmethodid"] || ((int)$variables["paymentmethodid"]) > 0 ){
+
+                                        if(!count($this->availablePaymentMethodIDs))
+                                                $this->populatePaymentMethodArray();
+
+                                        if(!in_array($variables["paymentmethodid"], $this->availablePaymentMethodIDs))
+                                                $this->verifyErrors[] = "The `paymentmethodid` field does not give an existing/acceptable payment method id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `addroleid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["shippingmethodid"])){
+
+                                if( !$variables["shippingmethodid"] || ((int)$variables["shippingmethodid"]) > 0){
+
+                                        if(!count($this->availableShippingMethodIDs))
+                                                $this->populateShippingMethodArray();
+
+                                        if(!in_array($variables["shippingmethodid"], $this->availableShippingMethodIDs))
+                                                $this->verifyErrors[] = "The `shippingmethodid` field does not give an existing/acceptable shipping method id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `shippingmethodid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["discountid"])){
+
+                                if( !$variables["discountid"] || ((int)$variables["discountid"]) > 0){
+
+                                        if(!count($this->availableDiscountIDs))
+                                                $this->populateDiscountArray();
+
+                                        if(!in_array($variables["discountid"], $this->availableDiscountIDs))
+                                                $this->verifyErrors[] = "The `discount` field does not give an existing/acceptable discount id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `discountid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        if(isset($variables["taxareaid"])){
+
+                                if( !$variables["taxareaid"] || ((int)$variables["taxareaid"]) > 0){
+
+                                        if(!count($this->availableTaxIDs))
+                                                $this->populateTaxArray();
+
+                                        if(!in_array($variables["taxareaid"], $this->availableTaxIDs))
+                                                $this->verifyErrors[] = "The `taxareaid` field does not give an existing/acceptable tax id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `taxareaid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        //---------------------[ end order defaults ]----------------------------------------
+
+                        //check sales manager id
+                        if(isset($variables["salesmanagerid"])){
+
+                                if( !$variables["salesmanagerid"] || ((int)$variables["salesmanagerid"]) > 0 ){
+
+                                        if(!count($this->availableUserIDs))
+                                                $this->populateUserArray();
+
+                                        if(!in_array($variables["salesmanagerid"], $this->availableUserIDs))
+                                                $this->verifyErrors[] = "The `salesmanagerid` field does not give an existing/acceptable user id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `salesmanagerid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+
+                        return parent::verifyVariables($variables);
+
+                }//end method
+
 
                 function prepareVariables($variables){
-                
+
                         if(isset($variables["webaddress"]))
-                                if ($variables["webaddress"]=="http://") 
+                                if ($variables["webaddress"]=="http://")
                                         $variables["webaddress"] = NULL;
 
                         if(!isset($variables["type"]))
                                 $variables["type"] = "client";
-                                
+
                         if($variables["type"] == "prospect"){
 
@@ -149 +437 @@
                                 $variables["type"] = "client";
                                 if(!isset($variables["becameclient"]))
+                                        $variables["becameclient"] = NULL;
+                                if(!$variables["becameclient"])
                                         $variables["becameclient"] = dateToString(mktime());
                         }//end if
 
                         return $variables;
-                        
+
                 }//end method
-                
-        
+
+
                 function updateRecord($variables, $modifiedby = NULL){
-                        
-                        $variables = $this->prepareVariables($variables);
-                        
+
+                        //$variables = $this->prepareVariables($variables);
+
                         $thereturn = parent::updateRecord($variables, $modifiedby);
-                        
+
+                        $variables["recordid"] = $variables["id"];//here to pass addresstorecord validation
+                        $variables["tabledefid"] = 2;//here to pass addresstorecord validation
                         //need to update the address
                         $variables["id"] = $variables["addressid"];
@@ -174 +466 @@
                         unset($this->address->fields["creationdate"]);
 
-                        $this->address->updateRecord($variables, $modifiedby);
+                        $variables = $this->address->prepareVariables($variables);
+                        $errorArray = $this->address->verifyVariables($variables);
+                        if(!count($errorArray)){
+                                $this->address->updateRecord($variables, $modifiedby);
+                        }else{
+                                foreach($errorArray as $error)
+                                        $logError = new appError(-910, $error, "Address Verification Error");
+                        }//end if
 
                         //restore the fields
                         $this->address->getTableInfo();
-                        
+
                         return $thereturn;
-                        
+
                 }//end method - updateRecord
-                
-                
+
+
                 function insertRecord($variables, $createdby = NULL){
-                        
-                        $variables = $this->prepareVariables($variables);
-                        
+
+                        //$variables = $this->prepareVariables($variables);
+
                         $newid = parent::insertRecord($variables, $createdby);
-                        
+
                         //need to create the address and addresstorecord id
                         // make sure we are not setting extra info
@@ -200 +499 @@
                         $variables["defaultshipto"] = 1;
                         $variables["primary"] = 1;
-                        
-                        $this->address->insertRecord($variables, $createdby);
+
+                        $variables = $this->address->prepareVariables($variables);
+                        $errorArray = $this->address->verifyVariables($variables);
+                        if(!count($errorArray)){
+                                $this->address->insertRecord($variables, $createdby);
+                        }else{
+                                foreach($errorArray as $error)
+                                        $logError = new appError(-910, $error, "Address Verification Error");
+                        }//end if
 
                         //restore the fields
                         $this->address->getTableInfo();
-                        
+
                         return $newid;
-                        
+
                 }//end method - insertRecord
-                
+
         }//end class
-        
+
 }//end if
 
@@ -219 +525 @@
 
                 function mark_asclient(){
-                
+
                         //passed variable is array of user ids to be revoked
-                        $whereclause = $this->buildWhereClause();       
-                
+                        $whereclause = $this->buildWhereClause();
+
                         $querystatement = "UPDATE clients SET clients.type=\"client\",modifiedby=\"".$_SESSION["userinfo"]["id"]."\" WHERE (".$whereclause.");";
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $message = $this->buildStatusMessage();
                         $message.=" converted to client.";
                         return $message;
                 }
-                
-                
+
+
                 //Stamp Comments Field with info packet sent
                 function stamp_infosent(){
-                
+
                         //passed variable is array of user ids to be revoked
                         $whereclause = $this->buildWhereClause();
-                
+
                         $querystatement = "
                                 UPDATE
-                                        clients 
+                                        clients
                                 SET
-                                        clients.comments = concat('Information Packet Sent', char(10), clients.comments), 
+                                        clients.comments = concat('Information Packet Sent', char(10), clients.comments),
                                         clients.modifiedby=".$_SESSION["userinfo"]["id"].",
                                         clients.modifieddate = NOW()
                                 WHERE (".$whereclause.") AND clients.comments IS NOT NULL";
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $affected = $this->db->affectedRows();
 
                         $querystatement = "
                                 UPDATE
-                                        clients 
+                                        clients
                                 SET
-                                        clients.comments = 'Information Packet Sent', 
+                                        clients.comments = 'Information Packet Sent',
                                         clients.modifiedby=".$_SESSION["userinfo"]["id"].",
                                         clients.modifieddate = NOW()
@@ -261 +567 @@
 
                         $affected += $this->db->affectedRows();
-                        
+
                         $message = $this->buildStatusMessage($affected);
                         $message.=" marked as info packet sent.";
                         return $message;
                 }
-                
-                
+
+
                 //remove prospects
                 function delete_prospects(){
-                
+
                         //passed variable is array of user ids to be revoked
                         $clientWhereClause = $this->buildWhereClause();
@@ -282 +588 @@
                                         (".$clientWhereClause.")
                                         AND clients.type = 'prospect'";
-                                        
+
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         //build array of ids to be removed
                         $deleteIDs = array();
@@ -291 +597 @@
 
                         if(count($deleteIDs)){
-                        
+
                                 $a2rWhere = $this->buildWhereClause("recordid", $deleteIDs);
 
@@ -303 +609 @@
                                                 tabledefid = 2
                                                 AND (".$a2rWhere.")";
-                                                
+
                                 $a2rResult = $this->db->query($querystatement);
-                                
+
                                 $addressIDs = array();
                                 while($a2r = $this->db->fetchArray($a2rResult))
                                         array_push($addressIDs, $a2r["addressid"]);
-                                        
-                                // delete all a2r records for prospect  
+
+                                // delete all a2r records for prospect
                                 $deletestatement = "
                                         DELETE FROM
@@ -317 +623 @@
                                                 tabledefid = 2
                                                 AND (".$a2rWhere.")";
-                                                
+
                                 $this->db->query($deletestatement);
-                                
+
                                 //now go get a list of orphaned addresses
                                 $querystatement = "
-                                        SELECT 
-                                                addresses.id, 
-                                                addresstorecord.id as a2rid 
-                                        FROM 
+                                        SELECT
+                                                addresses.id,
+                                                addresstorecord.id as a2rid
+                                        FROM
                                                 addresses LEFT JOIN addresstorecord ON addresstorecord.addressid = addresses.id
                                         WHERE
                                                 ".$this->buildWhereClause("addresses.id", $addressIDs);
-                                                
+
                                 $addressResult = $this->db->query($querystatement);
-                                
+
                                 $addressIDs = array();
                                 while($address = $this->db->fetchArray($addressResult))
                                         if(!$address["a2rid"])
                                                 array_push($addressIDs, $address["id"]);
-                                                
+
                                 if(count($addressIDs)){
-                                
-                                        //delete orphaned addresses             
+
+                                        //delete orphaned addresses
                                         $deletestatement = "
-                                                DELETE FROM 
+                                                DELETE FROM
                                                         addresses
                                                 WHERE
                                                         ".$this->buildWhereClause("addresses.id", $addressIDs);
-                                                        
+
                                         $this->db->query($deletestatement);
-                                        
+
                                 }//endif - addressids
 
@@ -359 +665 @@
                                         WHERE
                                                 ".$invoiceWhereClause;
-                                                
+
                                 $invoiceresult = $this->db->query($invoicestatement);
-                                
+
                                 //build invoice id array
                                 $invoiceids = array();
                                 while($therecord = $this->db->fetchArray($invoiceresult))
                                         array_push($invoiceids, $therecord["id"]);
-                                
+
                                 if(count($invoiceids)) {
                                         $invoiceWhereClause = $this->buildWhereClause("invoices.id", $invoiceids);
-                                        
+
                                         $lineitemWhereClause = $this->buildWhereClause("invoiceid", $invoiceids);
-                
+
                                         $lineItemDeleteStatement = "
                                                 DELETE FROM
@@ -377 +683 @@
                                                 WHERE
                                                         ".$lineitemWhereClause;
-                
+
                                         $queryresult = $this->db->query($lineItemDeleteStatement);
-                
+
                                         $statushistoryDeleteStatement = "
                                                 DELETE FROM
@@ -385 +691 @@
                                                 WHERE
                                                         ".$lineitemWhereClause;
-                
+
                                         $queryresult = $this->db->query($statushistoryDeleteStatement);
-                                        
+
                                         $invoiceDeleteStatement = "
                                                 DELETE FROM
                                                         invoices
-                                                WHERE                                   
+                                                WHERE
                                                         ".$invoiceWhereClause;
-        
+
                                         $queryresult = $this->db->query($invoiceDeleteStatement);
-        
+
                                 }//end if
 
@@ -402 +708 @@
 
                                 $deletestatement = "
-                                        DELETE FROM 
+                                        DELETE FROM
                                                 clients
-                                        WHERE 
+                                        WHERE
                                                 ".$delWhere;
-                                                
+
                                 $this->db->query($deletestatement);
-                                                        
-                        }//endif - count deleteIDS                                                                                              
-
-                
+
+                        }//endif - count deleteIDS
+
+
                         $message = $this->buildStatusMessage(count($deleteIDs));
                         $message.=" deleted.";
-                        return $message;        
-                        
+                        return $message;
+
                 }// end method - delete_prospects
-                
-                
+
+
                 function massEmail(){
                         if(DEMO_ENABLED != "true"){
@@ -428 +734 @@
                 }
 
-        
+
         }//end class
 }//end if
 if(class_exists("phpbmsImport")){
         class clientsImport extends phpbmsImport{
-                
-                
+
+
                 function clientsImport($table, $importType = "csv"){
-                        
+
                         if($importType == "sugarcrm"){
-                                
+
                                 $importType = "csv";
                                 $switchedFrom = "sugarcrm";
-                                
+
                         }//end if
-                        
+
                         parent::phpbmsImport($table, $importType);
-                        
+
                         if(isset($switchedFrom))
                                 $this->importType = $switchedFrom;
-                        
+
                 }//end method --clientsImport--
-                
-                
+
+
                 function _parseFromData($data){
-                        
+
                         if($this->importType == "sugarcrm"){
-                                
+
                                 $this->importType = "csv";
                                 $switchedFrom = "sugarcrm";
-                                
+
                         }//end if
-                        
+
                         $thereturn = parent::_parseFromData($data);
-                        
+
                         if(isset($switchedFrom))
                                 $this->importType = $switchedFrom;
-                        
+
                         return $thereturn;
-                
+
                 }//end method --_parseFromFile--
-                
-                
+
+
                 function _formatSugarVariables($rows, $titles){
-                        
+
                         //Replace the titles with valid ones
                         //(At the moment we only really need
@@ -480 +786 @@
                         $newTitles = array();
                         foreach($titles as $index => $name){
-                                
+
                                 switch($name){
-                                        
+
                                         case "name":
                                                 $newTitles[] = "company";
                                         break;
-                                        
+
                                         case "date_entered":
                                                 $newTitles[] = "becameclient";
                                         break;
-                                        
+
                                         case "description":
                                                 $newTitles[] = "comments";
                                         break;
-                                        
+
                                         case "deleted":
                                                 $newTitles[] = "inactive";
                                         break;
-                                        
+
                                         case "account_type":
                                                 $newTitles[] = "type";
                                         break;
-                                        
+
                                         case "industry":
                                                 $newTitles[] = "category";
                                         break;
-                                        
+
                                         case "phone_fax":
                                                 $newTitles[] = "fax";
                                         break;
-                                        
+
                                         case "billing_address_street":
                                                 $newTitles[] = "address1";
                                         break;
-                                        
+
                                         case "billing_address_city":
                                                 $newTitles[] = "city";
                                         break;
-                                        
+
                                         case "billing_address_state":
                                                 $newTitles[] = "state";
                                         break;
-                                        
+
                                         case "billing_address_postalcode":
                                                 $newTitles[] = "postalcode";
                                         break;
-                                        
+
                                         case "billing_address_country":
                                                 $newTitles[] = "country";
                                         break;
-                                        
+
                                         case "phone_office":
                                                 $newTitles[] = "workphone";
                                         break;
-                                        
+
                                         case "phone_alternate":
                                                 $newTitles[] = "otherphone";
                                         break;
-                                        
+
                                         case "website":
                                                 $newTitles[] = "webaddress";
                                         break;
-                                        
+
                                         case "shipping_address_street":
                                                 $newTitles[] = "shipaddress1";
                                         break;
-                                        
+
                                         case "shipping_address_city":
                                                 $newTitles[] = "shipcity";
                                         break;
-                                        
+
                                         case "shipping_address_state":
                                                 $newTitles[] = "shipstate";
                                         break;
-                                        
+
                                         case "shipping_address_postalcode":
                                                 $newTitles[] = "shippostalcode";
                                         break;
-                                        
+
                                         case "shipping_address_country":
                                                 $newTitles[] = "shipcountry";
                                         break;
-                                        
+
                                 }//end switch
-                                
+
                         }//end foreach
-                        
-                        
+
+
                         $newRows = array();
                         foreach($rows as $rowData){
-                                
+
                                 $newRowData = array();
                                 $addComments = "";
                                 foreach($rowData as $name => $data){
-                                        
+
                                         switch($name){
-                                        
+
                                                 case "name":
                                                         $newRowData["company"] = trim($data);
                                                 break;
-                                                
+
                                                 case "date_entered":
                                                         $newRowData["becameclient"] = trim($data);
                                                 break;
-                                                
+
                                                 case "description":
                                                         $newRowData["comments"] = trim($data);
                                                 break;
-                                                
+
                                                 case "deleted":
                                                         $newRowData["inactive"] = trim($data);
                                                 break;
-                                                
+
                                                 case "industry":
                                                         $newRowData["category"] = trim($data);
                                                 break;
-                                                
+
                                                 case "account_type":
                                                         $newRowData["type"] = trim($data);
                                                 break;
-                                                
+
                                                 case "phone_fax":
                                                         $newRowData["fax"] = trim($data);
                                                 break;
-                                                
+
                                                 case "billing_address_street":
                                                         $newRowData["address1"] = trim($data);
                                                 break;
-                                                
+
                                                 case "billing_address_city":
                                                         $newRowData["city"] = trim($data);
                                                 break;
-                                                
+
                                                 case "billing_address_state":
                                                         $newRowData["state"] = trim($data);
                                                 break;
-                                                
+
                                                 case "billing_address_postalcode":
                                                         $newRowData["postalcode"] = trim($data);
                                                 break;
-                                                
+
                                                 case "billing_address_country":
                                                         $newRowData["country"] = trim($data);
                                                 break;
-                                                
+
                                                 case "phone_office":
                                                         $newRowData["workphone"] = trim($data);
                                                 break;
-                                                
+
                                                 case "phone_alternate":
                                                         $newRowData["otherphone"] = trim($data);
                                                 break;
-                                                
+
                                                 case "website":
                                                         $newRowData["webaddress"] = trim($data);
                                                 break;
-                                                
+
                                                 case "shipping_address_street":
                                                         $newRowData["shipaddress1"] = trim($data);
                                                 break;
-                                                
+
                                                 case "shipping_address_city":
                                                         $newRowData["shipcity"] = trim($data);
                                                 break;
-                                                
+
                                                 case "shipping_address_state":
                                                         $newRowData["shipstate"] = trim($data);
                                                 break;
-                                                
+
                                                 case "shipping_address_postalcode":
                                                         $newRowData["shippostalcode"] = trim($data);
                                                 break;
-                                                
+
                                                 case "shipping_address_country":
                                                         $newRowData["shipcountry"] = trim($data);
                                                 break;
-                                                
+
                                                 case "annual_revenue":
                                                 case "rating":
@@ -665 +971 @@
                                                                 $addComments .= "\n".str_replace("_"," ",$name).": ".trim($data);
                                                 break;
-                                                
+
                                         }//end switch
-                                        
+
                                 }//end foreach
-                                
+
                                 if($newRowData["type"] == "prospect")
                                         $newRowData["becameclient"] = NULL;
-                                
+                                else
+                                        $newRowData["type"] = "client";
+
                                 $newRowData["comments"] .= $addComments;
                                 $newRows[] = $newRowData;
-                                
+
                         }//end foreach
-                        
+
                         $thereturn["rows"] = $newRows;
                         $thereturn["titles"] = $newTitles;
                         return $thereturn;
-                        
+
                 }//end method --_formatSugarvariables--
-                
-                
+
+
                 function importRecords($rows, $titles){
-                        
+
                         switch($this->importType){
-                                
+
                                 case "sugarcrm":
                                         $thereturn = $this->_formatSugarVariables($rows, $titles);
                                         $rows = $thereturn["rows"];
                                         $titles = $thereturn["titles"];
-                                
-                                case "csv":                     
+
+                                case "csv":
                                         //count total fieldnames (top row of csv document)
                                         $fieldNum = count($titles);
-                                        
+
                                         //the file starts at line number 1, but since line 1 is
                                         //supposed to be the fieldnames in the table(s), the lines
                                         //being insereted start @ 2.
                                         $rowNum = 2;
-                                        
+
                                         //get the data one row at a time
                                         foreach($rows as $rowData){
-                                                
-                                                $theid = 0;
-                                                
+
+                                                $theid = 0; // set for when verifification does not pass
+                                                $verify = array(); //set for when number of field rows does not match number of titles
+
                                                 //trim off leading/trailing spaces
                                                 $trimmedRowData = array();
                                                 foreach($rowData as $name => $data)
                                                         $trimmedRowData[$name] = trim($data);
-                                                
+
                                                 //check to see if number of fieldnames is consistent for each row
                                                 $rowFieldNum = count($trimmedRowData);
-                                                
+
                                                 //if valid, insert, if not, log error and don't insert.
-                                                if($rowFieldNum == $fieldNum)
-                                                        $theid = $this->table->insertRecord($trimmedRowData);
-                                                else
+                                                if($rowFieldNum == $fieldNum){
+                                                        //$trimmedRowData = $this->table->prepareVariables($trimmedRowData);
+                                                        $verify = $this->table->verifyVariables($trimmedRowData);
+                                                        if(!count($verify))
+                                                                $theid = $this->table->insertRecord($trimmedRowData);
+                                                }else
                                                         $this->error .= '<li> incorrect amount of fields for line number '.$rowNum.'.</li>';
-                                                
+
                                                 if($theid){
                                                         //keep track of the ids in the transaction to be able to select them
                                                         //for preview purposes
                                                         $this->transactionIDs[] = $theid;
-                                                        
+
                                                         //get first id to correct auto increment
                                                         if(!$this->revertID)
                                                                 $this->revertID = $theid;
-                                                        
+
                                                         //If it is a sugarcrm import, insert the shipping address as well
+                                                        $addressVerify = array();
                                                         if($this->importType == "sugarcrm"){
-                                                                
-                                                                
+
+
                                                                 $variables = array();
                                                                 if($trimmedRowData["shipaddress1"]) $variables["address1"] = $trimmedRowData["shipaddress1"];
@@ -740 +1053 @@
                                                                 if($trimmedRowData["shipstate"]) $variables["state"] = $trimmedRowData["shipstate"];
                                                                 if($trimmedRowData["shipcountry"]) $variables["country"] = $trimmedRowData["shipcountry"];
-                                                                
+
                                                                 //check to see if there is a shipping address
                                                                 if(count($variables)){
-                                                                        
+
                                                                         //If there is a shipping address, we need to make any others'
                                                                         //`defaultshipto` to 0
-                                                                        
+
                                                                         $querystatement = "
                                                                                 UPDATE
@@ -757 +1070 @@
                                                                                         `addresstorecord`.`tabledefid` = '2';
                                                                                 ";
-                                                                                
+
                                                                         $this->table->db->query($querystatement);
-                                                                        
+
                                                                         $variables["title"] = "Main Shipping Addresss";
                                                                         $variables["tabledefid"] = 2;
@@ -765 +1078 @@
                                                                         $variables["defaultshipto"] = 1;
                                                                         $variables["primary"] = 0;
-                                                                        
-                                                                        $this->table->address->insertRecord($variables);
-                                                                        
+                                                                        $variables["existingaddressid"] = false;
+
+                                                                        $addressVerify = $this->table->address->verifyVariables($variables);//verify address
+                                                                        if(!count($addressVerify))//check for errors
+                                                                                $this->table->address->insertRecord($variables);//insert if no errors
+
                                                                 }//end if
-                                                                
+
                                                         }//end if
                                                 }else
                                                         $this->error .= '<li> failed insert for line number '.$rowNum.'.</li>';
-                                                
+
+                                                        foreach($verify as $error)//log verify errors for display
+                                                                $this->error .= '<li class="subError">'.$error.'</li>';
+
+                                                        if(isset($addressVerify))
+                                                                        foreach($addressVerify as $error)//log address verify errors for display
+                                                                                $this->error .= '<li class="subError">'.$error.'</li>';
+
                                                 $rowNum++;
-                                                
+
                                         }//end foreach
                                 break;
-                                
+
                         }//end switch
-                        
+
                 }//end method --importRecords--
-                
-                
+
+
                 function _getTransactionData(){
-                        
+
                         $inStatement = "";
                         foreach($this->transactionIDs as $theid)
@@ -792 +1115 @@
                         if($inStatement)
                                 $inStatement = substr($inStatement, 0, -1);
-                        
+                        else
+                                $inStatement = "0";
+
                         //There are two cases to minimize joins for csv files
                         switch($this->importType){
-                                
+
                                 case "sugarcrm":
                                         $querystatement = "
@@ -854 +1179 @@
                                                 ";
                                 break;
-                                
+
                                 case "csv":
                                         $querystatement = "
@@ -895 +1220 @@
                                                         `addresses`.`postalcode`,
                                                         `addresses`.`country`,
-                                                        `addresses`.`phone`,
-                                                        `addresses`.`email`
+                                                        `addresses`.`phone`
                                                 FROM
                                                         ((clients INNER JOIN addresstorecord ON clients.id = addresstorecord.recordid AND addresstorecord.tabledefid=2 AND addresstorecord.primary=1) INNER JOIN addresses ON  addresstorecord.addressid = addresses.id)
@@ -905 +1229 @@
                                                 ";
                                 break;
-                        
+
                         }//end switch
-                        
+
                         $queryresult = $this->table->db->query($querystatement);
-                        
+
                         while($therecord = $this->table->db->fetchArray($queryresult))
                                 $this->transactionRecords[] = $therecord;
-                        
-                        
+
+
                 }//end method --_gettransactionData--
-                
-                
+
+
                 function displayTransaction($recordsArray, $fieldsArray){
-                        
+
                         if(count($recordsArray) && count($fieldsArray)){
-                                
+
                                 //Need to include addresses in the fieldArray
-                                
+
                                 //list of values that should not be displayed
                                 $removalArray = array("id", "modifiedby", "modifieddate", "createdby", "creationdate", "notes", "title", "shiptoname");
                                 //gets the address table's columnnames/information (fields)
                                 $addressArray = $this->table->address->fields;
-                                
+
                                 //gets rid of the values that should not be displayed
                                 foreach($removalArray as $removalField){
-                                        
+
                                         if(isset($addressArray[$removalField])){
-                                                
+
                                                 unset($addressArray[$removalField]);
-                                                
+
                                         }//end if
-                                        
+
                                 }//end foreach
-                                
+
                                 //get rid of stuff that should only be in addresses but is present in clients
                                 foreach($addressArray as $removalField => $junk){
-                                        
+
                                         if(isset($fieldsArray[$removalField])){
-                                                
+
                                                 unset($fieldsArray[$removalField]);
-                                                
+
                                         }//end if
-                                        
+
                                 }//end foreach
-                                
+
                                 //need to get two sets of address fields, one named main* and the other ship*.
                                 if($this->importType == "sugarcrm"){
-                                        
+
                                         foreach($addressArray as $field => $junk){
-                                                
+
                                                 $mainAddressArray["main".$field] = $junk;
                                                 $shipAddressArray["ship".$field] = $junk;
-                                                
+
                                         }//end foreach
-                                        
+
                                         $addressArray = $mainAddressArray + $shipAddressArray;
-                                        
+
                                 }//end if
-                                
+
                                 $fieldsArray = $fieldsArray + $addressArray;
-                                
+
                                 parent::displayTransaction($recordsArray, $fieldsArray);
-                                
+
                         }//end if
-                        
+
                 }//end method --displayTransaction--
-                
+
         }//end class --clientsImport--
 }//end if

trunk/phpbms/modules/bms/include/discounts.php

@@ -39 +39 @@
 if(class_exists("phpbmsTable")){
         class discounts extends phpbmsTable{
-        
+
                 function getDefaults(){
-                        
+
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["type"]="percent";
-                        
+
                         return $therecord;
                 }
-        
-                
-                function formatValue($variables){
-                
+
+
+                function verifyVariables($variables){
+
+                        //table's default is fine
+                        if(isset($variables["type"])){
+
+                                switch($variables["type"]){
+
+                                        case "percent":
+                                        case "amount":
+                                        break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of the `type` field is invalid.
+                                                        It must be either 'percent' or 'amount'.";
+                                        break;
+
+                                }//end switch
+
+                        }//end if
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
+                function prepareVariables($variables){
+
                         if($variables["type"] == "percent")
                                 $variables["value"] = ((real) str_replace("%","",$variables["percentvalue"]));
-                        else 
+                        else
                                 $variables["value"] =  currencyToNumber($variables["amountvalue"]);
-                
+
                         return $variables;
                 }
-        
-                
-                function updateRecord($variables, $modifiedby = NULL){
-                        
-                        $variables = $this->formatValue($variables);
-                                                
-                        parent::updateRecord($variables,$modifiedby);
-                }
-        
-        
-                function insertRecord($variables,$createdby = NULL){
-                
-                        $variables = $this->formatValue($variables);
-                        return parent::insertRecord($variables,$createdby);
-                }
-                
-        
+
+
                 function getTotals($id=0){
-                
+
                         $returnArray["Invoice"]["total"]=0;
                         $returnArray["Invoice"]["sum"]=0;
                         $returnArray["Order"]["total"]=0;
                         $returnArray["Order"]["sum"]=0;
-                        
+
                         if($id>0){
                                 $querystatement="SELECT invoices.type,count(invoices.id) as total,sum(discountamount) as sum
-                                                                FROM discounts inner join invoices on discounts.id=invoices.discountid 
+                                                                FROM discounts inner join invoices on discounts.id=invoices.discountid
                                                                 WHERE discounts.id=".((int) $id)." and (invoices.type=\"Order\" or invoices.type=\"Invoice\") GROUP BY invoices.type";
                                 $queryresult = $this->db->query($querystatement);
-        
+
                                 while($therecord=$this->db->fetchArray($queryresult)){
                                         $returnArray[$therecord["type"]]["total"]=$therecord["total"];
                                         $returnArray[$therecord["type"]]["sum"]=$therecord["sum"];
                                 }
-                                
+
                         }
-        
+
                         return $returnArray;
-        
+
                 }//end function
-                
+
         }//end class
 }//end if

trunk/phpbms/modules/bms/include/invoices.php

@@ -40 +40 @@
         class invoices extends phpbmsTable{
 
+                var $availableClientIDs = array();
+                var $availableUserIDs = array();
+                var $availableStatusIDs = array();
+
                 function showClientType($id){
 
@@ -437 +441 @@
                 }
 
+                /*------[verification related functions]---------------------------*/
+
+                function populateClientArray(){
+
+                        $this->availableClientIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `clients`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult))
+                                        $this->availableClientIDs[] = $therecord["id"];
+                        }else{
+                                $this->availableClientIDs[] = "none";
+                        }//end if
+
+                }//end method --populateClientArray--
+
+
+                function populateUserArray(){
+
+                        $this->availableUserIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `users`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableUserIDs[] = 0;//for none
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableUserIDs[] = $therecord["id"];
+
+                }//end method  --populateUserArray--
+
+
+                function populateInvoiceStatusArray(){
+
+                        $this->availableStatusIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `invoicestatuses`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult))
+                                        $this->availableStatusIDs[] = $therecord["id"];
+                        }else{
+                                $this->availableStatusIDs[] = "none";
+                        }//end if
+
+                }//end method --populateInvoiceStatusArray--
+
+
+                function verifyVariables($variables){
+
+                        //must have a client
+                        if(isset($variables["clientid"])){
+
+                                //must be numeric and positive
+                                if(!$variables["clientid"] || (int)$variables["clientid"] > 0){
+
+                                        if(!count($this->availableClientIDs))
+                                                $this->populateClientArray();
+
+                                        if(!in_array(((int)$variables["clientid"]),$this->availableClientIDs))
+                                                $this->verifyErrors[] = "The `clientid` field does not give an existing/acceptable client id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `clientid` field must be a non-negative number or equivalent to 0.";
+
+                        }else
+                                $this->verifyErrors[] = "The `clientid` field must be set.";
+
+                        //table default (NULL) is not enough
+                        if(isset($variables["type"])){
+
+                                switch($variables["type"]){
+
+                                        case "Quote":
+                                        case "Order":
+                                        case "Invoice":
+                                        case "VOID":
+                                                break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of the `type` field is invalid.  It must be 'Quote',
+                                                        'Order', 'Invoice', or 'VOID'.";
+                                                break;
+
+                                }//end switch
+
+                        }else
+                                $this->verifyErrors[] = "The `type` field must be set.";
+
+                        //check assigned to id
+                        if(isset($variables["assignedtoid"])){
+
+                                //assignedtoid needs to be a non-negative number or equivalent to 0
+                                if( !$variables["assignedtoid"] || ((int)$variables["assignedtoid"]) > 0 ){
+
+                                        if(!count($this->availableUserIDs))
+                                                $this->populateUserArray();
+
+                                        if(!in_array(((int)$variables["assignedtoid"]),$this->availableUserIDs))
+                                                $this->verifyErrors[] = "The `assignedtoid` field does not give an existing/acceptable user id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `assignedtoid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        //check status id
+                        if(isset($variables["statusid"])){
+
+                                //assignedtoid needs to be a non-negative number or equivalent to 0
+                                if( !$variables["statusid"] || ((int)$variables["statusid"]) > 0 ){
+
+                                        if(!count($this->availableStatusIDs))
+                                                $this->populateInvoiceStatusArray();
+
+                                        if(!in_array(((int)$variables["statusid"]),$this->availableStatusIDs))
+                                                $this->verifyErrors[] = "The `statusid` field does not give an existing/acceptable status id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `statusid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        //check booleans
+                                //readytopost
+                                if(isset($variables["readytopost"]))
+                                        if($variables["readytopost"] && $variables["readytopost"] != 1)
+                                                $this->verifyErrors[] = "The `readytopost` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                                //weborder
+                                if(isset($variables["weborder"]))
+                                        if($variables["weborder"] && $variables["weborder"] != 1)
+                                                $this->verifyErrors[] = "The `weborder` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                                //shiptosameasbilling
+                                if(isset($variables["shiptosameasbilling"]))
+                                        if($variables["shiptosameasbilling"] && $variables["shiptosameasbilling"] != 1)
+                                                $this->verifyErrors[] = "The `shiptosameasbilling` field must be a boolean (equivalent to 0 or exactly 1).";
+                        //check addresss ids
+                        //check secondary line item ids
+
+                        return parent::verifyVariables($variables);
+
+                }//end method
+
 
                 function prepareVariables($variables){
@@ -544 +711 @@
                 function updateRecord($variables, $modifiedby = NULL){
 
-                        if($modifiedby === NULL)
-                                $modifiedby = $_SESSION["userinfo"]["id"];
+                        //if($modifiedby === NULL)
+                        //      $modifiedby = $_SESSION["userinfo"]["id"];
 
 
@@ -551 +718 @@
                                 return false;
 
-                        $variables = $this->prepareVariables($variables);
+                        //$variables = $this->prepareVariables($variables);
 
                         if(!hasRights(20)){
@@ -606 +773 @@
                                 $createdby = $_SESSION["userinfo"]["id"];
 
-                        $variables = $this->prepareVariables($variables);
+                        //$variables = $this->prepareVariables($variables);
 
                         $newid = parent::insertRecord($variables, $createdby);

trunk/phpbms/modules/bms/include/invoicestatuses.php

@@ -40 +40 @@
 if(class_exists("phpbmsTable")){
         class invoiceStatus extends phpbmsTable {
-        
+
+                var $availableUserIDs = array();
+
+                function populateUserArray(){
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `users`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        $this->availableUserIDs[] = 0;//for everyone
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availableUserIDs[] = $therecord["id"];
+
+                }//end method --populateUserArray--
+
+
+                function verifyVariables($variables){
+
+                        if(isset($variables["setreadytopost"]))
+                                if($variables["setreadytopost"] && $variables["setreadytopost"] != 1)
+                                        $this->verifyErrors[] = "The `setreadytopost` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["invoicedefault"]))
+                                if($variables["invoicedefault"] && $variables["invoicedefault"] != 1)
+                                        $this->verifyErrors[] = "The `invoicedefault` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["defaultassignedtoid"])){
+
+                                if( !$variables["defaultassignedtoid"] || ((int)$variables["defaultassignedtoid"]) > 0 ){
+
+                                        if(!count($this->availableUserIDs))
+                                                $this->populateUserArray();
+
+                                        if(!in_array(((int)$variables["defaultassignedtoid"]), $this->availableUserIDs))
+                                                $this->verifyErrors[] = "The `defaultassignedtoid` field does not give an existing/acceptable user id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `defaultassignedtoid` field must be a non-negative number or equivalent to 0.";
+
+                        }//end if
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
                 function updateRecord($variables, $modifiedby = NULL){
                         if(isset($variables["invoicedefault"]))
                                 $this->updateInvoiceDefault();
-                
+
                         parent::updateRecord($variables, $modifiedby = NULL);
-                } 
-                
+                }
+
                 function updateInvoiceDefault(){
                         $querystatement="UPDATE `".$this->maintable."` SET `invoicedefault` = 0";
@@ -59 +110 @@
 
                 function delete_record(){
-                
+
                         $whereclause = $this->buildWhereClause($theids,"invoicestatuses.id");
-                        
+
                         $querystatement = "UPDATE invoicestatuses SET inactive=1,modifiedby=".$_SESSION["userinfo"]["id"]." WHERE (".$whereclause.") AND invoicedefault=0;";
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $message = $this->buildStatusMessage();
                         $message.=" marked inactive.";

trunk/phpbms/modules/bms/include/products.php

@@ -40 +40 @@
 if(class_exists("phpbmsTable")){
         class products extends phpbmsTable{
-        
+
+                var $availableCategoryIDs = array();
+                var $availableProducts = array();
+
                 function getDefaults(){
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["type"]="Inventory";
-                        $therecord["status"]="In Stock";                
+                        $therecord["status"]="In Stock";
                         $therecord["taxable"]=1;
-                        
+
                         return $therecord;
                 }
-        
+
                 function getPicture($name){
                         if (function_exists('file_get_contents')) {
@@ -58 +61 @@
                                 $file = addslashes(fread(fopen($_FILES[$name]['tmp_name'], 'r'), filesize($_FILES[$name]['tmp_name'])));
                         }
-                        
+
                         return $file;
                 }
-                
-                //This method is for when there is not categoryid specified
-                function _getCategoryID(){
-                        
+
+
+                function populateCategoryArray(){
+
+                        $this->availableCategoryIDs = array();
+
                         $querystatement = "
                                 SELECT
                                         `id`
                                 FROM
-                                        `productcategories`
-                                ORDER BY
-                                        `inactive` ASC
-                                LIMIT 1;
+                                        `productcategories`;
                                 ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult))
+                                        $this->availableCategoryIDs[] = $therecord["id"];
+                        }else
+                                $this->availableCategoryIDs[] = "none";
+
+                }//end method --populateCategoryArray--
+
+
+                function populateProductArray(){
+
+                        // I need id as well to let updates work with our verify function
+                        // i.e. if its an update on existing record, its ok if the productnumber
+                        // is not unique iff its already associated to the record being updated
+                        $this->availableProducts = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`,
+                                        `partnumber`
+                                FROM
+                                        `products`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+
+                                while($therecord = $this->db->fetchArray($queryresult)){
+                                        $partnumber = $therecord["partnumber"];
+                                        $id = $therecord["id"];
+
+                                        $this->availableProducts[$partnumber]["id"] = $id;
+                                }//end while
+
+                        }else{
+                                $partnumber = "NoT a REAl parTNuMBE|7 DU|\/|MY!";//put in an impossible partnumber
+                                $id = -1;//put in an impossible product id
+
+                                $this->availableProducts[$partnumber]["id"] = $id;
+                        }//end if
+
+                }//end method --populateProductArray--
+
+
+                function verifyVariables($variables){
+
+                        //must have a partnumber...table default is not enough
+                        if(isset($variables["partnumber"])){
+
+                                //must have some sort of partnumber
+                                if($variables["partnumber"] !== "" || $variables["partnumber"] !== NULL){
+
+                                        if(!count($this->availableProducts))
+                                                $this->populateProductArray();
+
+                                        //can't have this partnumber already chosen
+                                        if(!isset($variables["id"]))
+                                                $variables["id"] = 0;
+
+                                        if($variables["id"] < 0)
+                                                $variables["id"] = 0;
+
+                                        $temppartnumber = $variables["partnumber"];// using this because it looks ugly to but the brackets within brackets
+                                        if( array_key_exists($variables["partnumber"], $this->availableProducts) ){
+
+                                                if( $this->availableProducts[$temppartnumber]["id"] !== $variables["id"] )
+                                                        $this->verifyErrors[] = "The `partnumber` field must give an unique part number.";
+
+                                        }else{
+                                                $this->availableProducts[$temppartnumber]["id"] = -1;// impossible id put in
+                                        }//end if
+
+                                }else
+                                        $this->verifyErrors[] = "The `partnumber` field must not be blank.";
+
+                        }else
+                                $this->verifyErrors[] = "The `partnumber` field must be set.";
+
+
+                        //STORE CATEGORY IDS, DON'T SELECT EVERY TIME
+                        if(isset($variables["categoryid"])){
+
+                                if(((int) $variables["categoryid"]) > 0){
+
+                                        if(!count($this->availableCategoryIDs))
+                                                $this->populateCategoryArray();
+
+                                        if( !in_array(((int) $variables["categoryid"]), $this->availableCategoryIDs) )
+                                                $this->verifyErrors[] = "The `categoryid` field does not give an existing/acceptable category id number.";
+
+                                }else
+                                        $this->verifyErrors[] = "The `categoryid` field must be a positive number.";
+
+                        }else
+                                $this->verifyErrors[] = "The `categoryid` must be set.";
+
+
+                        if(isset($variables["status"])){
+
+                                switch($variables["status"]){
+
+                                        case "In Stock":
+                                        case "Out of Stock":
+                                        case "Backordered":
+                                                break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of the `status` field is invalid.
+                                                        It must be 'In Stock', 'Out of Stock', or 'Backordered'.";
+                                                break;
+
+                                }//end switch
+
+                        }//end if
+
+
+                        if(isset($variables["type"])){
+
+                                switch($variables["type"]){
+
+                                        case "Inventory":
+                                        case "Non-Inventory":
+                                        case "Service":
+                                        case "Kit":
+                                        case "Assembly":
+                                                break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of the `type` field is invalid.
+                                                        It must be 'Inventory', 'Non-Inventory', 'Service', 'Kit', or 'Assembly'.";
+                                                break;
+
+                                }//end switch
+
+                        }//end if
+
+                        //check boolean
+                        if(isset($variables["webenabled"]))
+                                if($variables["webenabled"] && $variables["webenabled"] != 1)
+                                        $this->verifyErrors[] = "The `webenabled` field must be a boolean (equivalent to 0 or exactly 1).";
                         
-                        $queryresult = $this->db->query($querystatement);
-                        $therecord = $this->db->fetchArray($queryresult);
-                        
-                        if(!isset($therecord["id"]))
-                                $therecord["id"] = 0;
-                        
-                        if(!$therecord["id"]){
-                                
-                                $querystatement = "
-                                        INSERT INTO
-                                                `productcategories`
-                                                (
-                                                        `name`,
-                                                        `inactive`,
-                                                        `description`,
-                                                        `webenabled`,
-                                                        `webdisplayname`,
-                                                        `createdby`,
-                                                        `creationdate`,
-                                                        `modifiedby`,
-                                                        `modifieddate`
-                                                )VALUES(
-                                                        'import_category',
-                                                        '0',
-                                                        'This category was automatically created by an import routine.  Please replace with a more applicable record',
-                                                        '0',
-                                                        '',
-                                                        '".((int) $_SESSION["userinfo"]["id"])."',
-                                                        NOW(),
-                                                        '".((int) $_SESSION["userinfo"]["id"])."',
-                                                        NOW()
-                                                );
-                                        ";
-                                
-                                $queryresult = $this->db->query($querystatement);
-                                $therecord["id"] = $this->db->insertId();
-                                
-                        }//end if
-                        
-                        return $therecord["id"];
-                        
-                }//end method --_getCategoryID--
-                
-                function formatVariables($variables){
-                        
+                        if(isset($variables["isoversized"]))
+                                if($variables["isoversized"] && $variables["isoversized"] != 1)
+                                        $this->verifyErrors[] = "The `isoversized` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["isprepackaged"]))
+                                if($variables["isprepackaged"] && $variables["isprepackaged"] != 1)
+                                        $this->verifyErrors[] = "The `isprepackaged` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["taxable"]))
+                                if($variables["taxable"] && $variables["taxable"] != 1)
+                                        $this->verifyErrors[] = "The `taxable` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
+                function _commonPrepareVariables($variables){
+
                         if(!isset($variables["unitprice"]))
                                 $variables["thumchange"] = 0;
-                        
+
                         if(!isset($variables["unitcost"]))
                                 $variables["thumchange"] = 0;
-                        
+
                         $variables["unitprice"] = currencyToNumber($variables["unitprice"]);
                         $variables["unitcost"] = currencyToNumber($variables["unitcost"]);
-                        
+
                         if(!isset($variables["thumbchange"]))
                                 $variables["thumbchange"] = NULL;
-                        
+
                         if($variables["thumbchange"]){
-        
+
                                 if($variables["thumbchange"] == "upload"){
                                         $variables["thumbnail"] = $this->getPicture("thumbnailupload");
-                                        $variables["thumbnailmime"] = $_FILES['thumbnailupload']['type'];                                       
+                                        $variables["thumbnailmime"] = $_FILES['thumbnailupload']['type'];
                                 } else {
                                         //delete
@@ -142 +262 @@
                                         $variables["thumbnailmime"] = NULL;
                                 }
-                        
+
                         } // end thumbnail picture change if
-                        
-                        
+
+
                         if(!isset($variables["picturechange"]))
                                 $variables["picturechange"] = NULL;
-                        
+
                         if($variables["picturechange"]){
-        
+
                                 if($variables["picturechange"] == "upload"){
                                         $variables["picture"] = $this->getPicture("pictureupload");
-                                        $variables["picturemime"] = $_FILES['pictureupload']['type'];                                   
+                                        $variables["picturemime"] = $_FILES['pictureupload']['type'];
                                 } else {
                                         //delete
@@ -159 +279 @@
                                         $variables["picturemime"] = NULL;
                                 }
-        
-                        }//end main picture change if                   
-                        
-                        if(!isset($variables["categoryid"]))
-                                $variables["categoryid"] = 0;
-
-                        if(!$variables["categoryid"])
-                                $variables["categoryid"] = $this->_getCategoryID();
-                        
+
+                        }//end main picture change if
+
                         return $variables;
-                
+
+                }//end method --_commonPrepareVariables--
+
+
+                function prepareVariables($variables){
+
+                        switch($variables["id"]){
+
+                                case "":
+                                case NULL:
+                                case 0:
+                                        if(!hasRights(20)){
+                                                unset($this->fields["partnumber"]);
+                                                unset($this->fields["partname"]);
+                                                unset($this->fields["upc"]);
+                                                unset($this->fields["description"]);
+                                                unset($this->fields["inactive"]);
+                                                unset($this->fields["taxable"]);
+                                                unset($this->fields["unitprice"]);
+                                                unset($this->fields["unitcost"]);
+                                                unset($this->fields["unitofmeasure"]);
+                                                unset($this->fields["type"]);
+                                                unset($this->fields["categoryid"]);
+
+                                                unset($this->fields["webenabled"]);
+                                                unset($this->fields["keywords"]);
+                                                unset($this->fields["webdescription"]);
+
+                                        } else {
+
+                                                //user has rights.  Let's format everything.
+                                                $variables = $this->_commonPrepareVariables($variables);
+
+                                        }//end if
+
+                                        if($variables["packagesperitem"])
+                                                $variables["packagesperitem"]=1/$variables["packagesperitem"];
+
+                                        break;
+
+                                default:
+                                        $variables = $this->_commonPrepareVariables($variables);
+                                        if(isset($variables["packagesperitem"]))
+                                                if($variables["packagesperitem"])
+                                                        $variables["packagesperitem"] = 1 / $variables["packagesperitem"];
+                                        break;
+
+                        }//end switch
+
+                        return $variables;
+
                 }//end function
-                
-        
+
+
                 function updateRecord($variables, $modifiedby = NULL){
-        
-                        //need to override field information if they don't have the rights
-                        if(!hasRights(20)){
-                                unset($this->fields["partnumber"]);
-                                unset($this->fields["partname"]);
-                                unset($this->fields["upc"]);
-                                unset($this->fields["description"]);
-                                unset($this->fields["inactive"]);
-                                unset($this->fields["taxable"]);
-                                unset($this->fields["unitprice"]);
-                                unset($this->fields["unitcost"]);
-                                unset($this->fields["unitofmeasure"]);
-                                unset($this->fields["type"]);
-                                unset($this->fields["categoryid"]);                     
-        
-                                unset($this->fields["webenabled"]);                     
-                                unset($this->fields["keywords"]);                       
-                                unset($this->fields["webdescription"]);
-        
-                        } else {
-                                //user has rights.  Let's format everything.
-        
-                                $variables = $this->formatVariables($variables);
-        
-                
-                        }               
-                        
-                        if($variables["packagesperitem"])
-                                $variables["packagesperitem"]=1/$variables["packagesperitem"];
-        
-        
+
                         parent::updateRecord($variables, $modifiedby);
-        
+
                         //need to reset the field information.  If they did not have rights
                         // we temporarilly removed the fields to be updated.
                         $this->getTableInfo();
                 }
-        
-        
-                function insertRecord($variables, $createdby = NULL){
-
-                
-                        $variables = $this->formatVariables($variables);
-                        
-                        if(isset($variables["packagesperitem"]))
-                                if($variables["packagesperitem"])
-                                        $variables["packagesperitem"]=1/$variables["packagesperitem"];
-
-                        $newid = parent::insertRecord($variables, $createdby);
-                        
-                        return $newid;
-                }
-        
-        
+
+
                 function checkNumberCategories(){
                         $querystatement="SELECT count(id) AS thecount FROM productcategories WHERE inactive=0";
                         $queryresult=$this->db->query($querystatement);
                         $therecord=$this->db->fetchArray($queryresult);
-        
+
                         return $therecord["thecount"];
                 }
-        
-        
+
+
                 function displayProductCategories($categoryid){
                         $querystatement="SELECT `id`,`name` FROM `productcategories` WHERE `inactive` =0 OR `id` =".((int) $categoryid)." ORDER BY `name`";
                         $queryresult=$this->db->query($querystatement);
-        
+
                         ?><select name="categoryid" id="categoryid">
-                                <?php 
+                                <?php
                                         while($therecord = $this->db->fetchArray($queryresult)){
                                                 ?><option value="<?php echo $therecord["id"]?>" <?php if($categoryid==$therecord["id"]) echo "selected=\"selected\""?>><?php echo $therecord["name"];?></option>
@@ -249 +368 @@
                                 ?>
                         </select><?php
-                        
-                }
-        
+
+                }
+
         }//end products class
 }//end if

trunk/phpbms/modules/bms/include/receipts.php

@@ -40 +40 @@
 
         class receiptitems{
-        
+
                 function receiptitems($db){
-                        
+
                         $this->db = $db;
-                        
-                }//end method
-                
+
+                }//end method
+
                 function get($receiptid){
 
@@ -67 +67 @@
                                         aritems.type,
                                         aritems.itemdate";
-                                        
+
                                 return $this->db->query($querystatement);
-                
+
                 }//end function
-                
-                
+
+
                 function show($queryresult, $receiptPosted, $receiptid){
-                        
+
                         $count = 1;
-                
+
                         while($therecord = $this->db->fetchArray($queryresult)){
-                                
+
                                 $recID = "i".$count;
-                                                                
+
                                 if($therecord["type"] == "invoice"){
-                                
+
                                         $tempDate = stringToDate($therecord["itemdate"], "SQL");
                                         $dueDate = dateToString( strtotime(TERM1_DAYS." days", $tempDate) );
-                                
-                                } else 
+
+                                } else
                                         $dueDate = " ";
-                                
+
                                 if($therecord["type"] == "deposit" && $therecord["relatedid"] == $receiptid){
                                         $therecord["relatedid"] = "";
@@ -94 +94 @@
                                         $therecord["aritemid"] = 0;
                                 }
-                                
-                                if($receiptPosted)                                      
-                                        $docDue = $therecord["amount"] - $therecord["paid"];                                    
+
+                                if($receiptPosted)
+                                        $docDue = $therecord["amount"] - $therecord["paid"];
                                 elseif($therecord["relatedid"])
-                                        $docDue = $therecord["amount"] - $therecord["paid"] - $therecord["applied"] - $therecord["discount"] - $therecord["taxadjustment"];     
+                                        $docDue = $therecord["amount"] - $therecord["paid"] - $therecord["applied"] - $therecord["discount"] - $therecord["taxadjustment"];
                                 else
                                         $docDue = 0;
-                                
-                                
+
+
                                 ?>
 
@@ -122 +122 @@
                                         <td><input id="<?php echo $recID?>TaxAdj" class="currency" value="<?php echo formatVariable($therecord["taxadjustment"], "currency")?>" size="10" maxlength="12"/></td>
                                         <td><button type="button" id="<?php echo $recID?>RemoveARItemButton" class="graphicButtons buttonMinus" title="remove item"><span>-</span></button></td>
-                                </tr>                           
-                                
+                                </tr>
+
                                 <?php
-                                
+
                                 $count++;
                         }//endwhile
-                
-                
-                }//end method
-
-                
+
+
+                }//end method
+
+
                 function set($itemlist, $receiptid, $clientid, $userid){
-                        
+
                         //remove any exisiting items
                         $deletestatement = "DELETE FROM receiptitems WHERE receiptid =".((int) $receiptid);
                         $this->db->query($deletestatement);
-                        
+
                         //remove any ar deposits created by ths receipt
                         $deletestatement = "DELETE FROM aritems WHERE relatedid = ".((int) $receiptid)." AND `type` = 'deposit'";
@@ -146 +146 @@
 
                         foreach($itemsArray as $item){
-                        
+
                                 $itemRecord = explode("::", $item);
-                                
+
                                 if(count($itemRecord) > 1){
 
                                         //if no ar id, or the deposit is from this record, we need to create the ar item
                                         if(!$itemRecord[0] || ($itemRecord[1] == $receiptid && $itemRecord[2] == "deposit") ){
-                                        
+
                                                 $arrecord = array();
                                                 $arrecord["type"] = "deposit";
                                                 $arrecord["status"] = "open";
                                                 $arrecord["posted"] = 0;
-                                                $arrecord["amount"] = -1 * currencyToNumber($itemRecord[8]);                                            
+                                                $arrecord["amount"] = -1 * currencyToNumber($itemRecord[8]);
                                                 $arrecord["itemdate"] = $itemRecord[3];
                                                 $arrecord["clientid"] = $clientid;
                                                 $arrecord["relatedid"] = $receiptid;
-        
-        
+
+
                                                 if(!isset($aritems))
                                                         $aritems = new phpbmsTable($this->db, 303);
-                                                
+
                                                 $aritems->insertRecord($arrecord, $userid);
-                                                
+
                                                 $itemRecord[0] = $this->db->insertId();
-                                                
+
                                         }//end if
-                                        
+
                                         $insertstatement ="
                                         INSERT INTO
@@ -184 +184 @@
                                                 ".currencyToNumber($itemRecord[10])."
                                         )";
-                                
+
                                         $this->db->query($insertstatement);
 
                                 }//endif
-                                
+
                         }//endforeach
-                
-                }//end method
-        
+
+                }//end method
+
         }// end class
 
@@ -199 +199 @@
         //======================================================================
         class receipts extends phpbmsTable{
-                
+
+                var $availableClientIDs = array();
+                var $availablePaymentMethodIDs = array();
 
                 function showPaymentOptions($selectedid){
-                
+
                         global $phpbms;
-                        
+
                         $querystatement = "
                                 SELECT
@@ -221 +223 @@
                                         priority,
                                         name";
-                        
+
                         $queryresult = $this->db->query($querystatement);
-                
+
                         ?>
                         <label for="paymentmethodid">payment type</label><br />
                         <select id="paymentmethodid" name="paymentmethodid">
-                                <?php 
+                                <?php
                                         $phpbms->bottomJS[] = 'paymentTypes = Array()';
                                         $phpbms->bottomJS[] = 'paymentTypes["s-1"] = Array();';
@@ -233 +235 @@
                                         $phpbms->bottomJS[] = 'paymentTypes["s-1"]["onlineprocess"] = 0';
                                         $phpbms->bottomJS[] = 'paymentTypes["s-1"]["onlineprocess"] = null';
-                                
+
                                         while($therecord = $this->db->fetchArray($queryresult)){
 
@@ -240 +242 @@
                                                 $phpbms->bottomJS[] = 'paymentTypes["s'.$therecord["id"].'"]["onlineprocess"] = "'.$therecord["onlineprocess"].'";';
                                                 $phpbms->bottomJS[] = 'paymentTypes["s'.$therecord["id"].'"]["processscript"] = "'.$therecord["processscript"].'";';
-                                        
-                                                ?><option value="<?php echo $therecord["id"]?>" <?php if($therecord["id"] == $selectedid) echo 'selected="selected"'?>><?php echo $therecord["name"]?></option><?php 
+
+                                                ?><option value="<?php echo $therecord["id"]?>" <?php if($therecord["id"] == $selectedid) echo 'selected="selected"'?>><?php echo $therecord["name"]?></option><?php
                                                 echo "\n";
-                                        
+
                                         }//endwhile
-                                        
+
                                 ?>
                                 <option value="-1" <?php if($selectedid == -1) echo 'selected="selected"'?>>Other...</option>
-                        </select><?php 
-
-                        
-                }//end method
-                
+                        </select><?php
+
+
+                }//end method
+
                 // CLASS OVERRIDES ======================================================================================
-                
+
                 function getDefaults(){
                         $therecord = parent::getDefaults();
-                        
+
                         $therecord["clientid"] = "";
                         $therecord["status"] = "open";
                         $therecord["receiptdate"] = dateToString(mktime(),"SQL");
-                        
+
                         return $therecord;
                 }
-                                                
-                
+
+
+                function populateClientArray(){
+
+                        $this->availableClientIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `clients`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        if($this->db->numRows($queryresult)){
+                                while($therecord = $this->db->fetchArray($queryresult))
+                                        $this->availableClientIDs[] = $therecord["id"];
+                        }else
+                                $this->availableClientIDs[] = "none";
+
+                }//end method --populateClientArray--
+
+
+                function populatePaymentArray(){
+
+                        $this->availablePaymentMethodIDs = array();
+
+                        $querystatement = "
+                                SELECT
+                                        `id`
+                                FROM
+                                        `paymentmethods`;
+                                ";
+
+                        $queryresult = $this->db->query($querystatement);
+
+                        //for the "other" choice on receipts
+                        $this->availablePaymentMethodIDs[] = -1;
+
+                        while($therecord = $this->db->fetchArray($queryresult))
+                                $this->availablePaymentMethodIDs[] = $therecord["id"];
+
+                }//end method --populatePaymentArray--
+
+
+                function verifyVariables($variables){
+
+                        //default not sufficient
+                        if(isset($variables["clientid"])){
+
+                                if(((int) $variables["clientid"]) > 0){
+
+                                        if(!count($this->availableClientIDs))
+                                                $this->populateClientArray();
+
+                                        if(!in_array(((int)$variables["clientid"]),$this->availableClientIDs))
+                                                $this->verifyErrors[] = "The `clientid` field does not give an existing/acceptable client id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `clientid` field must be a positive number.";
+
+                        }else
+                                $this->verifyErrors[] = "The `clientid` field must be set.";
+
+                        //because enum, default not sufficient
+                        if(isset($variables["status"])){
+                                switch($variables["status"]){
+
+                                        case "open":
+                                        case "collected":
+                                                break;
+
+                                        default:
+                                                $this->verifyErrors[] = "The value of the `status` field is invalid.  It must
+                                                        be either 'open' or 'closed'.";
+                                        break;
+
+                                }//end switch
+                        }else
+                                $this->verifyErrors[] = "The `status` field must be set.";
+
+                        // Default is not sufficient
+                        if(isset($variables["paymentmethodid"])){
+
+                                if(is_numeric($variables["paymentmethodid"])){
+
+                                        if(!count($this->availablePaymentMethodIDs))
+                                                $this->populatePaymentArray();
+
+                                        if(!in_array(((int)$variables["paymentmethodid"]),$this->availablePaymentMethodIDs))
+                                                $this->verifyErrors[] = "The `paymentmethod` field does not give an existing/accpetable payment method id number.";
+                                }else
+                                        $this->verifyErrors[] = "The `paymentmethodid` field must be numeric.";
+
+                        }else
+                                $this->verifyErrors[] = "The `paymentmethodid` field must be set.";
+
+                        //check booleans
+                        if(isset($variables["readytopost"]))
+                                if($variables["readytopost"] && $variables["readytopost"] != 1)
+                                        $this->verifyErrors[] = "The `readytopost` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        if(isset($variables["posted"]))
+                                if($variables["posted"] && $variables["posted"] != 1)
+                                        $this->verifyErrors[] = "The `posted` field must be a boolean (equivalent to 0 or exactly 1).";
+
+                        return parent::verifyVariables($variables);
+
+                }//end method --verifyVariables--
+
+
                 function prepareVariables($variables){
-                                        
+
                         $variables["amount"] = currencyToNumber($variables["amount"]);
-                                
+
                         return $variables;
                 }
-                
-                
+
+
                 function updateRecord($variables, $modifiedby = NULL){
-        
-                        if($modifiedby === NULL)
-                                $modifiedby = $_SESSION["userinfo"]["id"];
-                        
-                        $variables = $this->prepareVariables($variables);
-                
+
                         if(parent::updateRecord($variables, $modifiedby)){
-                                
+
                                 if($variables["itemschanged"]==1){
-                                
+
                                         $items = new receiptitems($this->db);
-        
+
                                         $items->set($variables["itemslist"], $variables["id"], $variables["clientid"], $modifiedby);
-                                
+
                                 }//end if
-                                                                
+
                         }//end if
 
                 }//end method
-        
-        
-        
+
+
+
                 function insertRecord($variables, $createdby = NULL){
-        
-                        if($createdby === NULL)
-                                $createdby = $_SESSION["userinfo"]["id"];
-        
-                        $variables = $this->prepareVariables($variables);
-        
+
                         $newid = parent::insertRecord($variables, $createdby);
-        
+
                         if($variables["itemschanged"]==1){
-                                
+
                                 $items = new receiptitems($this->db);
 
                                 $items->set($variables["itemslist"], $newid, $variables["clientid"], $createdby);
-                        
+
                         }//end if
-                        
+
                         return $newid;
                 }
@@ -322 +423 @@
 if(class_exists("searchFunctions")){
         class receiptsSearchFunctions extends searchFunctions{
-        
+
                 function post(){
-                
+
                         $whereclause = $this->buildWhereClause();
-                
+
                         include_once("include/post_class.php");
                         defineReceiptPost();
-                        
+
                         $receiptPost = new receiptPost($this->db);
-                        
+
                         $count = $receiptPost->post($whereclause);
-                
+
                         $message = $this->buildStatusMessage($count);
                         $message .= " posted.";
-                        
+
                         return $message;
                 }//end method
-                
-        
+
+
                 function delete_record(){
-                                        
+
                         //passed variable is array of user ids to be revoked
                         $whereclause = $this->buildWhereClause();
-                        
+
                         $querystatement ="
-                                SELECT 
+                                SELECT
                                         id
                                 FROM
@@ -357 +458 @@
 
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $count = $this->db->numRows($queryresult);
-                        
+
                         $newWhere = "";
                         while($therecord = $this->db->fetchArray($queryresult))
                                 $newWhere .= " OR id = ".$therecord["id"];
-                                
+
                         if(strlen($newWhere))
                                 $newWhere = substr($newWhere, 4);
                         else
                                 $newWhere = "id = -1974";
-                        
+
                         $deletestatement = "
                                 DELETE FROM
@@ -375 +476 @@
                                         `type` = 'deposit'
                                         AND (".str_replace("id =", "relatedid =", $newWhere).")";
-                                        
+
                         $this->db->query($deletestatement);
-                        
+
                         $deletestatement = "
                                 DELETE FROM
@@ -383 +484 @@
                                 WHERE
                                         ".str_replace("id =", "receiptid =", $newWhere);
-                                        
+
                         $this->db->query($deletestatement);
 
@@ -391 +492 @@
                                 WHERE
                                         ".$newWhere;
-                                        
-                        $this->db->query($deletestatement);                                     
-                                                
+
+                        $this->db->query($deletestatement);
+
                         $message = $this->buildStatusMessage($count);
                         $message.=" deleted.";
-                
+
                         return $message;
                 }//end method
-                
-                
+
+
                 function _getFullyDistributed(){
 
                         $whereclause = $this->buildWhereClause();
-                        
+
                         $querystatement = "
                                 SELECT
@@ -420 +521 @@
                         $count = 0;
                         while($therecord = $this->db->fetchArray($queryresult)){
-                        
+
                                 $querystatement = "
                                         SELECT
@@ -432 +533 @@
 
                                 $checkrecord = $this->db->fetchArray($checkresult);
-                                
+
                                 if($therecord["amount"] == $checkrecord["thesum"]){
                                         $newWhere .= " OR id = ".$therecord["id"];
                                         $count++;
-                                        
+
                                 }//endif
-                                
+
                         }//endif
 
@@ -445 +546 @@
                         else
                                 $newWhere = "id = -1974";
-                        
+
                         return array("clause" => $newWhere, "count" => $count);
-                                        
-                }//end method
-                
-                
+
+                }//end method
+
+
                 function mark_rtp(){
-                
+
                         $where = $this->_getFullyDistributed();
-                        
+
                         $updatestatement="
                                 UPDATE
@@ -462 +563 @@
                                         readytopost = 1,
                                         modifiedby = ".$_SESSION["userinfo"]["id"].",
-                                        modifieddate = NOW()                                    
+                                        modifieddate = NOW()
                                 WHERE
                                         ".$where["clause"];
-                                        
+
                         $this->db->query($updatestatement);
 
                         $message = $this->buildStatusMessage($where["count"]);
                         $message.=" marked ready to post.";
-                
+
                         return $message;
                 }//end method
-                
-                
+
+
                 function mark_collected(){
-                
+
                         $where = $this->_getFullyDistributed();
-                        
+
                         $updatestatement="
                                 UPDATE
@@ -488 +589 @@
                                 WHERE
                                         ".$where["clause"];
-                                        
+
                         $this->db->query($updatestatement);
 
                         $message = $this->buildStatusMessage($where["count"]);
                         $message.=" marked collected.";
-                
+
                         return $message;
                 }//end method
-        
+
         }//end class
 }//end if
@@ -504 +605 @@
 
         class receiptPost extends tablePost{
-                
+
                 function receiptPost($db, $modifiedby = NULL){
-                        
+
                         parent::tablePost($db, $modifiedby);
-                        
+
                 }//end method
 
 
                 function prepareWhere($whereclause=NULL){
-                        
+
                         $this->whereclause = "";
-                        
-                        if($whereclause)                        
+
+                        if($whereclause)
                                 $this->whereclause = "(".$whereclause.") AND ";
-                        
+
                         $this->whereclause .= "receipts.posted = 0 AND receipts.readytopost = 1";
-                
-                }//end method
-                
-                
+
+                }//end method
+
+
                 function post($whereclause=NULL){
-                        
+
                         if($whereclause)
                                 $this->prepareWhere($whereclause);
-                        
+
 
                         $querystatement = "
@@ -537 +638 @@
                                 WHERE
                                         ".$this->whereclause;
-                                        
+
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         $count = $this->db->numRows($queryresult);
                         $newWhere = "";
                         while($therecord = $this->db->fetchArray($queryresult)){
-                        
+
                                 $querystatement = "
                                         SELECT
@@ -559 +660 @@
                                         WHERE
                                                 receiptitems.receiptid = ".$therecord["id"];
-                                
+
                                 $itemsresult = $this->db->query($querystatement);
-                                
+
                                 while($itemrecord = $this->db->fetchArray($itemsresult)){
-                                
+
                                         if($itemrecord["relatedid"] == $therecord["id"] && $itemrecord["type"] == "deposit")
                                                 $paid = $itemrecord["paid"];
@@ -573 +674 @@
                                         else
                                                 $status = "open";
-                                
+
                                         $updatestatement ="
                                                 UPDATE
@@ -582 +683 @@
                                                         `status` = '".$status."',
                                                         modifiedby = ".$_SESSION["userinfo"]["id"].",
-                                                        modifieddate = NOW()                                                    
+                                                        modifieddate = NOW()
                                                 WHERE
                                                         id = ".$itemrecord["aritemid"];
-                                        
+
                                         $this->db->query($updatestatement);
-                                        
+
                                         if($itemrecord["type"] == "invoice"){
-                                                
+
                                                 $updatestatement = "
-                                                        UPDATE 
+                                                        UPDATE
                                                                 invoices
                                                         SET
@@ -601 +702 @@
 
                                                         $this->db->query($updatestatement);
-                                                        
+
                                         }//endif
-                                
+
                                 }//endwhile
 
@@ -611 +712 @@
                         if(strlen($newWhere))
                                 $newWhere = substr($newWhere, 4);
-                        
+
                         if($newWhere){
-                        
+
                                 $updatestatement = "
                                         UPDATE
@@ -628 +729 @@
                                                 ccnumber = LPAD(SUBSTRING(ccnumber,-4),LENGTH(ccnumber),'*'),
                                         ";
-                                }//endif                                                
-                                                
+                                }//endif
+
                                 $updatestatement .="
                                                 modifiedby = ".$_SESSION["userinfo"]["id"].",
@@ -635 +736 @@
                                         WHERE
                                                 ".$newWhere;
-        
+
                                 $this->db->query($updatestatement);
-        
+
 
                         }//endif
-                        
+
                         return $count;
-                        
-                }//end method
-                
+
+                }//end method
+
         }//end class invoicePost
 

trunk/phpbms/modules/bms/install/install.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-error_reporting(E_ALL);
-define("APP_DEBUG",false);
-define("noStartup",true);
-include("../../../install/install_include.php");
-include("../../../include/session.php");
-
-        $phpbmsSession = new phpbmsSession;
-        $success = $phpbmsSession->loadDBSettings(false);
-        include_once("include/db.php");
-        $db = new db(false);
-        $db->stopOnError = false;
-        $db->showError = false;
-        $db->logError = false;
-
-        if($success !== false){
-                
-                if(!$db->connect())
-                        $thereturn = "Could Not Establish Connection To MySQL Server: Check server, user name, and password.";                  
-                else {
-                        if(!$db->selectSchema())
-                                $thereturn = "Database (schema) ".MYSQL_DATABASE." could not be selected";                      
-                        else {
-
-                                $thereturn = "Business Management System Installation\n";
-                                $thereturn .= "_______________________________________\n";
-                                
-                                $tempreturn = createTables($db,"createtables.sql");
-                                
-                                if($tempreturn === true){
-                                        
-                                        $thereturn.= "Done Creating Tables \n";
-                                        
-                                        $tables = array(
-                                                "choices",
-                                                "menu",
-                                                "tabs",
-                                                "roles",
-                                                "modules",
-                                                "smartsearches",
-                                                "relationships",
-                                                "reports",
-                                                "tablecolumns",
-                                                "tabledefs",
-                                                "tablegroupings",
-                                                "tablefindoptions",
-                                                "tableoptions",
-                                                "tablesearchablefields",
-                                                "usersearches",
-                                                "settings",
-                                                "shippingmethods",
-                                                "paymentmethods",               
-                                                "invoicestatuses",              
-                                        );
-                                        foreach($tables as $table){
-                                                
-                                                $failure = false;
-                                                $tempreturn = importData($db,$table);
-                                                $thereturn .= $tempreturn;
-                                                if(!strpos($tempreturn,"complete.") === false){
-                                                        $failed = true;
-                                                }
-                                                
-                                        }//end foreach
-                                        
-                                        if(!$failure){
-                                                $thereturn .= "________________________\n";                     
-                                                $thereturn .= "Done Installing BMS Data\n";
-                                        }
-                                } else
-                                        $thereturn = $tempreturn;                               
-                        }               
-                }
-        } else
-                $thereturn = "Could not access settings.php";
-                
-                
-                header('Content-Type: text/xml');
-                ?><?php echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>'; ?>
-<response><?php echo $thereturn?></response>
+$theModule = new installModuleAjax($this->db, $this->phpbmsSession, "../modules/bms/install/");
+$theModule->tables = array(
+                        "choices",
+                        "menu",
+                        "tabs",
+                        "roles",
+                        "modules",
+                        "smartsearches",
+                        "relationships",
+                        "reports",
+                        "tablecolumns",
+                        "tabledefs",
+                        "tablegroupings",
+                        "tablefindoptions",
+                        "tableoptions",
+                        "tablesearchablefields",
+                        "usersearches",
+                        "settings",
+                        "shippingmethods",
+                        "paymentmethods",
+                        "invoicestatuses",
+                        );

trunk/phpbms/modules/bms/install/reports.sql

@@ -26 +26 @@
 INSERT INTO `reports` (`name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('Summary', 'report', '303', '10', '80', 'modules/bms/report/aritems_summary.php', 'Items grouped and totaled by clients, with grand totals.', 1, NOW(), 1, NOW());
 INSERT INTO `reports` (`name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('Payment Type Totals', 'report', '304', '10', '80', 'modules/bms/report/receipts_pttotals.php', 'Totals grouped by payment method.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('Incoming Cash Flow', 'report', '3', '55', '50', 'modules/bms/report/incoming_cashflow.php', 'This report shows total incoming monies for a time period from both posted sales orders AND posted receipts. It can be grouped by week, month, quarter and year.\r\n\r\nThis report runs is unaffected by selected records, search or sort parameters.  It requires input of it\'s own start and end dates.', 1, NOW(), 1, NOW());

trunk/phpbms/modules/bms/install/tablecolumns.sql

@@ -4 +4 @@
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('2', 'type', 'clients.type', 'left', '', '0', '', '0', '', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('2', 'phone', 'IF(clients.workphone != \'\' OR clients.homephone != \'\' OR clients.mobilephone != \'\' OR clients.otherphone != \'\',IF(clients.workphone != \'\', concat(clients.workphone, \' (w)\'), IF(clients.homephone != \'\', concat(clients.homephone, \' (h)\'), IF(clients.mobilephone != \'\', concat(clients.mobilephone, \' (m)\'), IF(clients.otherphone != \'\', concat(clients.otherphone, \' (o)\'), \'\')))) ,\'\')', 'left', '', '4', 'concat(clients.workphone, clients.homephone, clients.mobilephone,clients.otherphone)', '0', '', NULL, '0');
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'id','invoices.id','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'type','invoices.type','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'status','invoicestatuses.name','left','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'date','if(invoices.type=\"Invoice\",invoices.invoicedate,invoices.orderdate)','left','',5,'',0,'','date',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'client name / company','concat(\"<strong>\",if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company),\"</strong>\")','left','',6,NULL,0,'100%','noencoding',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'total','if(invoices.type!=\"VOID\",invoices.totalti,\"-----\")','right','sum(if(invoices.type!=\"VOID\",invoices.totalti,0))',8,'if(invoices.type!=\"VOID\",invoices.totalti,0)',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'due','if(invoices.type!=\"VOID\",invoices.totalti-invoices.amountpaid,\"-----\")','right','sum(if(invoices.type!=\"VOID\",(invoices.totalti-invoices.amountpaid),0))',9,'if(invoices.type!=\"VOID\",invoices.totalti-invoices.amountpaid,0)',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'web','invoices.weborder','center','',4,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'RTP','invoices.readytopost','center','',1,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (3,'payment','paymentmethods.name','left','',7,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (4,'part number','products.partnumber','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (4,'name','products.partname','left','',1,'',1,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (4,'status','products.status','left','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (4,'unit price','products.unitprice','right','',4,'',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (4,'type','products.type','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'id','lineitems.id','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'invoice id','lineitems.invoiceid','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'part #','products.partnumber','left','',4,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'name','products.partname','left','',5,'',1,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'unit price','lineitems.unitprice','right','sum(lineitems.unitprice)',6,'lineitems.unitprice',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'qty','format(lineitems.quantity,2)','center','format(sum(lineitems.quantity),2)',7,'lineitemd.quantity',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'price ext.','lineitems.unitprice*lineitems.quantity','right','sum(lineitems.unitprice*lineitems.quantity)',8,'',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'cost ext.','lineitems.unitcost*lineitems.quantity','right','sum(lineitems.unitcost*lineitems.quantity)',9,'',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'total wt.','format((lineitems.unitweight*lineitems.quantity),2)','right','format(sum(lineitems.unitweight*lineitems.quantity),2)',11,'lineitems.unitweight*lineitems.quantity',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'type','invoices.type','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'date','if(invoices.type=\"Invoice\",invoices.invoicedate,invoices.orderdate)\r\n','left','',3,'',1,'','date',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (5,'tax','lineitems.taxable','center','',10,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (6,'id','tax.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (6,'name','concat(\"<strong>\",tax.name,\"</strong>\")','left','',1,NULL,0,'','noencoding',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (6,'percentage','concat(tax.percentage,\"%\")','left','',2,'tax.percentage',0,'98%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (7,'id','productcategories.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (7,'name','productcategories.name','left','',1,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (7,'date created','productcategories.creationdate','left','',2,'productcategories.creationdate',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (8,'name','childproducts.partname','left','',1,'',1,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (8,'part number','childproducts.partnumber','left','',0,'',0,'',NULL,0);
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'id', 'invoices.id', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'type', 'invoices.type', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'status', 'invoicestatuses.name', 'left', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'date', 'if(invoices.type=\"Invoice\",invoices.invoicedate,invoices.orderdate)', 'left', '', '5', '', '0', '', 'date', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'client name / company', 'concat(\"<strong>\",if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company),\"</strong>\")', 'left', '', '6', NULL, '0', '100%', 'noencoding', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'total', 'if(invoices.type!=\"VOID\",invoices.totalti,\"-----\")', 'right', 'sum(if(invoices.type!=\"VOID\",invoices.totalti,0))', '8', 'if(invoices.type!=\"VOID\",invoices.totalti,0)', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'due', 'if(invoices.type!=\"VOID\",invoices.totalti-invoices.amountpaid,\"-----\")', 'right', 'sum(if(invoices.type!=\"VOID\",(invoices.totalti-invoices.amountpaid),0))', '9', 'if(invoices.type!=\"VOID\",invoices.totalti-invoices.amountpaid,0)', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'web', 'invoices.weborder', 'center', '', '4', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'RTP', 'invoices.readytopost', 'center', '', '1', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('3', 'payment', 'paymentmethods.name', 'left', '', '7', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('4', 'part number', 'products.partnumber', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('4', 'name', 'products.partname', 'left', '', '1', '', '1', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('4', 'status', 'products.status', 'left', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('4', 'unit price', 'products.unitprice', 'right', '', '4', '', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('4', 'type', 'products.type', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'id', 'lineitems.id', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'invoice id', 'lineitems.invoiceid', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'part #', 'products.partnumber', 'left', '', '4', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'name', 'products.partname', 'left', '', '5', '', '1', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'unit price', 'lineitems.unitprice', 'right', 'sum(lineitems.unitprice)', '6', 'lineitems.unitprice', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'qty', 'format(lineitems.quantity,2)', 'center', 'format(sum(lineitems.quantity),2)', '7', 'lineitemd.quantity', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'price ext.', 'lineitems.unitprice*lineitems.quantity', 'right', 'sum(lineitems.unitprice*lineitems.quantity)', '8', '', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'cost ext.', 'lineitems.unitcost*lineitems.quantity', 'right', 'sum(lineitems.unitcost*lineitems.quantity)', '9', '', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'total wt.', 'format((lineitems.unitweight*lineitems.quantity),2)', 'right', 'format(sum(lineitems.unitweight*lineitems.quantity),2)', '11', 'lineitems.unitweight*lineitems.quantity', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'type', 'invoices.type', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'date', 'if(invoices.type=\"Invoice\",invoices.invoicedate,invoices.orderdate)\r\n', 'left', '', '3', '', '1', '', 'date', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('5', 'tax', 'lineitems.taxable', 'center', '', '10', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('6', 'id', 'tax.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('6', 'name', 'concat(\"<strong>\",tax.name,\"</strong>\")', 'left', '', '1', NULL, '0', '', 'noencoding', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('6', 'percentage', 'concat(tax.percentage,\"%\")', 'left', '', '2', 'tax.percentage', '0', '98%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('7', 'id', 'productcategories.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('7', 'name', 'productcategories.name', 'left', '', '1', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('7', 'date created', 'productcategories.creationdate', 'left', '', '2', 'productcategories.creationdate', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('8', 'name', 'childproducts.partname', 'left', '', '1', '', '1', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('8', 'part number', 'childproducts.partnumber', 'left', '', '0', '', '0', '', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('18', 'id', 'clients.id', 'center', '', '0', '', '0', '', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('18', 'type', 'clients.type', 'left', '', '1', '', '0', '', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('18', 'name', 'IF(clients.company != \'\', CONCAT(clients.company,IF(clients.lastname != \'\' OR clients.firstname != \'\', CONCAT(\' (\',if(clients.lastname != \'\', clients.lastname, \'{blank}\'),\', \',if(clients.firstname != \'\', clients.firstname, \'{blank}\'),\')\'), \'\')), IF(clients.lastname != \'\' OR clients.firstname != \'\', CONCAT(if(clients.lastname != \'\', clients.lastname, \'{blank}\'),\', \',if(clients.firstname != \'\', clients.firstname, \'{blank}\')), \'\'))', 'left', '', '2', 'concat(clients.company,clients.lastname,clients.firstname)', '1', '100%', NULL, '0');
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (22,'name','clientemailprojects.name','left','',0,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (22,'last run','clientemailprojects.lastrun','right','',1,'',0,'','datetime',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (25,'amount/percent','discounts.value','right','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (25,'type','discounts.type','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (25,'name','discounts.name','left','',0,'',0,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (300,'name','shippingmethods.name','left','',1,'',0,'99%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (300,'estimate','shippingmethods.canestimate','center','',2,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (300,'priority','shippingmethods.priority','right','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (301,'name','paymentmethods.name','left','',1,'',0,'99%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (301,'type','paymentmethods.type','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (301,'id','paymentmethods.id','center','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (301,'priority','paymentmethods.priority','center','',3,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (301,'online process','paymentmethods.onlineprocess','center','',4,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (302,'name','invoicestatuses.name','left','',0,'',1,'99%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (302,'priority','invoicestatuses.priority','right','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (302,'inactive','invoicestatuses.inactive','center','',2,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (303,'type','aritems.type','left','',1,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (303,'date','aritems.itemdate','left','',3,'',0,'','date',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (303,'client','if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company)','left','',4,'',1,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (303,'doc amt','aritems.amount','right','SUM(aritems.amount)',5,'',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (303,'amt due','aritems.amount-aritems.paid','right','SUM(aritems.amount-aritems.paid)',6,'',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (303,'doc ref','aritems.relatedid','left','',2,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (303,'status','aritems.status','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'id','receipts.id','left','',0,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'client','if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company)','left','',4,'',1,'100%',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'RTP','receipts.readytopost','center','',1,'',0,'','boolean',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'amount','receipts.amount','right','sum(receipts.amount)',6,'',0,'','currency',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'payment','IF(receipts.paymentmethodid = -1,concat( concat("Other... (", receipts.paymentother), ")"), paymentmethods.name)','left','',5,'',0,'',NULL,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'date','receipts.receiptdate','left','',3,'',0,'','date',0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES (304,'status','receipts.status','left','',2,'',0,'',NULL,0);
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('22', 'name', 'clientemailprojects.name', 'left', '', '0', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('22', 'last run', 'clientemailprojects.lastrun', 'right', '', '1', '', '0', '', 'datetime', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('25', 'amount/percent', 'discounts.value', 'right', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('25', 'type', 'discounts.type', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('25', 'name', 'discounts.name', 'left', '', '0', '', '0', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('300', 'name', 'shippingmethods.name', 'left', '', '1', '', '0', '99%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('300', 'estimate', 'shippingmethods.canestimate', 'center', '', '2', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('300', 'priority', 'shippingmethods.priority', 'right', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('301', 'name', 'paymentmethods.name', 'left', '', '1', '', '0', '99%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('301', 'type', 'paymentmethods.type', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('301', 'id', 'paymentmethods.id', 'center', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('301', 'priority', 'paymentmethods.priority', 'center', '', '3', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('301', 'online process', 'paymentmethods.onlineprocess', 'center', '', '4', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('302', 'name', 'invoicestatuses.name', 'left', '', '0', '', '1', '99%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('302', 'priority', 'invoicestatuses.priority', 'right', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('302', 'inactive', 'invoicestatuses.inactive', 'center', '', '2', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('303', 'type', 'aritems.type', 'left', '', '1', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('303', 'date', 'aritems.itemdate', 'left', '', '3', '', '0', '', 'date', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('303', 'client', 'if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company)', 'left', '', '4', '', '1', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('303', 'doc amt', 'aritems.amount', 'right', 'SUM(aritems.amount)', '5', '', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('303', 'amt due', 'aritems.amount-aritems.paid', 'right', 'SUM(aritems.amount-aritems.paid)', '6', '', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('303', 'doc ref', 'aritems.relatedid', 'left', '', '2', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('303', 'status', 'aritems.status', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('304', 'id', 'receipts.id', 'left', '', '0', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('304', 'client', 'if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company)', 'left', '', '4', '', '1', '100%', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('304', 'RTP', 'receipts.readytopost', 'center', '', '1', '', '0', '', 'boolean', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('304', 'amount', 'receipts.amount', 'right', 'sum(receipts.amount)', '6', '', '0', '', 'currency', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('304', 'payment', 'IF(receipts.paymentmethodid = -1,concat( concat(\"Other... (\", receipts.paymentother), \")\"), paymentmethods.name)', 'left', '', '5', '', '0', '', NULL, '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('304', 'date', 'receipts.receiptdate', 'left', '', '3', '', '0', '', 'date', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('304', 'status', 'receipts.status', 'left', '', '2', '', '0', '', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('305', 'address', 'concat(if(addresses.title != \'\',concat(\'[b]\',addresses.title,\'[/b][br]\'),\'\'),IF(addresses.address1!=\'\',addresses.address1,\'\'),if(addresses.address2 != \'\',concat(\'[br]\', addresses.address2),\'\'),if(addresses.city != \'\',concat(\'[br]\',addresses.city,\', \',if(addresses.state != \'\',addresses.state, \'\'),\' \',if(addresses.postalcode != \'\', addresses.postalcode, \'\')),\'\'),if(addresses.country != \'\',concat(\'[br]\',addresses.country),\'\'))', 'left', '', '0', '', '1', '100%', 'bbcode', '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('305', 'default ship to', 'addresstorecord.defaultshipto', 'center', '', '4', '', '0', '', 'boolean', '0');

trunk/phpbms/modules/bms/install/tabledefs.sql

@@ -1 +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 ('2', 'Clients', 'table', '2', 'clients', '((clients INNER JOIN addresstorecord on clients.id = addresstorecord.recordid AND addresstorecord.tabledefid=2 AND addresstorecord.primary=1) INNER JOIN addresses ON  addresstorecord.addressid = addresses.id)', 'modules/bms/clients_addedit.php', '0', 'modules/bms/clients_addedit.php', '0', 'modules/bms/clients_import.php', '-100', '0', '-100', '-100', 'inactivate', 'clients.id=-100', 'clients.company, clients.lastname, clients.firstname', 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 ('3', 'Sales Orders', 'table', '2', 'invoices', '(((invoices INNER JOIN clients ON invoices.clientid=clients.id) INNER JOIN invoicestatuses ON invoices.statusid=invoicestatuses.id) LEFT JOIN paymentmethods ON invoices.paymentmethodid = paymentmethods.id)', 'modules/bms/invoices_addedit.php', '0', 'modules/bms/invoices_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'void', 'invoices.type+0<3 OR (invoices.type = \'Invoice\' AND invoices.totalti != invoices.amountpaid)', 'invoices.id', '', '', '', 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 ('4', 'Products', 'table', '2', 'products', '(products inner join productcategories on products.categoryid=productcategories.id)', 'modules/bms/products_addedit.php', '0', 'modules/bms/products_addedit.php', '0', 'modules/bms/products_import.php', '-100', '0', '-100', '-100', 'inactivate', 'products.id =-100', 'products.partnumber', 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 ('4', 'Products', 'table', '2', 'products', '(products inner join productcategories on products.categoryid=productcategories.id)', 'modules/bms/products_addedit.php', '0', 'modules/bms/products_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'inactivate', 'products.id =-100', 'products.partnumber', 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 ('5', 'Line Items', 'table', '2', 'lineitems', '((lineitems left join products on lineitems.productid=products.id) inner join invoices on lineitems.invoiceid=invoices.id)', 'N/A', '0', 'N/A', '0', NULL, '-100', '0', '-100', '-100', 'NA', 'lineitems.id =-1', 'lineitems.invoiceid,lineitems.id', '', '', '', 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 ('6', 'Tax Areas', 'table', '2', 'tax', 'tax', 'modules/bms/tax_addedit.php', '0', 'modules/bms/tax_addedit.php', '0', NULL, '-100', '0', '-100', '-100', 'inactivate', 'tax.inactive=0', 'tax.name', NULL, NULL, NULL, 1, NOW(), 1, NOW());
@@ -11 +11 @@
 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 ('300', 'Shipping Methods', 'table', '2', 'shippingmethods', 'shippingmethods', 'modules/bms/shippingmethods_addedit.php', '30', 'modules/bms/shippingmethods_addedit.php', '30', NULL, '-100', '30', '30', '-100', 'inactivate', 'shippingmethods.inactive!=0', 'shippingmethods.priority, shippingmethods.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 ('301', 'Payment Methods', 'table', '2', 'paymentmethods', 'paymentmethods', 'modules/bms/paymentmethods_addedit.php', '30', 'modules/bms/paymentmethods_addedit.php', '30', NULL, '-100', '30', '30', '-100', 'inactivate', 'paymentmethods.inactive=0', 'paymentmethods.priority,paymentmethods.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 ('302', 'Invoice Statuses', 'table', '2', 'invoicestatuses', 'invoicestatuses', 'modules/bms/invoicestatuses_addedit.php', '30', 'modules/bms/invoicestatuses_addedit.php', '30', NULL, '-100', '30', '-100', '-100', 'inactivate', 'invoicestatuses.inactive=0', 'invoicestatuses.priority,invoicestatuses.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 ('302', 'Invoice Statuses', 'table', '2', 'invoicestatuses', 'invoicestatuses', 'modules/bms/invoicestatuses_addedit.php', '30', 'modules/bms/invoicestatuses_addedit.php', '30', NULL, '-100', '30', '-100', '-100', 'inactivate', 'invoicestatuses.inactive=0', 'invoicestatuses.priority,invoicestatuses.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 ('303', 'AR Items', 'table', '2', 'aritems', '(aritems INNER JOIN clients ON aritems.clientid = clients.id)', 'modules/bms/aritems_view.php', '0', 'NA', '0', NULL, '-100', '0', '-100', '-100', 'NA', 'aritems.posted=1 AND aritems.status = \'open\'', 'aritems.itemdate, aritems.status, aritems.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 ('304', 'Receipts', 'table', '2', 'receipts', '((receipts INNER JOIN clients ON receipts.clientid = clients.id) LEFT JOIN paymentmethods ON receipts.paymentmethodid = paymentmethods.id)', 'modules/bms/receipts_addedit.php', '80', 'modules/bms/receipts_addedit.php', '80', NULL, '-100', '80', '-100', '-100', 'delete', 'receipts.posted=0', 'receipts.receiptdate', NULL, NULL, NULL, 1, NOW(), 1, NOW());

trunk/phpbms/modules/bms/install/tablegroupings.sql

@@ -1 +? @@
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (2,'clients.type',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (3,'concat(invoices.type,\"s\")',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (4,'productcategories.name',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (8,'concat(products.partnumber,\' - \',products.partname)',1,1,'',0);
-INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES (22,'if(clientemailprojects.userid=0, \"global\", concat( users.firstname,\" \", users.lastname))',1,1,'',0);
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('2', 'clients.type', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('3', 'concat(invoices.type,\"s\")', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('4', 'productcategories.name', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('8', 'concat(products.partnumber,\' - \',products.partname)', '1', '1', '', '0');
+INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('22', 'if(clientemailprojects.userid=0, \"global\", concat( users.firstname,\" \", users.lastname))', '1', '1', '', '0');
 INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('303', 'if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company)', '1', '1', '', '0');
 INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('304', 'if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company)', '1', '1', '', '0');

trunk/phpbms/modules/bms/install/tableoptions.sql

@@ -76 +76 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('303', 'import', '0', '0', '0', '-100', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('303', 'printex', '1', '0', '0', '0', '0');
-INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('303', 'run_aging', 'run aging', '1', '1', '80', '0');
+INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('303', 'run_aging', 'run aging', '0', '1', '80', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('303', 'new', '0', '0', '0', '0', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('303', 'edit', '1', '1', '0', '0', '0');

trunk/phpbms/modules/bms/install/tablesearchablefields.sql

@@ -1 +1 @@
 INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', '(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")', ' name', '0', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', '(clients.homephone like \"{{value}}%\" or clients.workphone like \"{{value}}%\" or clients.mobilephone like \"{{value}}%\" or clients.otherphone like \"{{value}}%\" or clients.fax like \"{{value}}%\")', 'phone', '1', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'addresses.city', 'city', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'addresses.state', 'state/province', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'addresses.postalcode', 'postal code', '4', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'clients.email', 'e-mail', '5', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'clients.leadsource', 'lead source', '6', 'field');
 INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'clients.id', 'id', '7', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'clients.leadsource', 'lead source', '6', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'clients.email', 'e-mail', '5', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'addresses.postalcode', 'postal code', '4', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'addresses.state', 'state/province', '3', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', 'addresses.city', 'city', '2', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('2', '(clients.homephone like \"{{value}}%\" or clients.workphone like \"{{value}}%\" or clients.mobilephone like \"{{value}}%\" or clients.otherphone like \"{{value}}%\" or clients.fax like \"{{value}}%\")', 'phone', '1', 'whereclause');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (3,'invoices.orderdate','order date',2,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (3,'invoices.invoicedate','invoice date',3,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (3,'(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")','company / name',1,'whereclause');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (3,'invoices.id','id',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (4,'products.partnumber','part number',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (4,'products.partname','part name',1,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (4,'products.unitprice','unit price',2,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (4,'products.id','id',3,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (5,'products.partnumber','part number',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (5,'lineitems.invoiceid','invoice id',2,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (5,'lineitems.id','id',8,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (5,'invoices.orderdate','order date',3,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (5,'invoices.invoicedate','invoice date',4,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (5,'products.partname','part name',1,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (6,'tax.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (6,'tax.id','id',1,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (7,'productcategories.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (7,'productcategories.id','id',1,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (8,'products.partnumber','part number',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (8,'products.partname','part name',1,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (8,'childproducts.partnumber','dependent part number',2,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (8,'childproducts.partname','dependent name',3,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (8,'prerequisites.id','id',4,'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('3', 'invoices.orderdate', 'order date', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('3', 'invoices.invoicedate', 'invoice date', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('3', '(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")', 'company / name', '1', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('3', 'invoices.id', 'id', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('4', 'products.id', 'id', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('4', 'products.unitprice', 'unit price', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('4', 'products.partname', 'part name', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('4', 'products.partnumber', 'part number', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('5', 'products.partname', 'part name', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('5', 'invoices.invoicedate', 'invoice date', '4', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('5', 'invoices.orderdate', 'order date', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('5', 'lineitems.id', 'id', '8', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('5', 'lineitems.invoiceid', 'invoice id', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('5', 'products.partnumber', 'part number', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('6', 'tax.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('6', 'tax.id', 'id', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('7', 'productcategories.id', 'id', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('7', 'productcategories.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('8', 'products.partnumber', 'part number', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('8', 'products.partname', 'part name', '1', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('8', 'childproducts.partnumber', 'dependent part number', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('8', 'childproducts.partname', 'dependent name', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('8', 'prerequisites.id', 'id', '4', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('18', 'clients.id', 'id', '6', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('18', 'clients.email', 'e-mail', '5', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('18', '(clients.homephone like \"{{value}}%\" or clients.workphone like \"{{value}}%\" or clients.mobilephone like \"{{value}}%\" or clients.otherphone like \"{{value}}%\" or clients.fax like \"{{value}}%\")', 'phone', '1', 'whereclause');
 INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('18', '(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")', 'name', '0', 'whereclause');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('18', '(clients.homephone like \"{{value}}%\" or clients.workphone like \"{{value}}%\" or clients.mobilephone like \"{{value}}%\" or clients.otherphone like \"{{value}}%\" or clients.fax like \"{{value}}%\")', 'phone', '1', 'whereclause');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('18', 'clients.email', 'e-mail', '5', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('18', 'clients.id', 'id', '6', 'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (22,'clientemailprojects.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (22,'users.firstname like \"{{value}}%\" or users.lastname like \"{{value}}%\"','user',1,'whereclause');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (25,'discounts.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (300,'shippingmethods.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (301,'paymentmethods.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (302,'invoicestatuses.name','name',0,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (303,'aritems.id','id',4,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (303,'aritems.relatedid','invoice id',2,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (303,'aritems.amount','amount',3,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (303,'(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")','client',1,'whereclause');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (304,'receipts.id','id',2,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (304,'(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")','client',1,'whereclause');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (304,'paymentmethods.name','payment',3,'field');
-INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES (304,'receipts.amount','amount',4,'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('22', 'clientemailprojects.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('22', 'users.firstname like \"{{value}}%\" or users.lastname like \"{{value}}%\"', 'user', '1', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('25', 'discounts.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('300', 'shippingmethods.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('301', 'paymentmethods.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('302', 'invoicestatuses.name', 'name', '0', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('303', 'aritems.id', 'id', '4', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('303', 'aritems.relatedid', 'invoice id', '2', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('303', 'aritems.amount', 'amount', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('303', '(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")', 'client', '1', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('304', 'receipts.amount', 'amount', '4', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('304', 'paymentmethods.name', 'payment', '3', 'field');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('304', '(clients.lastname like \"{{value}}%\" or clients.firstname like \"{{value}}%\" or clients.company like \"{{value}}%\")', 'client', '1', 'whereclause');
+INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('304', 'receipts.id', 'id', '2', 'field');
 INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('305', 'addresstorecord.id', 'id', '1', 'field');
 INSERT INTO `tablesearchablefields` (`tabledefid`, `field`, `name`, `displayorder`, `type`) VALUES ('306', 'addresses.id', 'id', '1', 'field');

trunk/phpbms/modules/bms/install/update.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-error_reporting(E_ALL);
-define("APP_DEBUG",false);
-define("noStartup",true);
-
-include("../../../install/install_include.php");
-include("../../../include/session.php");
-
-        function doUpdate($db) {
-                $thereturn="Updating Business Management System Module\n";
-                
-                if(!verifyAdminLogin($db,$_GET["u"],$_GET["p"])){
-                        $thereturn="Update Requires Administrative Access.\n\n";
-                        return $thereturn;
-                }
-                                
-                $newVersion = $_GET["v"];
-                
-                $querystatement="SELECT version FROM modules WHERE name=\"bms\"";
-                $queryresult=$db->query($querystatement);
-                if(!$queryresult) {
-                        $thereturn="Error Accessing module table in database.\n\n";
-                        return $thereturn;
-                }
-                
-                $ver=$db->fetchArray($queryresult);
-
-                while($ver["version"] != $newVersion){
-                        switch($ver["version"]){
-                                // ================================================================================================
-                                case "0.5":
-                                        $thereturn.="Updating BMS Module to 0.51\n";
-                
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.51\" WHERE name=\"bms\";";
-                                        $queryresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-                                        
-                                        $thereturn.="Update to 0.51 Finished\n\n";
-                        
-                                        $ver["version"]="0.51";
-                                break;
-                                // ================================================================================================
-                                case "0.51":
-                                        $thereturn.="Updating BMS Module to 0.6\n";
-                                                        
-                                        $thereturn.=processSQLfile($db,"updatev0.6.sql");
-                                        
-                                        $thereturn.=importData($db,"choices");
-                                        $thereturn.=importData($db,"menu");
-                                        $thereturn.=importData($db,"reports");
-                                        $thereturn.=importData($db,"tablecolumns");
-                                        $thereturn.=importData($db,"tabledefs");
-                                        $thereturn.=importData($db,"tablefindoptions");
-                                        $thereturn.=importData($db,"tableoptions");
-                                        $thereturn.=importData($db,"tablesearchablefields");
-
-                                        $querystatement="SELECT clients.id,DATE_FORMAT(clients.creationdate,\"%Y-%m-%d\") as creationdate,max(invoices.orderdate) as orderdate
-                                                                        FROM `clients` LEFT JOIN invoices on clients.id=invoices.clientid 
-                                                                        WHERE clients.type=\"client\" GROUP BY clients.id;";
-                                        $queryresult=$db->query($querystatement);
-
-                                        while($therecord=$db->fetchArray($queryresult,$dblink)){
-                                                $querystatement="UPDATE clients set becameclient=\"";
-                                                if($therecord["orderdate"])
-                                                        $querystatement.=$therecord["orderdate"];
-                                                else
-                                                        $querystatement.=$therecord["creationdate"];
-                                                $querystatement.="\" WHERE id=".$therecord["id"];
-                                                $updateresult=$db->query($querystatement);
-                                        }
-                                        $thereturn.=" - set intitial client becamclient field\n";
-                                        
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.6\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.6 Finished\n\n";
-                        
-                                        $ver["version"]="0.6";
-                                break;
-                                // ================================================================================================
-                                case "0.6";
-                                        $thereturn.="Updating BMS Module to 0.601\n";
-
-                                        $querystatement="SELECT invoices.id,tax.percentage FROM invoices INNER JOIN tax on invoices.taxareaid=tax.id";
-                                        $queryresult=$db->query($querystatement);
-                                        
-                                        
-                                        while($therecord=$db->fetchArray($queryresult)){
-                                                $querystatement="UPDATE invoices SET taxpercentage=".$therecord["percentage"]."WHERE id=".$therecord["id"];
-                                                $updateresult=$db->query($querystatement);
-                                        }
-                                        $thereturn.=" - set taxpercentage on invoices\n";
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.601\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-
-                                        $thereturn.="Update to 0.601 Finished\n\n";
-                        
-                                        $ver["version"]="0.601";
-
-                                break;
-                                // ================================================================================================
-                                case "0.601";
-                                        $thereturn.="Updating BMS Module to 0.602\n";
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.602\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.602 Finished\n\n";
-                        
-                                        $ver["version"]="0.602";
-                                // ================================================================================================
-                                case "0.602";
-                                        $thereturn.="Updating BMS Module to 0.61\n";
-
-                                        $thereturn.=processSQLfile($db,"updatev0.61.sql");
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.61\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.61 Finished\n\n";
-                        
-                                        $ver["version"]="0.61";
-                                break;
-                                // ================================================================================================
-                                case "0.61";
-                                        $thereturn.="Updating BMS Module to 0.62\n";
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.62\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.62 Finished\n\n";
-                        
-                                        $ver["version"]="0.62";
-                                break;
-                                // ================================================================================================
-                                case "0.62";
-                                        $thereturn.="Updating BMS Module to 0.7\n";
-                                        
-                                        $thereturn.=processSQLfile($db,"updatev0.70.sql");
-                                        
-                                        //update to new status system
-                                        $result=updateInvoiceStatus($db);
-                                        if($result===true)
-                                                $thereturn.=" - Updated to new invoice status system\n";
-                                        else
-                                                $thereturn.=" - Failed to updated to new invoice status system\n".$result."\n\n";                                       
-                                        
-                                        //Update shipping from invoices
-                                        $result=moveShipping($db);
-                                        if($result===true)
-                                                $thereturn.=" - Created default Shipping Methods\n";
-                                        else
-                                                $thereturn.=" - Failed to create default shipping methods\n".$result."\n\n";
-                                        
-                                        //update payment From invoices
-                                        $result=movePayments($db);
-                                        if($result===true)
-                                                $thereturn.=" - Created default payment methods\n";
-                                        else
-                                                $thereturn.=" - Failed to create default payment Methods\n".$result."\n\n";
-                                        
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.7\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - Updated bms module record with new version\n";
-
-                                        $thereturn.="Update to 0.7 Finished\n\n";
-                        
-                                        $ver["version"]="0.7";
-                                break;
-
-                                // ================================================================================================
-                                case "0.7";
-
-                                        $thereturn.= processSQLfile($db,"updatev0.80.sql");
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.8\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-
-                                        $thereturn.="Update of Business Management System Module to 0.8 Finished\n\n";
-                                        $ver["version"]="0.8";
-                                break;
-
-                                // ================================================================================================
-                                case "0.8";
-
-                                        $thereturn.= processSQLfile($db,"updatev0.90.sql");
-
-                                        //Updating Module Table
-                                        $querystatement = "
-                                                UPDATE 
-                                                        modules 
-                                                SET 
-                                                        version='0.9' 
-                                                WHERE 
-                                                        name='bms';";
-
-                                        $updateresult = $db->query($querystatement);
-
-                                        $thereturn .= "Update of Business Management System Module to 0.9 Finished\n\n";
-
-                                        $ver["version"] = "0.9";
-
-                                        break;
-                                        
-                                // ================================================================================================
-                                case "0.9";
-
-                                        $thereturn.= processSQLfile($db,"updatev0.92.sql");
-
-                                        //Updating Module Table
-                                        $updatestatement = "
-                                                UPDATE 
-                                                        modules 
-                                                SET 
-                                                        version='0.92' 
-                                                WHERE 
-                                                        name='bms';";
-
-                                        $db->query($updatestatement);
-
-                                        $thereturn .= "Update of Business Management System Module to 0.92 Finished\n\n";
-
-                                        $ver["version"] = "0.92";
-
-                                        break;
-
-                                // ================================================================================================
-                                case "0.92";
-
-                                        $thereturn.= processSQLfile($db,"updatev0.94.sql");
-
-                                        //Updating Module Table
-                                        $updatestatement = "
-                                                UPDATE 
-                                                        modules 
-                                                SET 
-                                                        version='0.94' 
-                                                WHERE 
-                                                        name='bms';";
-
-                                        $db->query($updatestatement);
-
-                                        $thereturn .= "Update of Business Management System Module to 0.94 Finished\n\n";
-
-                                        $ver["version"] = "0.94";
-
-                                        break;
-
-                                // ================================================================================================
-                                case "0.94";
-
-                                        $thereturn.= processSQLfile($db,"updatev0.96.sql");
-                                        
-                                        if(v096updateInvoiceAddresses($db))
-                                                $thereturn .= "Updating invoice addresses.\n\n";                                        
-
-                                        if(v096transferClientAddresses($db))
-                                                $thereturn .= "Transfer client addresses.\n\n";                                 
-
-                                        //Updating Module Table
-                                        $updatestatement = "
-                                                UPDATE 
-                                                        modules 
-                                                SET 
-                                                        version='0.96' 
-                                                WHERE 
-                                                        name='bms';";
-
-                                        $db->query($updatestatement);
-
-                                        $thereturn .= "Update of Business Management System Module to 0.96 Finished\n\n";
-
-                                        $ver["version"] = "0.96";
-
-                                        break;
-                                
-                                // ================================================================================================
-                                case "0.96";
-
-                                        $thereturn.= processSQLfile($db,"updatev0.98.sql");
-                                        
-                                        //Updating Module Table
-                                        $updatestatement = "
-                                                UPDATE 
-                                                        modules 
-                                                SET 
-                                                        version='0.98' 
-                                                WHERE 
-                                                        name='bms';";
-
-                                        $db->query($updatestatement);
-
-                                        $thereturn .= "Update of Business Management System Module to 0.98 Finished\n\n";
-
-                                        $ver["version"] = "0.98";
-
-                                        break;
-
-                        }//end switch
-                }//end while
-                return $thereturn;
-
-        }//end update
-
-
-        function moveShipping($db){
-                $querystatement="SELECT DISTINCT shippingmethod FROM invoices WHERE shippingmethod!=\"\" ORDER BY shippingmethod";
-                $queryresult=$db->query($querystatement);
-                
-                while($therecord=$db->fetchArray($queryresult)){
-                        $querystatement="INSERT INTO `shippingmethods` (name,createdby,creationdate) VALUES (\"".$therecord["shippingmethod"]."\",1,NOW())";
-                        $updatequery=$db->query($querystatement);
-                }
-
-                $querystatement="SELECT id,name FROM shippingmethods";
-                $queryresult=$db->query($querystatement);
-
-                while($therecord=$db->fetchArray($queryresult)){
-                        $querystatement="UPDATE invoices SET shippingmethodid=".$therecord["id"]."
-                                                        WHERE shippingmethod=\"".$therecord["name"]."\"";
-                        $updatequery=$db->query($querystatement);
-                }
-                $querystatement="ALTER TABLE invoices DROP shippingmethod";
-                $updatequery=$db->query($querystatement);
-                
-                return true;             
-        }
-
-
-        function movePayments($db){
-                $querystatement="SELECT DISTINCT paymentmethod FROM invoices WHERE paymentmethod!=\"\" ORDER BY paymentmethod";
-                $queryresult=$db->query($querystatement);
-
-                while($therecord=$db->fetchArray($queryresult)){
-                        switch($therecord["paymentmethod"]){
-                                case "VISA":
-                                case "VISA - Debit": 
-                                case "American Express":
-                                case "Master Card":
-                                case "MasterCard":
-                                case "Discover Card":
-                                        $type="\"charge\"";
-                                break;
-                                
-                                case "Personal Check":
-                                case "Check":
-                                case "Cashiers Check":
-                                case "check":
-                                        $type="\"draft\"";
-                                break;                          
-                                
-                                default:
-                                        $type="NULL";
-                                break;
-                        }
-                        
-                        $querystatement="INSERT INTO `paymentmethods` (name,`type`,createdby,creationdate) VALUES (\"".$therecord["paymentmethod"]."\",".$type.",1,NOW())";
-                        $updatequery=$db->query($querystatement);
-                }
-
-                $querystatement="SELECT id,name FROM paymentmethods";
-                $queryresult=$db->query($querystatement);
-                while($therecord=$db->fetchArray($queryresult)){
-                        $querystatement="UPDATE invoices SET paymentmethodid=".$therecord["id"]."
-                                                        WHERE paymentmethod=\"".$therecord["name"]."\"";
-                        $updatequery=$db->query($querystatement);
-                }
-                $querystatement="ALTER TABLE invoices DROP paymentmethod";
-                $updatequery=$db->query($querystatement);
-                
-                return true;
-        }
-
-        function updateInvoiceStatus($db){
-                $querystatement="SELECT id,status,statusdate,orderdate,invoicedate,type FROM invoices";
-                $queryresult=$db->query($querystatement);
-                
-                while($therecord=$db->fetchArray($queryresult)){
-                                
-                        $newstatus=1;                   
-                        switch($therecord["status"]){
-                                case "Open":
-                                        $newstatus=1;
-                                        $statusdate=$therecord["orderdate"];
-                                break;
-                                case "Committed":
-                                        $newstatus=2;
-                                        $statusdate=$therecord["orderdate"];                                    
-                                break;
-                                case "Packed":
-                                        $newstatus=3;
-                                        $statusdate=$therecord["orderdate"];                                    
-                                break;
-                                case "Shipped":
-                                        $newstatus=4;
-                                        if($therecord["statusdate"])
-                                                $statusdate=$therecord["statusdate"];
-                                        elseif($therecord["invoicedate"])
-                                                $statusdate=$therecord["invoicedate"];
-                                        else
-                                                $statusdate=$therecord["orderdate"];
-                                break;
-                        }//end switch                   
-
-                        if($therecord["type"]=="Invoice")
-                                $statusdate=$therecord["invoicedate"];
-                        
-                        $querystatement="UPDATE invoices SET statusid=".$newstatus.", statusdate=\"".$statusdate."\" WHERE id=".$therecord["id"];
-                        $updatequery=$db->query($querystatement);
-
-                        //now create the history
-                        $querystatement="INSERT INTO invoicestatushistory (invoiceid,invoicestatusid,statusdate)VALUES(".$therecord["id"].",".$newstatus.",\"".$statusdate."\")";
-                        $insertquery=$db->query($querystatement);
-                        
-                }
-                $querystatement="ALTER TABLE `invoices` DROP COLUMN `status`";
-                $dropcolumnquery=$db->query($querystatement);
-                
-                return true;
-        }//end funtion
-
-
-        function v096updateInvoiceAddresses($db){
-        
+
+// Need custom class for upgrade because
+// some BMS upgrades require more than just
+// version SQL file processing
+class updateBMS extends updateModuleAjax{
+
+        function updateBMS($db, $phpbmsSession, $moduleName, $pathToModule){
+
+                $this->updateModuleAjax($db, $phpbmsSession, $moduleName, $pathToModule);
+
+        }//end function init
+
+        //override function for custom upgrading
+        function update(){
+
+                if(!$this->db->connect())
+                        return $this->returnJSON(false, "Could not connect to database ".$this->db->getError());
+
+                if(!$this->db->selectSchema())
+                        return $this->returnJSON(false, "Could not open database schema '".MYSQL_DATABASE."'");
+
+                $updater = new installer($this->db);
+
+                include("../modules/bms/version.php");
+                $newVersion = $modules["bms"]["version"];
+                $currentVersion = $this->currentVersion;
+
+                //next we loop through each upgrade process
+                while($currentVersion != $newVersion){
+
+                        switch($currentVersion){
+
+                                // ================================================================================================
+                                case 0.8:
+
+                                        $version = 0.9;
+                                        //Processing Data Structure Changes
+                                        $thereturn = $updater->processSQLfile("../modules/bms/install/updatev".$version.".sql");
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        //Updating Module Table
+                                        $thereturn = $this->updateModuleVersion("bms", $version);
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        $currentVersion = $version;
+
+                                        break;
+
+                                // ================================================================================================
+                                case 0.9:
+
+                                        $version = 0.92;
+                                        //Processing Data Structure Changes
+                                        $thereturn = $updater->processSQLfile("../modules/bms/install/updatev".$version.".sql");
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        //Updating Module Table
+                                        $thereturn = $this->updateModuleVersion("bms", $version);
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        $currentVersion = $version;
+
+                                        break;
+
+                                // ================================================================================================
+                                case 0.92:
+
+                                        $version = 0.94;
+                                        //Processing Data Structure Changes
+                                        $thereturn = $updater->processSQLfile("../modules/bms/install/updatev".$version.".sql");
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        //Updating Module Table
+                                        $thereturn = $this->updateModuleVersion("bms", $version);
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        $currentVersion = $version;
+
+                                        break;
+
+                                // ================================================================================================
+                                case 0.94:
+
+                                        $version = 0.96;
+                                        //Processing Data Structure Changes
+                                        $thereturn = $updater->processSQLfile("../modules/bms/install/updatev".$version.".sql");
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        if(!$this->v096updateInvoiceAddresses())
+                                                return $this->returnJSON(false, "v0.96 Invoice Addresses Movement Failed");
+
+                                        if(!$this->v096transferClientAddresses())
+                                                return $this->returnJSON(false, "v0.96 Client Addresses Movement Failed");
+
+                                        //Updating Module Table
+                                        $thereturn = $this->updateModuleVersion("bms", $version);
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        $currentVersion = $version;
+
+                                        break;
+
+                                // ================================================================================================
+                                case 0.96:
+
+                                        $version = 0.98;
+                                        //Processing Data Structure Changes
+                                        $thereturn = $updater->processSQLfile("../modules/bms/install/updatev".$version.".sql");
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        //Updating Module Table
+                                        $thereturn = $this->updateModuleVersion("bms", $version);
+                                        if($thereturn !== true)
+                                                return $this->returnJSON(false, $thereturn);
+
+                                        $currentVersion = $version;
+
+                                        break;
+
+                        }//endswitch currentVersion
+
+                }//endwhile currentversion/newversion
+
+
+                return $this->returnJSON(true, "Module '".$this->moduleName."' Updated");
+
+        }//end function update
+
+
+//==== v0.96 Specific Function =================================================
+
+        function v096updateInvoiceAddresses(){
+
                 $querystatement = "
                         SELECT
@@ -487 +190 @@
                         FROM
                                 invoices INNER JOIN clients ON invoices.clientid = clients.id";
-                                
-                $queryresult = $db->query($querystatement);
-                
-                while($therecord = $db->fetchArray($queryresult)){
-                
+
+                $queryresult = $this->db->query($querystatement);
+
+                while($therecord = $this->db->fetchArray($queryresult)){
+
                         $updatestatement = "
                                 UPDATE
@@ -511 +214 @@
                                         id = ".$therecord["id"];
 
-                                $db->query($updatestatement);
-                
+                                $this->db->query($updatestatement);
+
                 }//endwhile - record
-        
+
                 return true;
-        
+
         }//end function - v096updateInvoiceAddresses
 
 
-        function v096transferClientAddresses($db){
-        
+        function v096transferClientAddresses(){
+
                 //retrieve all client records with ship to addresses
                 $querystatement = "
@@ -540 +243 @@
                         FROM
                                 clients";
-                
-                $queryresult = $db->query($querystatement);
-                
-                while($therecord = $db->fetchArray($queryresult)){
-                
+
+                $queryresult = $this->db->query($querystatement);
+
+                while($therecord = $this->db->fetchArray($queryresult)){
+
                         // for each client with a ship to, we need to create
                         // an address record (and addresstorecord record)
-                        
+
                         // Create the address record
                         $address["title"] = "Primary";
@@ -556 +259 @@
                         $address["postalcode"] = $therecord["postalcode"];
                         $address["country"] = $therecord["country"];
-                        
-                        $newid = insertAddress($db, $address);                  
-                        
+
+                        $newid = $this->v096insertAddress($address);
+
                         $a2r["clientid"] = $therecord["id"];
                         $a2r["addressid"] = $newid;
                         $a2r["primary"] = 1;
-                        
+
                         if($therecord["shiptoaddress1"]){
-                        
+
                                 $a2r["defaultshipto"] = 0;
-                                insertA2R($db, $a2r);
-                        
+                                $this->v096insertA2R($a2r);
+
                                 $address["title"] = "Shipping";
                                 $address["address1"] = $therecord["shiptoaddress1"];
@@ -575 +278 @@
                                 $address["postalcode"] = $therecord["shiptopostalcode"];
                                 $address["country"] = $therecord["shiptocountry"];
-                                
-                                $newid = insertAddress($db, $address);                  
-                                
+
+                                $newid = insertAddress($db, $address);
+
                                 $a2r["addressid"] = $newid;
                                 $a2r["primary"] = 0;
                                 $a2r["defaultshipto"] = 1;
-                        
+
                         } else {
-                        
+
                                 $a2r["defaultshipto"] = 1;
-                                
+
                         }//endif - shiptoaddress1
 
-                        insertA2R($db, $a2r);           
-                        
+                        $this->v096insertA2R($db, $a2r);
+
                 }//endwhile
-                
+
                 //Lastly, we need to remove the shipto fields
                 $alterstatement = "
-                        ALTER TABLE `clients` 
+                        ALTER TABLE `clients`
                                 DROP COLUMN `address1`,
                                 DROP COLUMN `address2`,
@@ -606 +309 @@
                                 DROP COLUMN `shiptostate`,
                                 DROP COLUMN `shiptopostalcode`,
-                                DROP COLUMN `shiptocountry`";   
-
-                $db->query($alterstatement);
-        
+                                DROP COLUMN `shiptocountry`";
+
+                $this->db->query($alterstatement);
+
         }//end function
-        
-        
-        function insertA2R($db, $variables){
-        
+
+
+        function v096insertA2R($variables){
+
                 // Create the relation record
                 $insertstatement = "
@@ -640 +343 @@
                                 NOW()
                         )";
-                
-                $db->query($insertstatement);   
-                        
+
+                $this->db->query($insertstatement);
+
         }//end function - insertA2R
-        
-        
-        function insertAddress($db, $variables){
-        
+
+
+        function v096insertAddress($variables){
+
                         $insertaddress = "
                                 INSERT INTO
-                                        addresses 
+                                        addresses
                                 (
                                         title,
@@ -677 +380 @@
                                 )
                         ";
-                        
-                        $db->query($insertaddress);
-                        
+
+                        $this->db->query($insertaddress);
+
                         //make sure to get the new address id
-                        return $db->insertId();         
-        
+                        return $this->db->insertId();
+
         }//end function - insertAddress
-                
-        
-
-
-        //=========================================================
-        // Processor
-        //=========================================================
-        $phpbmsSession = new phpbmsSession;
-        $success = $phpbmsSession->loadDBSettings(false);
-
-        include_once("include/db.php");
-        $db = new db(false);
-        $db->stopOnError = false;
-        $db->showError = false;
-        $db->logError = false;
-
-        if($success !== false){
-                
-                if(!$db->connect())
-                        $thereturn = "Could Not Establish Connection To MySQL Server: Check server, user name, and password.";                  
-                else {
-                        if(!$db->selectSchema())
-                                $thereturn = "Database (schema) ".MYSQL_DATABASE." could not be selected";                      
-                        else {
-
-                                $phpbmsSession->db = $db;
-                                $phpbmsSession->loadSettings();
-                                
-                                $thereturn=doUpdate($db);       
-
-                        }               
-                }
-        } else
-                $thereturn = "Could not access settings.php";   
-                                
-
-
-                header('Content-Type: text/xml');
-                ?><?php echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>'; ?>
-<response><?php echo $thereturn?></response>
+
+}//end class updateBMS
+
+// Processor
+//=========================================================
+$theModule = new updateBMS($this->db, $this->phpbmsSession, "bms", "../modules/bms/install/");

trunk/phpbms/modules/bms/install/updatev0.98.sql

@@ -3 +3 @@
 ALTER TABLE `aritems` ENGINE=INNODB;
 ALTER TABLE `clientemailprojects` ENGINE=INNODB;
-ALTER TABLE `clients` ADD COLUMN `taxid` VARCHAR(64) default NULL AFTER `webaddress`;
 ALTER TABLE `clients` ENGINE=INNODB;
-INSERT INTO `settings` (`name`, `value`) VALUES ('company_taxid', '');
-UPDATE `tabledefs` SET `deletebutton` = 'inactivate' WHERE `displayname` = 'Tax Areas';
 ALTER TABLE `discounts` ENGINE=INNODB;
 ALTER TABLE `attachments` ENGINE=INNODB;
@@ -20 +17 @@
 ALTER TABLE `receipts` ENGINE=INNODB;
 ALTER TABLE `shippingmethods` ENGINE=INNODB;
+ALTER TABLE `clients` ADD COLUMN `taxid` VARCHAR(64) default NULL AFTER `webaddress`;
+ALTER TABLE `receipts` MODIFY COLUMN `paymentmethodid` INTEGER NOT NULL DEFAULT 0;
 INSERT INTO `settings` (`name`, `value`) VALUES ('company_taxid', '');
 UPDATE `tabledefs` SET `deletebutton` = 'inactivate' WHERE `id` IN (6, 7);
 UPDATE `tabledefs` SET `importfile` = 'modules/bms/clients_import.php' WHERE `id` = 2;
-UPDATE `tabledefs` SET `importfile` = 'modules/bms/products_import.php' WHERE `id` = 4;
 UPDATE `tabledefs` SET `defaultcriteriafindoptions` = 'Active Records', `defaultcriteriaselection` = 'name' WHERE `id` = 25;
+UPDATE `tabledefs` SET `deletebutton` = 'inactivate' WHERE `displayname` = 'Tax Areas';
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('2', 'import', '1', '0', '0', '-100', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('3', 'import', '0', '0', '0', '-100', '0');
@@ -43 +42 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('306', 'import', '0', '0', '0', '-100', '0');
 UPDATE `tableoptions` SET `needselect` = 0 WHERE `tabledefid` = 2 AND `name` = 'massEmail';
+UPDATE `tableoptions` SET `needselect` = 0 WHERE `tabledefid` = 303 AND `name` = 'run_aging';
 INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES ('25', 'Active Records', 'discounts.inactive=0', '0', '0');
 UPDATE `tablefindoptions` SET `displayorder` = 0 WHERE `tabledefid` = 25 AND `name` = 'all records';
 UPDATE `tablefindoptions` SET `search`= 'clients.firstname=dclients.firstname AND clients.lastname=dclients.lastname AND addresses.postalcode = daddresses.postalcode AND clients.lastname != \'\' AND clients.firstname != \'\' AND addresses.postalcode != \'\' AND clients.id<>dclients.ID' WHERE `name` = 'match names and postal code' AND `tabledefid` = '18';
 UPDATE `tablefindoptions` SET `search`= 'addresses.address1=daddresses.address1 AND clients.id<>dclients.id' WHERE `name` = 'match addresses' AND `tabledefid` = '18';
-ALTER TABLE `receipts` MODIFY COLUMN `paymentmethodid` INTEGER NOT NULL DEFAULT 0;
-UPDATE `tablecolumns` SET `column`='IF(receipts.paymentmethodid = '-1',concat( concat("Other... (", receipts.paymentother), ")"), paymentmethods.name)' WHERE `tabledefid` = '304' AND `name` = 'payment';
+UPDATE `tablecolumns` SET `column`='IF(receipts.paymentmethodid = -1,concat( concat("Other... (", receipts.paymentother), ")"), paymentmethods.name)' WHERE `tabledefid` = '304' AND `name` = 'payment';
+INSERT INTO `reports` (`name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('Incoming Cash Flow', 'report', '3', '55', '50', 'modules/bms/report/incoming_cashflow.php', 'This report shows total incoming monies for a time period from both posted sales orders AND posted receipts. It can be grouped by week, month, quarter and year.\r\n\r\nThis report runs is unaffected by selected records, search or sort parameters.  It requires input of it\'s own start and end dates.', 1, NOW(), 1, NOW());

trunk/phpbms/modules/bms/invoices_attachments.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -39 +39 @@
 
         include("../../include/session.php");
-        
+
 
         require_once("../../include/search_class.php");
-                
+
 
         //set the table passing stuff
@@ -49 +49 @@
         $refid=(integer) $_GET["id"];
         $securitywhere="";
-        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)               
-                $securitywhere=" AND files.roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";      
+        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)
+                $securitywhere=" AND files.roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";
         $whereclause="attachments.tabledefid=".$tabledefid." AND attachments.recordid=".$refid.$securitywhere;
         $backurl="../bms/invoices_attachments.php";
@@ -60 +60 @@
 
         $refquery="SELECT
-                           invoices.id, if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as name 
-                           FROM invoices INNER JOIN clients ON invoices.clientid=clients.id 
+                           invoices.id, if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as name
+                           FROM invoices INNER JOIN clients ON invoices.clientid=clients.id
                            WHERE invoices.id=".$refid;
         $refquery=$db->query($refquery);
-        $refrecord=$db->fetchArray($refquery);  
-        
-        $pageTitle="Attachments: ".$refrecord["id"].", ".$refrecord["name"];
+        $refrecord=$db->fetchArray($refquery);
+
+        $pageTitle="Attachments: ".$refrecord["id"];
+        if($refrecord["name"] !== "")
+                $pageTitle .= ", ".$refrecord["name"];
 
         $tabgroup="invoices entry";
         $selectedtabid=17;
-        
+
         include("../base/attachments_records.php");
-        
+
 ?>

trunk/phpbms/modules/bms/invoices_notes.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -39 +39 @@
 
         include("../../include/session.php");
-        
+
 
         require_once("../../include/search_class.php");
-                
+
 
         //set the table passing stuff
@@ -53 +53 @@
 
         $refquery="SELECT
-                           invoices.id, if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as name 
-                           FROM invoices INNER JOIN clients ON invoices.clientid=clients.id 
+                           invoices.id, if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as name
+                           FROM invoices INNER JOIN clients ON invoices.clientid=clients.id
                            WHERE invoices.id=".$refid;
         $refquery=$db->query($refquery);
-        $refrecord=$db->fetchArray($refquery);  
-        
-        $pageTitle="Notes/Tasks/Events: ".$refrecord["id"].", ".$refrecord["name"];
+        $refrecord=$db->fetchArray($refquery);
+
+        $pageTitle="Notes/Tasks/Events: ".$refrecord["id"];
+        if($refrecord["name"] !== "")
+                $pageTitle .= ", ".$refrecord["name"];
 
         $tabgroup="invoices entry";
         $selectedtabid=18;
-        
+
         include("../base/notes_records.php");
         //===================================================================================
         //==  THAT's IT                                                                    ==
         //===================================================================================
-        
+
 ?>

trunk/phpbms/modules/bms/javascript/aritem_aging.js

@@ -1 +1 @@
 aging = {
-        
+
         submitForm: function(e){
-                
+
                 var thebutton = e.src();
                 var theform = getObjectFromID("record");
-                
+
                 var command = getObjectFromID("command");
-                
+
                 if(thebutton.id == "runButton"){
-                        
+
                         if(!validateForm(theform))
                                 return false;
 
                         command.value = "run";
-                        
+
                 } else
                         command.value = "cancel";
 
                 theform.submit();
-                
+
+                return true;
+
         }//end method
-        
+
 }//end class
 
@@ -29 +31 @@
 
 connect(window,"onload",function() {
-                                                                        
+
         var runButton = getObjectFromID("runButton");
         if(runButton)
                 connect(runButton, "onclick", aging.submitForm);
-        
+
         var cancelButton = getObjectFromID("cancelButton");
         if(cancelButton)
                 connect(cancelButton, "onclick", aging.submitForm);
-                
+
         var printStatements = getObjectFromID("printClientStatements");
         if(printStatements){
 
                 var theURL;
-                var printSummary = getObjectFromID("printSummary");             
+                var printSummary = getObjectFromID("printSummary");
                 var agingdate = getObjectFromID("agingdate")
-                
+
                 var ts = new Date();
                 ts = ts.getTime();
-                
+
                 if(printStatements.value == 1){
-                        
+
                         theURL = APP_PATH+"modules/bms/report/aritems_clientstatement.php?cmd=print&sd="+encodeURIComponent(agingdate.value)+"&ts="+ts+"&ext=.pdf";
                         window.open(theURL, 'phpBMSprint1');
-                        
+
                 }//endif
-                
+
                 if(printSummary.value == 1){
-                        
+
                         theURL = APP_PATH+"modules/bms/report/aritems_summary.php?cmd=print&sd="+encodeURIComponent(agingdate.value)+"&ts="+ts;
                         window.open(theURL, 'phpBMSprint2');
-                        
+
                 }//endif
-                
+
         }//end if
-        
+
 })

trunk/phpbms/modules/bms/javascript/totalreports.js

@@ -38 +38 @@
 
 report = {
-    
+
     cancel: function(){
-        
+
         window.close();
-        
-    },//endmethod
-    
+
+    },//endmethod
+
     validateForm: function (){
-        
+
         if(report.prepareGroupings() && report.prepareColumns()){
-            
+
             var theForm = getObjectFromID("GroupForm");
             theForm.submit();
-            
+
         }else{
-            
+
             alert("Make sure you have selected unique groups and columns for each line.");
-            
+
         }
-        
-    },//endmethod
-    
+
+    },//endmethod
+
     prepareGroupings: function (){
-        
+
         var groupArray = new Array();
-        
+
         for(var i=0; i<GroupParams.length; i++){
-            
+
             var groupField = getObjectFromID("Group"+GroupParams[i]+"Field");
             if(groupField.value == "0"){
-                
-                
+
+
             }else{
-                
+
                 for(var j=0; j<groupArray.length; j++){
-                    
+
                     if(groupField.value == groupArray[j]+1){
-                        
+
                         return false;
-                        
+
                     }//endif
-                    
+
                 }//endfor
-                
+
                 groupArray[groupArray.length] = groupField.value-1;
-                
+
             }//endif
-            
-        }//endfor
-        
+
+        }//endfor
+
         var hiddenGroupings = getObjectFromID("groupings");
         hiddenGroupings.value = groupArray.join("::");
-        
-        return true;
-        
-    },//endmethod
-    
+
+        return true;
+
+    },//endmethod
+
     prepareColumns: function (){
-        
+
         var columnArray = new Array();
-        
+
         for(var i=0; i<ColumnParams.length; i++){
-            
+
             var columnField = getObjectFromID("Column"+ColumnParams[i]+"Field");
-            
+
             if(columnField.value == "0"){
-                
+
                 return false;
-                
+
             }else{
-                
+
                 for(var j=0; j<columnArray.length; j++){
-                    
+
                     if(columnField.value == columnArray[j]+1){
-                        
+
                         return false;
-                        
+
                     }//endif
-                    
+
                 }//endfor
-                
+
                 columnArray[columnArray.length] = columnField.value-1;
-                
+
             }//endif
-            
-        }//endfor
-        
+
+        }//endfor
+
         var hiddenColumns = getObjectFromID("columns");
         hiddenColumns.value = columnArray.join("::");
-        
-        return true;
-        
+
+        return true;
+
     },//endmethod
 
     groupAddLine: function (){
-        
+
         var tempMinus = getObjectFromID("Group"+GroupParams[0]+"Minus");
         if(tempMinus.className == "graphicButtons buttonMinusDisabled")
@@ -143 +143 @@
         var newid = "Group"+(GroupParams[GroupParams.length-1]+1)
         tempContent = tempContent.replace(REcriteria, newid);
-        
+
         var newDiv = document.createElement("div");
         newDiv.id = newid;
         newDiv.innerHTML = tempContent;
-        
+
         var containerDiv = getObjectFromID("theGroups");
         containerDiv.appendChild(newDiv);
-        
+
         GroupParams[GroupParams.length] = GroupParams[GroupParams.length-1]+1;
-        
-        
+
+
         var newPlusButton = getObjectFromID(newid+"Plus");
         connect(newPlusButton, "onclick", report.groupAddLine);
-        
+
         var newMinusButton = getObjectFromID(newid+"Minus");
         connect(newMinusButton, "onclick", report.groupRemoveLine);
-        
-        
-    },//endmethod
-    
+
+
+    },//endmethod
+
     groupRemoveLine: function (e){
-        
+
         var thebutton = e.src();
-        
+
         if(thebutton.className=="graphicButtons buttonMinusDisabled")
         return false;
-        
+
         var theDiv = thebutton.parentNode;
-                
+
         var containerDiv = getObjectFromID("theGroups");
         containerDiv.removeChild(theDiv);
         var theid = theDiv.id.replace(/Group/g,"");
         theDiv=null;
-        
+
         for(var i=0;i<GroupParams.length;i++){
-            
+
             if(GroupParams[i]==theid){
-                
+
                 GroupParams.splice(i,1);
                 break;
-                
+
             }//endif
-            
-        }//endfor
-        
+
+        }//endfor
+
         if(GroupParams.length==1){
-            
+
             var tempButton = getObjectFromID("Group"+GroupParams[0]+"Minus");
             tempButton.className="graphicButtons buttonMinusDisabled"
-            
+
         }//endif
-        
-    },//endmethod
-    
+
+        return true;
+
+    },//endmethod
+
     columnAddLine: function (){
-        
+
         var tempMinus = getObjectFromID("Column"+ColumnParams[0]+"Minus");
         if(tempMinus.className == "graphicButtons buttonMinusDisabled")
@@ -207 +209 @@
         var REcriteria = new RegExp("Column"+ColumnParams[0],"g");
         var newid = "Column"+(ColumnParams[ColumnParams.length-1]+1)
-        
+
         tempContent = tempContent.replace(REcriteria, newid);
-        
+
         var newDiv = document.createElement("div");
         newDiv.id = newid;
         newDiv.innerHTML = tempContent;
-        
+
         var containerDiv = getObjectFromID("theColumns");
         containerDiv.appendChild(newDiv);
-        
+
         ColumnParams[ColumnParams.length] = ColumnParams[ColumnParams.length-1]+1;
-        
-        
+
+
         var newPlusButton = getObjectFromID(newid+"Plus");
         connect(newPlusButton, "onclick", report.columnAddLine);
-        
+
         var newMinusButton = getObjectFromID(newid+"Minus");
         connect(newMinusButton, "onclick", report.columnRemoveLine);
-        
-        
-    },//endmethod
-    
+
+
+    },//endmethod
+
     columnRemoveLine: function (e){
-        
+
         var thebutton = e.src();
-        
+
         if(thebutton.className=="graphicButtons buttonMinusDisabled")
         return false;
-        
+
         var theDiv = thebutton.parentNode;
-                
+
         var containerDiv = getObjectFromID("theColumns");
         containerDiv.removeChild(theDiv);
         var theid = theDiv.id.replace(/Column/g,"");
         theDiv=null;
-        
+
         for(var i=0;i<ColumnParams.length;i++){
-            
+
             if(ColumnParams[i] == theid){
-                
+
                 ColumnParams.splice(i,1);
                 break;
-                
+
             }//endif
-            
-        }//endfor
-        
+
+        }//endfor
+
         if(ColumnParams.length == 1){
-            
+
             var tempButton = getObjectFromID("Column"+ColumnParams[0]+"Minus");
             tempButton.className="graphicButtons buttonMinusDisabled"
-            
+
         }//endif
-        
+
+        return true;
+
     }//endmethod
-    
+
 }//end class
 
@@ -269 +273 @@
 
 connect(window,"onload",function() {
-        
+
     GroupParams = [1];
     ColumnParams = [1];
-    
+
     var plusGroupButton = getObjectFromID("Group1Plus");
     connect(plusGroupButton, "onclick", report.groupAddLine);
-        
+
     var minusGroupButton = getObjectFromID("Group1Minus");
     connect(minusGroupButton, "onclick", report.groupRemoveLine);
-    
+
     var plusColumnButton = getObjectFromID("Column1Plus");
     connect(plusColumnButton, "onclick", report.columnAddLine);
-        
+
     var minusColumnButton = getObjectFromID("Column1Minus");
     connect(minusColumnButton, "onclick", report.columnRemoveLine);
-    
+
     var printButton = getObjectFromID("print");
     connect(printButton, "onclick", report.validateForm);
-    
+
     var cancelButton = getObjectFromID("cancel");
     connect(cancelButton, "onclick", report.cancel);

trunk/phpbms/modules/recurringinvoices/install/install.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-error_reporting(E_ALL);
-define("APP_DEBUG",false);
-define("noStartup",true);
-include("../../../install/install_include.php");
-include("../../../include/session.php");
-
-        $phpbmsSession = new phpbmsSession;
-        $success = $phpbmsSession->loadDBSettings(false);
-        include_once("include/db.php");
-        $db = new db(false);
-        $db->stopOnError = false;
-        $db->showError = false;
-        $db->logError = false;
-
-        if($success !== false){
-                
-                if(!$db->connect())
-                        $thereturn = "Could Not Establish Connection To MySQL Server: Check server, user name, and password.";                  
-                else {
-                        if(!$db->selectSchema())
-                                $thereturn = "Database (schema) ".MYSQL_DATABASE." could not be selected";                      
-                        else {
-
-
-                                // ENTER YOUR MODULE NAME HERE
-                                $thereturn  = "Recurring Invoice Installation\n";
-                                $thereturn .= "______________________________\n";
-                                
-                                //MAKE SURE THERE IS A createtables.sql FILE
-                                //which houses all your SQL create statements
-                                // for any tables you will create.
-                                $tempreturn = createTables($db,"createtables.sql");
-                                
-                                if($tempreturn === true){
-                                        
-                                        $thereturn.= "Done Creating Tables \n";
-                                        
-                                        
-                                        // NEXT, DEFINE AN ARRAY OF TABLE NAMES
-                                        // for any tables that need initial data populated. (including existing tables)
-                                        // for each table, make sure there
-                                        // is a corresponding SQL file
-                                        // with insert statements for all the records needing to be imported
-                                        
-                                        /*
-                                                Need to add entries for tabledefs, tablecolumns, tablefindoptions, tableoptions, and
-                                                tablesearchablefields
-                                        */
-                                        $tables = array(
-                                                "menu",
-                                                "modules",
-                                                "roles",
-                                                "scheduler",
-                                                "tabledefs",
-                                                "tablecolumns",
-                                                "tableoptions",
-                                                "tablefindoptions",
-                                                "tablesearchablefields",
-                                                "tabs",
-                                                "users",
-                                        );
-                                        foreach($tables as $table){
-                                                
-                                                $failure = false;
-                                                $tempreturn = importData($db,$table);
-                                                $thereturn .= $tempreturn;
-                                                if(!strpos($tempreturn,"complete.") === false){
-                                                        $failed = true;
-                                                }
-                                                
-                                        }//end foreach
-                                        
-                                        
-                                        //MAKE SURE TO set the done message for your module.
-                                        if(!$failure){
-                                                $thereturn .= "______________________________________\n";                       
-                                                $thereturn .= "Done Installing Recurring Invoice Data\n";
-                                        }
-                                } else
-                                        $thereturn = $tempreturn;                               
-                        }               
-                }
-        } else
-                $thereturn = "Could not access settings.php";
-                
-                
-                header('Content-Type: text/xml');
-                ?><?php echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>'; ?>
-<response><?php echo $thereturn?></response>
+$theModule = new installModuleAjax($this->db, $this->phpbmsSession, "../modules/recurringinvoices/install/");
+$theModule->tables = array(
+                        "menu",
+                        "modules",
+                        "roles",
+                        "scheduler",
+                        "tabledefs",
+                        "tablecolumns",
+                        "tableoptions",
+                        "tablefindoptions",
+                        "tablesearchablefields",
+                        "tabs",
+                        "users",
+                        );

trunk/phpbms/modules/recurringinvoices/install/update.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-error_reporting(E_ALL);
-define("APP_DEBUG",false);
-define("noStartup",true);
-
-include("../../../install/install_include.php");
-include("../../../include/session.php");
-
-        function doUpdate($db) {
-        
-                $module = array(
-                        "title" => "Recurring Invoices",
-                        "name" => "recurringinvoices"
-                );
-        
-                $thereturn="Updating ".$module["title"]." Module\n";
-                
-                if(!verifyAdminLogin($db,$_GET["u"],$_GET["p"])){
-                
-                        $thereturn="Update Requires Administrative Access.\n\n";
-                        return $thereturn;
-                        
-                }//end if
-                                
-                $newVersion = $_GET["v"];
-                
-                $querystatement="SELECT version FROM modules WHERE name = '".$module["name"]."'";
-                $queryresult=$db->query($querystatement);
-
-                if($db->numRows($queryresult)) {
-                        
-                        $ver=$db->fetchArray($queryresult);
-                        while($ver["version"] != $newVersion){
-                        
-                                switch($ver["version"]){
-                                
-                                        // ================================================================================================
-                                        case "1.0":
-                                                $nextVersion = "1.01";
-                                                
-                                                $thereturn.="Updating ".$module["title"]." Module to ".$nextVersion."\n";
-                        
-                                                $thereturn.= processSQLfile($db,"updatev1.01.sql");
-        
-                                                //Updating Module Table
-                                                $querystatement="
-                                                        UPDATE 
-                                                                modules 
-                                                        SET 
-                                                                version='".$nextVersion."'
-                                                        WHERE 
-                                                                name = '".$module["name"]."'";
-                                                                
-                                                $queryresult = $db->query($querystatement);
-                                                
-                                                $thereturn.=" - Updated module record with new version \n";
-                                                
-                                                $thereturn.="Update of ".$module["name"]." to ".$nextVersion." Finished\n\n";
-                                
-                                                $ver["version"] = $nextVersion;
-                
-                                                break;
-                                                
-                                        // ================================================================================================
-                                        case "1.01":
-                                                $nextVersion = "1.02";
-                                                
-                                                $thereturn.="Updating ".$module["title"]." Module to ".$nextVersion."\n";
-                        
-                                                //$thereturn.= processSQLfile($db,"updatev1.01.sql");
-        
-                                                //Updating Module Table
-                                                $querystatement="
-                                                        UPDATE 
-                                                                modules 
-                                                        SET 
-                                                                version='".$nextVersion."'
-                                                        WHERE 
-                                                                name = '".$module["name"]."'";
-                                                                
-                                                $queryresult = $db->query($querystatement);
-                                                
-                                                $thereturn.=" - Updated module record with new version \n";
-                                                
-                                                $thereturn.="Update of ".$module["name"]." to ".$nextVersion." Finished\n\n";
-                                
-                                                $ver["version"] = $nextVersion;
-                
-                                                break;
-                                        // ================================================================================================
-                                        case "1.02":
-                                                $nextVersion = "1.03";
-                                                
-                                                $thereturn.="Updating ".$module["title"]." Module to ".$nextVersion."\n";
-                        
-                                                $thereturn.= processSQLfile($db,"updatev1.03.sql");
-        
-                                                //Updating Module Table
-                                                $querystatement="
-                                                        UPDATE 
-                                                                modules 
-                                                        SET 
-                                                                version='".$nextVersion."'
-                                                        WHERE 
-                                                                name = '".$module["name"]."'";
-                                                                
-                                                $queryresult = $db->query($querystatement);
-                                                
-                                                $thereturn.=" - Updated module record with new version \n";
-                                                
-                                                $thereturn.="Update of ".$module["name"]." to ".$nextVersion." Finished\n\n";
-                                
-                                                $ver["version"] = $nextVersion;
-                
-                                                break;
-                                        
-                                }//end switch
-                                
-                        }//end while
-                        
-                } else 
-                        $thereturn = "Cannot update module ".$module["title"].": Module not installed.";
-
-                return $thereturn;
-
-        }//end update           
-
-        //PROCESSING
-        // ===================================================================================================
-        
-        $phpbmsSession = new phpbmsSession;
-        $success = $phpbmsSession->loadDBSettings(false);
-
-        include_once("include/db.php");
-        $db = new db(false);
-        $db->stopOnError = false;
-        $db->showError = false;
-        $db->logError = false;
-
-        if($success !== false){
-                
-                if(!$db->connect())
-                        $thereturn = "Could Not Establish Connection To MySQL Server: Check server, user name, and password.";                  
-                else {
-
-                        if(!$db->selectSchema())
-                                $thereturn = "Database (schema) ".MYSQL_DATABASE." could not be selected";                      
-                        else {
-
-                                $phpbmsSession->db = $db;
-                                $phpbmsSession->loadSettings();
-                                
-                                $thereturn = doUpdate($db);     
-
-                        }//endif
-                        
-                }//end if
-                
-        } else
-                $thereturn = "Could not access settings.php";   
-                                
-                header('Content-Type: text/xml');
-                ?><?php echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>'; ?>
-<response><?php echo $thereturn?></response>
+$theModule = new updateModuleAjax($this->db, $this->phpbmsSession, "recurringinvoices", "../modules/recurringinvoices/install/");
+$theModule->updateVersions = array(
+                                        1.01,
+                                        1.03
+                                );

trunk/phpbms/modules/recurringinvoices/scheduler_recurr.php

@@ -1 +? @@
-<?php 
-
-if(!class_exists("appError"))
-        include_once("../../include/session.php");
+<?php
+//uncomment for debug purposes
+//if(!class_exists("appError"))
+//      include_once("../../include/session.php");
 
 class recurr{
@@ -10 +10 @@
         }
 
-        
+
         function getInvoicesToRepeat($dateToCheck = NULL){
-                if($dateToCheck == NULL) 
+                if($dateToCheck == NULL)
                         $dateToCheck = mktime(0,0,0);
-        
+
                 $invoiceList = array();
-        
+
                 $querystatement = "SELECT invoiceid,invoices.invoicedate, firstrepeat, lastrepeat,
-                                                        recurringinvoices.`type`,`eachlist`,`every`,`ontheday`,`ontheweek` 
+                                                        recurringinvoices.`type`,`eachlist`,`every`,`ontheday`,`ontheweek`
                                                         FROM recurringinvoices INNER JOIN invoices ON recurringinvoices.invoiceid = invoices.id
-                                                        WHERE invoices.invoicedate <= '".dateToString($dateToCheck,"SQL")."' 
+                                                        WHERE invoices.invoicedate <= '".dateToString($dateToCheck,"SQL")."'
                                                         AND (recurringinvoices.until IS NULL OR recurringinvoices.until >= '".dateToString($dateToCheck,"SQL")."')
                                                         AND (recurringinvoices.times IS NULL OR recurringinvoices.times > recurringinvoices.timesrepeated)";
 
                 $queryresult = $this->db->query($querystatement);
-                
+
                 while($therecord = $this->db->fetchArray($queryresult)){
-                        
+
                         if($therecord["lastrepeat"])
                                 $startDate = stringToDate($therecord["lastrepeat"],"SQL");
                         else
                                 $startDate = stringToDate($therecord["invoicedate"],"SQL");
-                        
+
                         $dateArray = $this->getValidInRange($startDate,$dateToCheck,$therecord);
 
                         if( in_array($dateToCheck, $dateArray))
                                 $invoiceList[] = $therecord["invoiceid"];
-                        
+
                 }//end while
-                
+
                 return $invoiceList;
-        
+
         }//end method
 
@@ -50 +50 @@
                 //should pad the end date to make sure we get all weekly repeats
                 $endDate = strtotime("+7 days",$endDate);
-                
+
                 $validDates = array();
-                                
+
                 while($nextDate <= $endDate){
-                                        
+
                         switch($therecord["type"]){
                                 case "Daily":
@@ -61 +61 @@
                                         $nextDate = strtotime("+".$therecord["every"]." days",$nextDate);
                                         break;
-                                        
-                                case "Weekly":                                                                                  
+
+                                case "Weekly":
                                         //==================================================================================
                                         $weekDayArray = explode("::",$therecord["eachlist"]);
@@ -69 +69 @@
                                         $tempDate = strtotime(nl_langinfo( constant("DAY_1") ),$nextDate);
                                         $tempDate = strtotime("-7 days",$tempDate);
-                                        
+
                                         foreach($weekDayArray as $weekday){
                                                 if($weekday == 7)
                                                         $validDates[]=$tempDate;
                                                 else{
-                                                        $weekday++; 
+                                                        $weekday++;
                                                         $validDates[] = strtotime(nl_langinfo( constant("DAY_".$weekday) ),$tempDate);
                                                 }
                                         }// endforeach
-                                                                                                                                                                                
-                                        
+
+
                                         $nextDate = strtotime("+".$therecord["every"]." week",$nextDate);
-                                        
-                                        break;
-                                
+
+                                        break;
+
                                 case "Monthly":
                                         //==================================================================================
-                                        $dateArray = localtime($nextDate,true);                                         
-                                        
+                                        $dateArray = localtime($nextDate,true);
+
                                         if($therecord["eachlist"]){
                                                 $dayArray = explode("::",$therecord["eachlist"]);
-                                                
+
                                                 foreach($dayArray as $theday)
-                                                        $validDates[] = mktime(0,0,0,$dateArray["tm_mon"]+1,$theday,$dateArray["tm_year"]+1900);                                                        
-                                                
+                                                        $validDates[] = mktime(0,0,0,$dateArray["tm_mon"]+1,$theday,$dateArray["tm_year"]+1900);
+
                                         } else{
                                                 // check for things like second tuesday or last friday;
                                                 $tempDate = mktime(0,0,0,$dateArray["tm_mon"]+1,1,$dateArray["tm_year"]+1900);
                                                 $weekday = $therecord["ontheday"];
-                                                $weekday = ($weekday == 7)? 1: ($weekday+1);                                                    
+                                                $weekday = ($weekday == 7)? 1: ($weekday+1);
                                                 if($therecord["ontheday"] != strftime("%u",$tempDate));
                                                         $tempDate = strtotime(nl_langinfo( constant("DAY_".$weekday) ),$tempDate);
-                                                        
+
                                                 while(date("n",$tempDate) == ($dateArray["tm_mon"]+1)){
-                                                
+
                                                         if($therecord["ontheweek"] == 5){
                                                                 // 5 is the "last" option, so we just need to see if
@@ -109 +109 @@
                                                                 if($daysInMonth - date("d",$tempDate) < 7)
                                                                         $validDates[] = $tempDate;
-                                                                        
+
                                                         } else {
                                                                 if( ceil(date("d",$tempDate)/7) == $therecord["ontheweek"])
-                                                                        $validDates[] = $tempDate;                                                                              
+                                                                        $validDates[] = $tempDate;
                                                         }// endif
 
@@ -122 +122 @@
                                         $nextDate = strtotime("+".$therecord["every"]." months",$nextDate);
                                         break;
-                                        
+
                                 case "Yearly":
                                         //==================================================================================
                                         $monthArray = explode("::",$therecord["eachlist"]);
                                         foreach($monthArray as $monthNum){
-                                                $dateArray = localtime($nextDate,true);                                         
+                                                $dateArray = localtime($nextDate,true);
                                                 $daysInMonth = date("d", mktime(0,0,0,$monthNum,0,$dateArray["tm_year"]+1900) );
 
@@ -137 +137 @@
                                                         // check for things like second tuesday or last friday;
                                                         $tempDate = mktime(0,0,0,$monthNum,1,$dateArray["tm_year"]+1900);
-                                                        
+
                                                         $weekday = $therecord["ontheday"];
-                                                        $weekday = ($weekday == 7)? 1: ($weekday+1);                                                    
+                                                        $weekday = ($weekday == 7)? 1: ($weekday+1);
                                                         if($therecord["ontheday"] != strftime("%u",$tempDate));
                                                                 $tempDate = strtotime(nl_langinfo( constant("DAY_".$weekday) ),$tempDate);
-                                                        
-                                                        
+
+
                                                         while(date("n",$tempDate) == $monthNum){
                                                                 if($therecord["ontheweek"] == 5){
@@ -150 +150 @@
                                                                         if($daysInMonth - date("d",$tempDate) < 7)
                                                                                 $validDates[] = $tempDate;
-                                                                                
+
                                                                 } else {
                                                                         if( ceil(date("d",$tempDate)/7) == $therecord["ontheweek"])
-                                                                                $validDates[] = $tempDate;                                                                              
+                                                                                $validDates[] = $tempDate;
                                                                 }// endif
-        
+
                                                                 $tempDate = strtotime("+7 days",$tempDate);
-        
+
                                                         }// endwhile
 
-                                                }//endif                        
+                                                }//endif
 
                                         }//endforeach
@@ -168 +168 @@
                                         break;
                         }//endswitch
-                                                
+
                 }//end while
-                
+
                 return $validDates;
-                
-        }//end method
-        
-        
+
+        }//end method
+
+
         function copyInvoice($invoiceid){
                 $querystatement = "
-                        SELECT 
-                                invoices.*, 
-                                firstrepeat, 
-                                includepaymenttype, 
-                                includepaymentdetails, 
+                        SELECT
+                                invoices.*,
+                                firstrepeat,
+                                includepaymenttype,
+                                includepaymentdetails,
                                 recurringinvoices.id AS recurrid,
-                                recurringinvoices.statusid AS newstatusid, 
+                                recurringinvoices.statusid AS newstatusid,
                                 recurringinvoices.assignedtoid AS newassignedtoid,
                                 notificationroleid
-                        FROM 
+                        FROM
                                 invoices INNER JOIN recurringinvoices ON invoices.id = recurringinvoices.invoiceid
-                        WHERE 
+                        WHERE
                                 invoices.id = ".$invoiceid;
 
                 $queryresult = $this->db->query($querystatement);
-                
+
                 $therecord = $this->db->fetchArray($queryresult);
-                
+
                 $fieldList = array();
                 foreach($therecord as $name=>$value){
@@ -206 +206 @@
                                 case "modifieddate":
                                 case "createdby":
-                                case "creationdate":                            
+                                case "creationdate":
                                 case "newstatusid":
                                 case "newassignedtoid":
@@ -212 +212 @@
                                 case "recurrid":
                                         break;
-                                        
+
                                 case "checkno":
                                 case "webconfirmationno":
@@ -222 +222 @@
                                         $therecord[$name] = NULL;
                                         break;
-                                        
+
                                 case "statusdate":
                                 case "orderdate":
@@ -250 +250 @@
                                         $therecord[$name] = $therecord["newstatusid"];
                                         break;
-                                
+
                                 case "assignedtoid":
                                         $fieldlist[] = $name;
@@ -277 +277 @@
 
                 $insertstatement = $this->prepareInsert("invoices",$fieldlist,$therecord);
-        
+
                 $this->db->query($insertstatement);
-                
+
                 $theid = $this->db->insertId();
-                
+
                 $this->copyLineItems($therecord["id"],$theid);
                 $this->insertHistory($theid,$therecord["statusid"],$therecord["statusdate"],$therecord["assignedtoid"]);
-                
+
                 $this->updateReccurence($therecord["recurrid"],$therecord["firstrepeat"]);
-                
+
                 if($therecord["notificationroleid"])
                         $this->sendNotification($therecord["notificationroleid"],$theid);
-                
-        }//end method
-        
-        
+
+        }//end method
+
+
         function copyLineItems($oldInvoiceID, $newInvoiceID){
-                
+
                 $querystatement = "SELECT * FROM lineitems WHERE invoiceid = ".$oldInvoiceID;
                 $queryresult = $this->db->query($querystatement);
 
                 while($therecord = $this->db->fetchArray($queryresult)){
-                        
+
                         $fieldlist = array();
-                        
+
                         foreach($therecord as $name=>$value){
                                 switch($name){
@@ -308 +308 @@
                                         case "modifieddate":
                                         case "createdby":
-                                        case "creationdate":                            
+                                        case "creationdate":
                                                 break;
-                                                
+
                                         case "invoiceid":
                                                 $therecord[$name] = $newInvoiceID;
-                                                $fieldlist[] = $name;                                   
+                                                $fieldlist[] = $name;
                                                 break;
-                                        
+
                                         default:
-                                                $fieldlist[] = $name;                                   
+                                                $fieldlist[] = $name;
                                 }// endswitch
                         }// endforeach
-                        
+
                         $insertstatement = $this->prepareInsert("lineitems",$fieldlist,$therecord);
-                        
+
                         $this->db->query($insertstatement);
-                        
+
                 }// endwhile
-                
-        }//end method
-        
-        
+
+        }//end method
+
+
         function prepareInsert($tablename, $fieldlist, $therecord){
                 $insertstatement = "INSERT INTO ".$tablename." (";
-                
+
                 foreach($fieldlist as $name)
                         $insertstatement .= "`".$name."`, ";
 
                 $insertstatement .= " createdby,creationdate) VALUES (";
-                
+
                 foreach($fieldlist as $name)
                         if($therecord[$name] !== NULL)
@@ -343 +343 @@
                         else
                                 $insertstatement .= "NULL, ";
-                                
+
                 $insertstatement .="-3, NOW());";
-                
+
                 return $insertstatement;
         }//end method
-        
-        
+
+
         function insertHistory($invoiceid, $statusid, $statusdate, $assignedtoid){
                 $insertstatement = "INSERT INTO invoicestatushistory (invoiceid, invoicestatusid, statusdate, assignedtoid) VALUES (";
@@ -356 +356 @@
                 $insertstatement .= "'".$statusdate."', ";
                 $insertstatement .= $assignedtoid.")";
-                
+
                 $this->db->query($insertstatement);
-                
-        }//end method
-        
-        
+
+        }//end method
+
+
         function updateReccurence($recurrid, $firstrepeat){
                 $updatestatement = "UPDATE recurringinvoices SET timesrepeated = timesrepeated+1, lastrepeat=NOW()";
                 if(!$firstrepeat)
                         $updatestatement .= ", firstrepeat=NOW()";
-                
+
                 $updatestatement .= " WHERE id = ".$recurrid;
-        
+
                 $this->db->query($updatestatement);
-                
+
         }
-        
-        
+
+
         function sendNotification($roleid, $newInvoiceID){
                 if($roleid == -100)
@@ -379 +379 @@
                 else
                         $whereclause = "rolestousers.roleid = ".$roleid;
-                        
+
                 $querystatement = "SELECT email FROM rolestousers INNER JOIN users ON rolestousers.userid = users.id
                                                         WHERE email != '' AND ".$whereclause;
 
                 $queryresult = $this->db->query($querystatement);
-                
+
                 $subject = APPLICATION_NAME." recurring invoice notification.";
                 $message = APPLICATION_NAME." has created a new order from a recurring invoice.  The new order id is ".$newInvoiceID;
@@ -394 +394 @@
                         @ mail ($to,$subject,$message,$headers);
                 }// endwhile
-                
+
         }//end method
 }//end class

trunk/phpbms/modules/sample/install/install.php

@@ -1 +1 @@
 <?php
-/*
- $Rev: 265 $ | $LastChangedBy: brieb $
- $LastChangedDate: 2007-08-13 21:33:23 -0600 (Mon, 13 Aug 2007) $
- +-------------------------------------------------------------------------+
- | Copyright (c) 2004 - 2007, Kreotek LLC                                  |
- | All rights reserved.                                                    |
- +-------------------------------------------------------------------------+
- |                                                                         |
- | Redistribution and use in source and binary forms, with or without      |
- | modification, are permitted provided that the following conditions are  |
- | met:                                                                    |
- |                                                                         |
- | - Redistributions of source code must retain the above copyright        |
- |   notice, this list of conditions and the following disclaimer.         |
- |                                                                         |
- | - Redistributions in binary form must reproduce the above copyright     |
- |   notice, this list of conditions and the following disclaimer in the   |
- |   documentation and/or other materials provided with the distribution.  |
- |                                                                         |
- | - Neither the name of Kreotek LLC nor the names of its contributore may |
- |   be used to endorse or promote products derived from this software     |
- |   without specific prior written permission.                            |
- |                                                                         |
- | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS     |
- | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT       |
- | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A |
- | PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT      |
- | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,   |
- | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT        |
- | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,   |
- | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY   |
- | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT     |
- | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE   |
- | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.    |
- |                                                                         |
- +-------------------------------------------------------------------------+
-*/
-error_reporting(E_ALL);
-define("APP_DEBUG",false);
-define("noStartup",true);
-include("../../../install/install_include.php");
-include("../../../include/session.php");
+// The install proceess is typically simple, but if you have some complex
+// installation procedures not covered by the installModuleAjax (located in the
+// main install/installajax.php file) You can override the class.
+//
+// Just make sure your class has an 'install' method, and spits back JSON paired
+// results
 
-        $phpbmsSession = new phpbmsSession;
-        $success = $phpbmsSession->loadDBSettings(false);
-        include_once("include/db.php");
-        $db = new db(false);
-        $db->stopOnError = false;
-        $db->showError = false;
-        $db->logError = false;
+// Always instanciate the class to the variable $theModule. include the
+// encapsulating objects db and phpbmsSession variables as well
+// as the path form the application to the modules's install folder
+$theModule = new installModuleAjax($this->db, $this->phpbmsSession, "../modules/sample/install/");
 
-        if($success !== false){
-                
-                if(!$db->connect())
-                        $thereturn = "Could Not Establish Connection To MySQL Server: Check server, user name, and password.";                  
-                else {
-                        if(!$db->selectSchema())
-                                $thereturn = "Database (schema) ".MYSQL_DATABASE." could not be selected";                      
-                        else {
+// by default the install class will try to run a createtables.sql file located
+// in the modules install directory.  In addition, it will run individual
+// SQL files that match table name entries in the tables array (defined below)
+// that should also be located in the module's install folder.
+$theModule->tables = array(
+                        "menu",
+                        "modules",
+                        "roles",
+                        "scheduler",
+                        "tabledefs",
+                        "tablecolumns",
+                        "tableoptions",
+                        "tablefindoptions",
+                        "tablesearchablefields",
+                        "tabs",
+                        "users",
+                        );
 
-
-                                // ENTER YOUR MODULE NAME HERE
-                                $thereturn = "Business Management System Installation\n";
-                                $thereturn .= "_______________________________________\n";
-                                
-                                //MAKE SURE THERE IS A createtables.sql FILE
-                                //which houses all your SQL create statements
-                                // for any tables you will create.
-                                $tempreturn = createTables($db,"createtables.sql");
-                                
-                                if($tempreturn === true){
-                                        
-                                        $thereturn.= "Done Creating Tables \n";
-                                        
-                                        
-                                        // NEXT, DEFINE AN ARRAY OF TABLE NAMES
-                                        // for any tables that need initial data populated. (including existing tables)
-                                        // for each table, make sure there
-                                        // is a corresponding SQL file
-                                        // with insert statements for all the records needing to be imported
-                                        $tables = array(
-                                                "choices",
-                                                "menu",
-                                                "tabs",
-                                                "modules",
-                                                "relationships",
-                                                "reports",
-                                                "tablecolumns",
-                                                "tabledefs",
-                                                "tablefindoptions",
-                                                "tableoptions",
-                                                "tablesearchablefields",
-                                                "usersearches",
-                                                "settings",
-                                                "shippingmethods",
-                                                "paymentmethods",               
-                                                "invoicestatuses",              
-                                        );
-                                        foreach($tables as $table){
-                                                
-                                                $failure = false;
-                                                $tempreturn = importData($db,$table);
-                                                $thereturn .= $tempreturn;
-                                                if(!strpos($tempreturn,"complete.") === false){
-                                                        $failed = true;
-                                                }
-                                                
-                                        }//end foreach
-                                        
-                                        
-                                        //MAKE SURE TO set the done message for your module.
-                                        if(!$failure){
-                                                $thereturn .= "________________________\n";                     
-                                                $thereturn .= "Done Installing BMS Data\n";
-                                        }
-                                } else
-                                        $thereturn = $tempreturn;                               
-                        }               
-                }
-        } else
-                $thereturn = "Could not access settings.php";
-                
-                
-                header('Content-Type: text/xml');
-                ?><?php echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>'; ?>
-<response><?php echo $thereturn?></response>
+?>

trunk/phpbms/modules/sample/install/update.php

@@ -1 +1 @@
 <?php
-/*
- $Rev: 265 $ | $LastChangedBy: brieb $
- $LastChangedDate: 2007-08-13 21:33:23 -0600 (Mon, 13 Aug 2007) $
- +-------------------------------------------------------------------------+
- | Copyright (c) 2004 - 2007, Kreotek LLC                                  |
- | All rights reserved.                                                    |
- +-------------------------------------------------------------------------+
- |                                                                         |
- | Redistribution and use in source and binary forms, with or without      |
- | modification, are permitted provided that the following conditions are  |
- | met:                                                                    |
- |                                                                         |
- | - Redistributions of source code must retain the above copyright        |
- |   notice, this list of conditions and the following disclaimer.         |
- |                                                                         |
- | - Redistributions in binary form must reproduce the above copyright     |
- |   notice, this list of conditions and the following disclaimer in the   |
- |   documentation and/or other materials provided with the distribution.  |
- |                                                                         |
- | - Neither the name of Kreotek LLC nor the names of its contributore may |
- |   be used to endorse or promote products derived from this software     |
- |   without specific prior written permission.                            |
- |                                                                         |
- | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS     |
- | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT       |
- | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A |
- | PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT      |
- | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,   |
- | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT        |
- | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,   |
- | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY   |
- | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT     |
- | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE   |
- | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.    |
- |                                                                         |
- +-------------------------------------------------------------------------+
-*/
-error_reporting(E_ALL);
-define("APP_DEBUG",false);
-define("noStartup",true);
+// The update proceess is typically simple, but if you have some complex
+// update procedures (like the BMS module) not covered by the updateModuleAjax
+// (located in the main install/installajax.php file) You can override the class.
+//
+// Just make sure your class has an 'update' method, and spits back JSON paired
+// results
 
-include("../../../install/install_include.php");
-include("../../../include/session.php");
+// Always instanciate the class to the variable $theModule. include the
+// encapsulating objects db and phpbmsSession variables as well
+// as the module name, and the path form the application to the modules's
+// install folder
+$theModule = new updateModuleAjax($this->db, $this->phpbmsSession, "recurringinvoices", "../modules/recurringinvoices/install/");
 
-        function doUpdate($db) {
-                $thereturn="Updating Business Management System Module\n";
-                
-                if(!verifyAdminLogin($db,$_GET["u"],$_GET["p"])){
-                        $thereturn="Update Requires Administrative Access.\n\n";
-                        return $thereturn;
-                }
-                                
-                $newVersion = $_GET["v"];
-                
-                $querystatement="SELECT version FROM modules WHERE name=\"bms\"";
-                $queryresult=$db->query($querystatement);
-                if(!$queryresult) {
-                        $thereturn="Error Accessing module table in database.\n\n";
-                        return $thereturn;
-                }
-                
-                $ver=$db->fetchArray($queryresult);
+// Next define all the updates that are possible.  Each version
+// corresponds to a sql file in the install folder named 'updatev[version].sql'
+// that will be run while updating.
+//
+// List *all* the versions to update. The update process will ONLY run
+// applicable upgrades, ignoring older versions not needed to upgrade.
+$theModule->updateVersions = array(
+                                        1.01,
+                                        1.02,
+                                        1.03
+                                );
 
-                while($ver["version"] != $newVersion){
-                        switch($ver["version"]){
-                                // ================================================================================================
-                                case "0.5":
-                                        $thereturn.="Updating BMS Module to 0.51\n";
-                
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.51\" WHERE name=\"bms\";";
-                                        $queryresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-                                        
-                                        $thereturn.="Update to 0.51 Finished\n\n";
-                        
-                                        $ver["version"]="0.51";
-                                break;
-                                // ================================================================================================
-                                case "0.51":
-                                        $thereturn.="Updating BMS Module to 0.6\n";
-                                                        
-                                        $thereturn.=processSQLfile($db,"updatev0.6.sql");
-                                        
-                                        $thereturn.=importData($db,"choices");
-                                        $thereturn.=importData($db,"menu");
-                                        $thereturn.=importData($db,"reports");
-                                        $thereturn.=importData($db,"tablecolumns");
-                                        $thereturn.=importData($db,"tabledefs");
-                                        $thereturn.=importData($db,"tablefindoptions");
-                                        $thereturn.=importData($db,"tableoptions");
-                                        $thereturn.=importData($db,"tablesearchablefields");
-
-                                        $querystatement="SELECT clients.id,DATE_FORMAT(clients.creationdate,\"%Y-%m-%d\") as creationdate,max(invoices.orderdate) as orderdate
-                                                                        FROM `clients` LEFT JOIN invoices on clients.id=invoices.clientid 
-                                                                        WHERE clients.type=\"client\" GROUP BY clients.id;";
-                                        $queryresult=$db->query($querystatement);
-
-                                        while($therecord=$db->fetchArray($queryresult,$dblink)){
-                                                $querystatement="UPDATE clients set becameclient=\"";
-                                                if($therecord["orderdate"])
-                                                        $querystatement.=$therecord["orderdate"];
-                                                else
-                                                        $querystatement.=$therecord["creationdate"];
-                                                $querystatement.="\" WHERE id=".$therecord["id"];
-                                                $updateresult=$db->query($querystatement);
-                                        }
-                                        $thereturn.=" - set intitial client becamclient field\n";
-                                        
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.6\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.6 Finished\n\n";
-                        
-                                        $ver["version"]="0.6";
-                                break;
-                                // ================================================================================================
-                                case "0.6";
-                                        $thereturn.="Updating BMS Module to 0.601\n";
-
-                                        $querystatement="SELECT invoices.id,tax.percentage FROM invoices INNER JOIN tax on invoices.taxareaid=tax.id";
-                                        $queryresult=$db->query($querystatement);
-                                        
-                                        
-                                        while($therecord=$db->fetchArray($queryresult)){
-                                                $querystatement="UPDATE invoices SET taxpercentage=".$therecord["percentage"]."WHERE id=".$therecord["id"];
-                                                $updateresult=$db->query($querystatement);
-                                        }
-                                        $thereturn.=" - set taxpercentage on invoices\n";
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.601\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-
-                                        $thereturn.="Update to 0.601 Finished\n\n";
-                        
-                                        $ver["version"]="0.601";
-
-                                break;
-                                // ================================================================================================
-                                case "0.601";
-                                        $thereturn.="Updating BMS Module to 0.602\n";
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.602\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.602 Finished\n\n";
-                        
-                                        $ver["version"]="0.602";
-                                // ================================================================================================
-                                case "0.602";
-                                        $thereturn.="Updating BMS Module to 0.61\n";
-
-                                        $thereturn.=processSQLfile($db,"updatev0.61.sql");
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.61\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.61 Finished\n\n";
-                        
-                                        $ver["version"]="0.61";
-                                break;
-                                // ================================================================================================
-                                case "0.61";
-                                        $thereturn.="Updating BMS Module to 0.62\n";
-
-                                        $thereturn.=processSQLfile($db,"updatev0.62.sql");
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.62\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - modified bms record in modules table\n";
-
-                                        $thereturn.="Update to 0.62 Finished\n\n";
-                        
-                                        $ver["version"]="0.62";
-                                break;
-                                // ================================================================================================
-                                case "0.62";
-                                        $thereturn.="Updating BMS Module to 0.7\n";
-                                        
-                                        $thereturn.=processSQLfile($db,"updatev0.70.sql");
-                                        
-                                        //update to new status system
-                                        $result=updateInvoiceStatus($db);
-                                        if($result===true)
-                                                $thereturn.=" - Updated to new invoice status system\n";
-                                        else
-                                                $thereturn.=" - Failed to updated to new invoice status system\n".$result."\n\n";                                       
-                                        
-                                        //Update shipping from invoices
-                                        $result=moveShipping($db);
-                                        if($result===true)
-                                                $thereturn.=" - Created default Shipping Methods\n";
-                                        else
-                                                $thereturn.=" - Failed to create default shipping methods\n".$result."\n\n";
-                                        
-                                        //update payment From invoices
-                                        $result=movePayments($db);
-                                        if($result===true)
-                                                $thereturn.=" - Created default payment methods\n";
-                                        else
-                                                $thereturn.=" - Failed to create default payment Methods\n".$result."\n\n";
-                                        
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.7\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-                                        $thereturn.=" - Updated bms module record with new version\n";
-
-                                        $thereturn.="Update to 0.7 Finished\n\n";
-                        
-                                        $ver["version"]="0.7";
-                                break;
-
-                                // ================================================================================================
-                                case "0.7";
-
-                                        $thereturn.= processSQLfile($db,"updatev0.8.sql");
-
-                                        //Updating Module Table
-                                        $querystatement="UPDATE modules SET version=\"0.8\" WHERE name=\"bms\";";
-                                        $updateresult=$db->query($querystatement);
-
-                                        $thereturn.="Update of Business Management System Module to 0.8 Finished\n\n";
-                                        $ver["version"]="0.8";
-                                break;
-                        }//end switch
-                }//end while
-                return $thereturn;
-
-        }//end update           
-
-        function moveShipping($db){
-                $querystatement="SELECT DISTINCT shippingmethod FROM invoices WHERE shippingmethod!=\"\" ORDER BY shippingmethod";
-                $queryresult=$db->query($querystatement);
-                
-                while($therecord=$db->fetchArray($queryresult)){
-                        $querystatement="INSERT INTO `shippingmethods` (name,createdby,creationdate) VALUES (\"".$therecord["shippingmethod"]."\",1,NOW())";
-                        $updatequery=$db->query($querystatement);
-                }
-
-                $querystatement="SELECT id,name FROM shippingmethods";
-                $queryresult=$db->query($querystatement);
-
-                while($therecord=$db->fetchArray($queryresult)){
-                        $querystatement="UPDATE invoices SET shippingmethodid=".$therecord["id"]."
-                                                        WHERE shippingmethod=\"".$therecord["name"]."\"";
-                        $updatequery=$db->query($querystatement);
-                }
-                $querystatement="ALTER TABLE invoices DROP shippingmethod";
-                $updatequery=$db->query($querystatement);
-                
-                return true;             
-        }
-
-        function movePayments($db){
-                $querystatement="SELECT DISTINCT paymentmethod FROM invoices WHERE paymentmethod!=\"\" ORDER BY paymentmethod";
-                $queryresult=$db->query($querystatement);
-
-                while($therecord=$db->fetchArray($queryresult)){
-                        switch($therecord["paymentmethod"]){
-                                case "VISA":
-                                case "VISA - Debit": 
-                                case "American Express":
-                                case "Master Card":
-                                case "MasterCard":
-                                case "Discover Card":
-                                        $type="\"charge\"";
-                                break;
-                                
-                                case "Personal Check":
-                                case "Check":
-                                case "Cashiers Check":
-                                case "check":
-                                        $type="\"draft\"";
-                                break;                          
-                                
-                                default:
-                                        $type="NULL";
-                                break;
-                        }
-                        
-                        $querystatement="INSERT INTO `paymentmethods` (name,`type`,createdby,creationdate) VALUES (\"".$therecord["paymentmethod"]."\",".$type.",1,NOW())";
-                        $updatequery=$db->query($querystatement);
-                }
-
-                $querystatement="SELECT id,name FROM paymentmethods";
-                $queryresult=$db->query($querystatement);
-                while($therecord=$db->fetchArray($queryresult)){
-                        $querystatement="UPDATE invoices SET paymentmethodid=".$therecord["id"]."
-                                                        WHERE paymentmethod=\"".$therecord["name"]."\"";
-                        $updatequery=$db->query($querystatement);
-                }
-                $querystatement="ALTER TABLE invoices DROP paymentmethod";
-                $updatequery=$db->query($querystatement);
-                
-                return true;
-        }
-
-        function updateInvoiceStatus($db){
-                $querystatement="SELECT id,status,statusdate,orderdate,invoicedate,type FROM invoices";
-                $queryresult=$db->query($querystatement);
-                
-                while($therecord=$db->fetchArray($queryresult)){
-                        $newstatus=1;
-                        switch($therecord["status"]){
-                                case "Open":
-                                        $newstatus=1;
-                                        $statusdate=$therecord["orderdate"];
-                                break;
-                                case "Committed":
-                                        $newstatus=2;
-                                        $statusdate=$therecord["orderdate"];                                    
-                                break;
-                                case "Packed":
-                                        $newstatus=3;
-                                break;
-                                case "Shipped":
-                                        $newstatus=4;
-                                        if($therecord["statusdate"])
-                                                $statusdate=$therecord["statusdate"];
-                                        elseif($therecord["invoicedate"])
-                                                $statusdate=$therecord["invoicedate"];
-                                        else
-                                                $statusdate=$therecord["orderdate"];
-                                break;
-                                if($therecord["type"]=="Invoice")
-                                        $statusdate=$therecord["invoicedate"];
-                        }
-                        $querystatement="UPDATE invoices SET statusid=".$newstatus.", statusdate=\"".$statusdate."\" WHERE id=".$therecord["id"];
-                        $updatequery=$db->query($querystatement);
-
-                        //now create the history
-                        $querystatement="INSERT INTO invoicestatushistory (invoiceid,invoicestatusid,statusdate)VALUES(".$therecord["id"].",".$newstatus.",\"".$statusdate."\")";
-                        $insertquery=$db->query($querystatement);
-                        
-                }
-                $querystatement="ALTER TABLE `invoices` DROP COLUMN `status`";
-                $dropcolumnquery=$db->query($querystatement);
-                
-                return true;
-        }//end funtion
-
-        
-        $phpbmsSession = new phpbmsSession;
-        $success = $phpbmsSession->loadDBSettings(false);
-
-        include_once("include/db.php");
-        $db = new db(false);
-        $db->stopOnError = false;
-        $db->showError = false;
-        $db->logError = false;
-
-        if($success !== false){
-                
-                if(!$db->connect())
-                        $thereturn = "Could Not Establish Connection To MySQL Server: Check server, user name, and password.";                  
-                else {
-                        if(!$db->selectSchema())
-                                $thereturn = "Database (schema) ".MYSQL_DATABASE." could not be selected";                      
-                        else {
-
-                                $phpbmsSession->db = $db;
-                                $phpbmsSession->loadSettings();
-                                
-                                $thereturn=doUpdate($db);       
-
-                        }               
-                }
-        } else
-                $thereturn = "Could not access settings.php";   
-                                
-
-
-                header('Content-Type: text/xml');
-                ?><?php echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>'; ?>
-<response><?php echo $thereturn?></response>
+?>

trunk/phpbms/modules/sample/sampletable_addedit.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev: 258 $ | $LastChangedBy: brieb $
@@ -41 +41 @@
         include("include/tables.php");
         include("include/fields.php");
-        
+
         //if you need to ovveride the phpbmsTable class make sure to include the modules file
         include("modules/[modulename]/include/[tablename].php");
 
 
-        //If the addedit page will be accessd directly from a page other than the 
+        //If the addedit page will be accessd directly from a page other than the
         // basic search results page, you may want to grab and pass the previous URL
         //with the following code
 
         //===================================================
-        if(!isset($_GET["backurl"])) 
-                $backurl = NULL; 
-        else{ 
+        if(!isset($_GET["backurl"]))
+                $backurl = NULL;
+        else{
                 $backurl = $_GET["backurl"];
                 if(isset($_GET["refid"]))
@@ -63 +63 @@
         //Here you invoke the table class.  If you are going to use the standard phpbmsTable class
         // for updates and the such you would access it like this
-        
+
         //              $thetable = new phpbmsTable($db,[table definition id]);
-        
-        //if you are going to overide the class you would instantiate
-        // like this
-        
-        //              $thetable = new [tablename]($db,[table definition id],$backurl);
-        
+
+        // if you are going to overide the class you would instantiate
+        // your overriden class like this
+
+        //              $thetable = new [tablename]($db,[table definition id]);
+
         //and if you are setting the backurl, make sure you pass that as well
         // like this:
         //              $thetable = new [tablename]($db,[table definition id],$backurl);
-        
-        
-        //Next we process the form (if submitted) and 
+
+
+        // Next we process the form (if submitted) and
         // return the current record as an array ($therecord)
         // or if this is a new record, it returns the defaults
@@ -87 +87 @@
 
         $pageTitle = "[tablename]";
-        
+
         // Next, we set up to include any
         // additional css or javascript files we will be using
@@ -93 +93 @@
         // as they are automatically icluded when you define the special fields you
         // will be using below.
-        $phpbms->cssIncludes[] = "pages/[tablename].css";
+        $phpbms->cssIncludes[] = "pages/[modulename]/[tablename].css";
         $phpbms->jsIncludes[] = "modules/[modulename]/javascript/[tablename].js";
 
+        // DEPRECIATED: 
         // if you need to define a body onlload function, do so with the phpbms property
         $phpbms->onload[] = "initializePage()";
@@ -102 +103 @@
         // Next we need to define any special fields that will be used in the form
         // A list of field objects (with documentation)is available in the /include/fields.php
-        // file.  
-        
+        // file.
+
         // We need to define them here in the head
         // so that any necessay javascript is loaded appropriately.
-        
+
                 //Form Elements
                 //==============================================================
-                
+
                 // Create the form
                 $theform = new phpbmsForm();
                 //if you need to set specific form vaiables (like enctype, or extra onsubmit
                 // you can set those form properties here.
-                
-                // for each field we will use, create the field object and add it to 
+
+                // for each field we will use, create the field object and add it to
                 // the forms list.
                 $theinput = new inputDatePicker("orderdate", $therecord["orderdate"], "order date");
                 $theform->addField($theinput);
-        
+
                 $theinput = new inputCheckBox("weborder",$therecord["weborder"],NULL, false, false);
                 $theform->addField($theinput);
@@ -136 +137 @@
                 $theform->jsMerge();
                 //==============================================================
-                //End Form Elements     
+                //End Form Elements
 
-        include("header.php");  
-        
+        include("header.php");
+
 ?><div class="bodyline">
-        <!-- 
+        <!--
                 Next we start the form.  This also prints the H1 with title, and top save,cancel buttons
                 If you need to have other buttons, or need a specific top, you will need to create your form manually.
@@ -151 +152 @@
                 <p>
                         <label for="id">id</label><br />
-                        <input name="id" id="id" type="text" value="<?php echo $therecord["id"]; ?>" size="5" maxlength="5" readonly="readonly" class="uneditable" />           
+                        <input name="id" id="id" type="text" value="<?php echo $therecord["id"]; ?>" size="5" maxlength="5" readonly="readonly" class="uneditable" />
                 </p>
-                <p><?php $theform->showField("inactive");?></p>         
+                <p><?php $theform->showField("inactive");?></p>
         </fieldset>
 
@@ -166 +167 @@
                 </fieldset>
         </div>
-        <?php 
+        <?php
                 //Last, we show the create/modifiy with the bottom save and cancel buttons
                 // and then close the form.

trunk/phpbms/modules/sample/snapshot.php

@@ -40 +40 @@
 /*
 
-        Here you can define and display information from your module that will show up on the snapshot 
-        (default) page.
+        Here you can define and display information from your module that
+        will show up on the snapshot (default) page.
 
 */

trunk/phpbms/requirements.php

@@ -1 +? @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -40 +40 @@
         $loginNoDisplayError=true;;
         require("include/session.php");
-        
+
         $pageTitle = "phpBMS Browser Requirements";
-        
+
         $phpbms->cssIncludes[] = "pages/requirements.css";
-        
+
         $phpbms->showMenu = false;
         $phpbms->showFooter = false;
-        
+
         include("header.php")
-?><div class="bodyline" id="container"> 
-        <div class="box" id="logo" style=""><span>phpBMS</span></div>
+?><div class="bodyline" id="container">
+
         <h1>phpBMS Browser Requirements</h1>
-        <h2 id="cba">Client Browser Aplication</h2>
 
-        <h3>JavaScript v2.0</h3>
-        <p>This application makes heavy use of newer JavaScript functions, including the paradigm known as AJAX. Without Javascript, enabled, phpBMS will not run correctly.</p>
+        <ul>
 
-        <h3>Window pop-ups:</h3>
-        <p>This application utilizes JavaScript to open new windows. If you disable Javascript window opening (like in Firefox or Opera) or are utilizing a 3rd-party application to stop Internet Explorer  from opening unwanted windows, this application might not work correctly.</p>
+                <li>
+                        <h3>Enabled JavaScript v2.0 or higher processing</h3>
+                        <p>
+                                phpBMS heavily uses JavaScript, including newer functions only found in version 2.0 or higher.
+                                Most newer browsers support this, but make sure that JavaScript is enabled for this web application
+                        </p>
+                </li>
 
-        <h3>Cookies</h3>
-        <p>A single cookie is set to identify the user during a session.</p>
+                <li>
+                        <h3>Allow window pop-ups</h3>
+                        <p>
+                                This application sparingly uses JavaScript to open multiple windows when printing.  If your browser
+                                or third-party browser plug in prohibits pop-ups from this application, printing reports will not
+                                be displayed.
+                        </p>
+                </li>
 
-        <h3>Style Sheets (CSS) v1.1</h3>
-        <p>Your browser must support the rendering of Cascading Style Sheets. Without this support, the application will not work correctly.</p>
+                <li>
+                        <h3>Cookie support</h3>
+                        <p>
+                                phpBMS sets a single cookie to track your login.  Cookie suport for this site
+                                must be enabled in order for the application to allow you to log in
+                        </p>
+                </li>
+
+                <li>
+                        <h3>Full Casscading Style Sheet (CSS) v1.2 support</h3>
+                        <p>
+                                phpBMS takes advantage of CSS v1.2 to render pages.  Without this
+                                support, the application may not look correct, and can even break some
+                                functionality.
+                        </p>
+                </li>
+        </ul>
 
         <h2>Tested Browsers</h2>
-        <table border="0" cellpadding="0" cellspacing="0" class="querytable" id="browserTable">
-        <tr>
-                <th class="queryheader" nowrap="nowrap">Browser Application</th>
-                <th class="queryheader">Version</th>
-                <th class="queryheader">Platform(s)</th>
-                <th align="center" class="queryheader">Compatibility</th>
-                </tr>
-        <tr class="row2">
-                <td>Firefox</td>
-                <td>1.5.0.7</td>
-                <td>Windows/Macintosh</td>
-                <td align="center" class="important">X</td>
-                </tr>           
-        <tr class="row1">
-                <td>Internet Explorer</td>
-                <td>6.0.2900.2190</td>
-                <td>Windows</td>
-                <td align="center" class="important">X</td>
-                </tr>
-        <tr class="row2">
-                <td>Opera</td>
-                <td>9.02</td>
-                <td>Windows</td>
-                <td align="center" class="important">X</td>
-                </tr>
-        <tr class="row1">
-                <td>Internet Explorer</td>
-                <td>6.0.2900.2190</td>
-                <td>Windows</td>
-                <td align="center" class="important">X</td>
-                </tr>
-                <tr class="queryfooter"><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-        </table>
+
+        <p>
+                This is a list of tested browsers known to work with the current version of phpBMS.  If you successfully
+                test another browser with this version, please report it on our forums at <a href="http://phpbms.org">http://phpbms.org</a>
+                so we can add it to the list.  Be sure to report the phpBMS version, browser name, browser version, and
+                operating system.
+        </p>
+
+        <ul>
+                <li>Firefox v3.07 for Macintosh</li>
+                <li>Firefox v3.07 for Windows</li>
+                <li>Safari v3.2.1 for Macintosh</li>
+                <li>Internet Explorer v7.0.5730.13 for Windows</li>
+                <li>Opera v9.64 for Windows</li>
+        </ul>
+
         <p align="right">
                 <input type="button" value="Log In" class="Buttons" onclick="document.location='./'" id="loginButton"/>

trunk/phpbms/THANKS.txt

@@ -1 +? @@
-This file will contain all the people who have contributed to phpBMS
-====================================================================
+This file will contain all the people and companies who have contributed to
+phpBMS
+================================================================================
 
  * Hauge Quality Water - http://haguekc.com/
- * Black Tie: Audio, Lighting & Video - http://blacktie.com.mx
+ * Black Tie: Audio, Lighting & Video - http://blacktie.com.mx/
  * Concept Z Performance - http://www.conceptzperformance.com/
+ * Dahl Photography - http://www.dahlphotographers.com/