Changeset 450 for branches

Timestamp:

03/05/09 17:32:04 (3 years ago)

Author:

nate

Message:

• Merged trunk into branch

Location:

branches/nathan

Files:

• common/javascript/smartsearch.js (modified) (25 diffs)
• common/stylesheet/mozilla/base.css (modified) (4 diffs)
• common/stylesheet/mozilla/menu.css (modified) (6 diffs)
• common/stylesheet/mozilla/pages/quickview.css (modified) (2 diffs)
• common/stylesheet/mozilla/pages/snapshot.css (modified) (7 diffs)
• include/fields.php (modified) (42 diffs)
• include/jstransport.php (modified) (1 diff)
• install/install_include.php (modified) (11 diffs)
• modules/base/adminsettings.php (modified) (15 diffs)
• modules/base/include/snapshot_include.php (modified) (2 diffs)
• modules/base/javascript/snapshot.js (modified) (5 diffs)
• modules/base/snapshot.php (modified) (3 diffs)
• modules/bms/clients_credit.php (modified) (6 diffs)
• modules/bms/install/updatev0.96.sql (modified) (1 diff)
• report/report_class.php (modified) (1 diff)
• smartsearch.php (modified) (8 diffs)

branches/nathan/common/javascript/smartsearch.js

@@ -38 +38 @@
 
 smartSearch = {
-        
+
         displayValue: Array(),
-        
+
         triggerLookup: Array(),
 
@@ -48 +48 @@
 
         committedDisplayValue: Array(),
-        
-        changeDisplay: function(e){             
+
+        changeDisplay: function(e){
                 //this sets the time out to do an ajax lookup when they are done typing their search criteria.
-                
+
                 var display = e.src();
                 var ssID = display.id.substr(3);
@@ -57 +57 @@
                 if(!smartSearch.displayValue[ssID])
                         smartSearch.displayValue[ssID] = "";
-                
+
                 var lookupValue = display.value.trim();
-                
+
                 if (lookupValue != smartSearch.displayValue[ssID] && lookupValue != ""){
 
@@ -66 +66 @@
 
                         smartSearch.triggerLookup[ssID] = window.setTimeout("smartSearch.lookup('"+ssID+"')",250);
-                        
+
                 } else {
                         //it's possible they hit the down, up arrow, or the return button
@@ -73 +73 @@
 
                         switch(key){
-                                
+
                                 case 40:
                                         //move highlight down
                                         smartSearch.moveSearchHighlight(ssID, "down");
                                         break;
-                
+
                                 case 38:
                                         //move highlight down
                                         smartSearch.moveSearchHighlight(ssID, "up");
                                         break;
-                                
+
                                 case 27:
                                         //cancel
                                         smartSearch.cancelSearch(null, ssID);
-                                
+
                         }//endswitch
 
                 }//endif
-                
+
         },//end method
 
@@ -98 +98 @@
 
         lookup: function(ssID, offset){
-                
+
                 // We need to do an ajax lookup based on the criteria.
                 // Fisrt we need to see if the holding box is visible.
-                // if not we need to create it          
+                // if not we need to create it
                 if (!smartSearch.searchBox[ssID])
                         smartSearch.createSearchBox(ssID);
-                        
+
 
                 var sbResults = getObjectFromID("SBResults-" + ssID);
@@ -112 +112 @@
                         sbResults.style.height="";
                 }
-                                                
-                var closeButton = getObjectFromID("SBCloseButton-" + ssID);             
+
+                var closeButton = getObjectFromID("SBCloseButton-" + ssID);
                 closeButton.className = "graphicButtons buttonSpinner";
-                
+
                 var searchDisplay = getObjectFromID("ds-" + ssID);
                 smartSearch.displayValue[ssID] = searchDisplay.value;
-                
+
                 var sdbid = getObjectFromID("sdbid-" + ssID);
-                        
+
 
                 var theurl = APP_PATH + "smartsearch.php?sdbid=" + encodeURI(sdbid.value) + "&t=" + encodeURI(searchDisplay.value.trim());
-                
+
                 if(offset != 0)
                         theurl += "&o=" + offset;
-                
+
                 if(!smartSearch.searchResultsConnects[ssID])
                         smartSearch.searchResultsConnects[ssID] = Array();
@@ -144 +144 @@
 
                 var numRecords = response.resultRecords.length
-                
+
                 var totalRecords = response.totalRecords;
 
-                var newText="";         
+                var newText="";
 
                 if(numRecords) {
-                        for(var i=0; i<numRecords; i++){                                
+                        for(var i=0; i<numRecords; i++){
 
                                 newText += '\
@@ -158 +158 @@
                                         </a>';
 
-                                                                
+
                         }//endfor
 
@@ -167 +167 @@
                                 <div id="SBMoreDiv-' + ssID + '">\
                                         <button type="button" id="SBMoreButton-' + ssID +'" class="smallButtons" name="' + (parseInt(offset) + parseInt(numRecords)) + '">more results...</button>\
-                                </div>';                                
+                                </div>';
 
                         }//end if
-                        
+
                 } else {
-                        
+
                         newText = '<div>No Records Found Matching Criteria</div>';
-                        
+
                 }//endif
 
                 if(!offset)
-                        sbResults.innerHTML =  newText; 
+                        sbResults.innerHTML =  newText;
                 else
                         sbResults.innerHTML += newText;
-                
+
                 var searchItems = getElementsByClassName("SBSI-" + ssID);
                 smartSearch.searchResultsConnects[ssID] = Array();
@@ -187 +187 @@
                 for(i=0; i < searchItems.length; i++)
                         smartSearch.searchResultsConnects[ssID][smartSearch.searchResultsConnects[ssID].length] = connect(searchItems[i], "onclick", smartSearch.clickSearchResult);
-                        
+
                 var moreButton = getObjectFromID("SBMoreButton-" + ssID);
                 if(moreButton)
-                        smartSearch.searchResultsConnects[ssID][smartSearch.searchResultsConnects[ssID].length] = connect(moreButton, "onclick", smartSearch.getMoreResults);                   
+                        smartSearch.searchResultsConnects[ssID][smartSearch.searchResultsConnects[ssID].length] = connect(moreButton, "onclick", smartSearch.getMoreResults);
 
                 closeButton.className = "graphicButtons buttonX";
@@ -197 +197 @@
 
         createSearchBox: function(ssID){
-                
+
                 //need to grab search box for reference x and ys
                 var searchdisplay = getObjectFromID("ds-"+ssID);
-                
+
                 if(!smartSearch.searchBoxConnects[ssID])
                         smartSearch.searchBoxConnects[ssID] = Array();
-                
+
                 if(smartSearch.searchBoxConnects[ssID][0])
                         disconnect(smartSearch.searchBoxConnects[ssID][0]);
@@ -227 +227 @@
                 newDiv.innerHTML = '<button type="button" id="SBCloseButton-' + ssID + '" class="SBCloseButton graphicButtons buttonSpinner" tabindex="4000"><span>close</span></button>';
                 smartSearch.searchBox[ssID].appendChild(newDiv)
-                
+
                 newDiv = document.createElement("div");
                 newDiv.id = "SBResults-" + ssID;
@@ -237 +237 @@
                 newDiv.id = "SBFooter";
                 smartSearch.searchBox[ssID].appendChild(newDiv)
-                
+
                 searchdisplay.parentNode.appendChild(smartSearch.searchBox[ssID]);
-                
+
                 var closeButton = getObjectFromID("SBCloseButton-" + ssID);
-                
+
                 smartSearch.searchBoxConnects[ssID][0] = connect(smartSearch.searchBox[ssID],"onmousedown", smartSearch.mouseDownDropDown);
                 smartSearch.searchBoxConnects[ssID][1] = connect(closeButton,"onclick",smartSearch.cancelSearch);
-                
+
         },//end method
 
@@ -253 +253 @@
                 var box = e.src();
                 var ssID = box.id.substr(10)
-                
+
                 smartSearch.inDropDown[ssID] = true;
-                
+
         },//end method - clickDropDown
 
@@ -261 +261 @@
 
         blurIdent: Array(),
-        
+
         blurDisplay: function(e){
 
                 var display = e.src();
-                var ssID = display.id.substr(3);                
+                var ssID = display.id.substr(3);
 
                 if(!smartSearch.inDropDown[ssID])
                         smartSearch.blurIdent[ssID] = window.setTimeout("smartSearch._blurDisplay('" + ssID + "')",200);
-                
+
                 smartSearch.inDropDown[ssID] = false;
-                
-        },//end method
-        
-        
+
+        },//end method
+
+
         _blurDisplay: function(ssID){
 
                 var searchDisplay = getObjectFromID("ds-" + ssID);
-                
+
                 if(smartSearch.searchBox[ssID] || searchDisplay.value != smartSearch.committedDisplayValue[ssID]){
-                        
+
                         var highlight = getElementsByClassName("SBSel-"+ssID);
 
                         if(highlight.length !== 0){
-                                
+
                                 smartSearch.chooseSearchItem(highlight[0])
-                                
+
                         } else {
 
@@ -293 +293 @@
                                 else
                                         smartSearch.blankSearch(ssID);
-                                
+
                         }//end if
-                        
+
                 }//end if
-                
+
                 smartSearch.blurIdent[ssID] = false;
-                                
+
         },//end method
 
 
         blankSearch: function(ssID){
-                
-                var searchDisplay = getObjectFromID("ds-" + ssID);                              
+
+                var searchDisplay = getObjectFromID("ds-" + ssID);
                 var valueField = getObjectFromID(ssID);
-                
+
                 valueField.value = ""
                 smartSearch.displayValue[ssID] = "";
@@ -324 +324 @@
 
         cancelSearch: function(e, ssID){
-                
+
                 if(e){
-                        
+
                         var thebutton = e.src()
                         ssID = thebutton.id.substr(14);
-                        
+
                 }//endif - e
-                
-                var searchDisplay = getObjectFromID("ds-" + ssID);                              
-
-                if(smartSearch.searchBox[ssID])         
+
+                var searchDisplay = getObjectFromID("ds-" + ssID);
+                var freeForm = getObjectFromID("sff-" + ssID);
+
+                if(smartSearch.searchBox[ssID])
                         searchDisplay.parentNode.removeChild(smartSearch.searchBox[ssID]);
-                
-                searchDisplay.value = smartSearch.committedDisplayValue[ssID];
-                smartSearch.displayValue[ssID] = smartSearch.committedDisplayValue[ssID];
+
+                if(freeForm.value == 0){
+
+                        searchDisplay.value = smartSearch.committedDisplayValue[ssID];
+                        smartSearch.displayValue[ssID] = smartSearch.committedDisplayValue[ssID];
+
+                }//end free forming wipes
+
                 smartSearch.searchBox[ssID] = null;
-                
+
                 smartSearch.inDropDown[ssID] = false;
                 //searchDisplay.blur();
@@ -349 +355 @@
 
         clickSearchResult: function(e){
-                
+
                 var theItem = e.src();
                 var classes = theItem.className.split(" ");
                 var ssID = classes[1].substr(5);
-                
+
                 window.clearTimeout(smartSearch.blurIdent[ssID]);
                 smartSearch.blurIdent[ssID] = false;
-                
+
                 smartSearch.chooseSearchItem(theItem);
                 e.stop();
-                
+
         },//end method
 
 
         chooseSearchItem: function(atag){
-                
+
                 var classes = atag.className.split(" ");
                 var ssID = classes[1].substr(5);
-                
+
                 var valueField = getObjectFromID(ssID);
                 var searchDisplay = getObjectFromID("ds-"+ssID);
-                                
+
                 valueField.value = atag.id.substr(3);
-                
+
                 for(var i=0; i< atag.childNodes.length; i++)
                         if(atag.childNodes[i].className)
                                 if(atag.childNodes[i].className == "SBMain")
                                         searchDisplay.value = htmlDecode(atag.childNodes[i].innerHTML);
-                                
+
                 smartSearch.committedDisplayValue[ssID] = searchDisplay.value;
                 smartSearch.displayValue[ssID] = searchDisplay.value;
@@ -383 +389 @@
                 //remove the box
                 searchDisplay.parentNode.removeChild(smartSearch.searchBox[ssID]);
-                
+
                 smartSearch.searchBox[ssID] = null;
-                
+
                 //lastly, if the value field has an onchange we need to trgger it
                 //First we check for legacy on changes
@@ -398 +404 @@
 
         moveSearchHighlight: function(ssID, direction){
-                
+
                 var sbResults = getObjectFromID("SBResults-" + ssID);
                 var currentItem = 0
                 var classes, newClassName
-                
+
                 if(direction=="down")
                         direction = 1;
                 else
                         direction =-1;
-                
+
                 for(var i=0; i < sbResults.childNodes.length; i++){
-                        
+
                         if(sbResults.childNodes[i].className){
                                 if(sbResults.childNodes[i].className.indexOf("SBSelected") !== -1){
@@ -425 +431 @@
                                 }//endif - SBSELECTED
                         }//endif - clasname
-                                                        
+
                 }//endfor
 
                 var newItem = currentItem + direction
-                
+
                 while(newItem >= 0 && newItem < sbResults.childNodes.length){
-                        
+
                         if(sbResults.childNodes[newItem].className){
-                                
+
                                 sbResults.childNodes[newItem].className += " SBSelected SBSel-"+ssID;
                                 newItem = -1000;
-                                
-                        }else 
+
+                        }else
                                 newItem += direction
-                                
+
                 }//endwhile
-                
+
         }, //endif
 
 
         getMoreResults: function(e){
-                
+
                 var button = e.src();
                 var ssID = button.id.substr(13);
@@ -452 +458 @@
                 window.clearTimeout(smartSearch.blurIdent[ssID]);
                 smartSearch.blurIdent[ssID] = false;
-                                
+
                 var thediv = button.parentNode;
-                
+
                 thediv.parentNode.removeChild(thediv);
-                
+
                 var sbResults = getObjectFromID("SBResults-" + ssID);
                 sbResults.style.height = "330px";
-                
-                var offset = button.name 
+
+                var offset = button.name
                 button.id = "invalid-removed";
-                
-                smartSearch.lookup(ssID, offset);       
-                
+
+                smartSearch.lookup(ssID, offset);
+
                 var searchDisplay = getObjectFromID("ds-" + ssID);
                 searchDisplay.focus();
-                
+
         }//end method
-        
+
 }//end struct
 
@@ -475 +481 @@
 /* ------------------------------------------------------- */
 connect(window,"onload",function() {
-                
+
         //grab all smart search boxes
         var smartSearches = getElementsByClassName("inputSmartSearch");
@@ -486 +492 @@
 
                 var ssID = smartSearches[i].id.substr(3);
-                
+
                 smartSearch.displayValue[ssID] = smartSearches[i].value;
                 smartSearch.committedDisplayValue[ssID] = smartSearches[i].value;
 
         }//endfor smartSearches
-        
-                                                                 
+
+
 })

branches/nathan/common/stylesheet/mozilla/base.css

@@ -69 +69 @@
         #MLAddP{float:right;padding-left:0}
         #MLStatus{clear:both;text-align:center}
-        
+
 
 /* ============================================================================== */
@@ -86 +86 @@
         #saveButton1,#saveButton2{width:68px;margin-right:3px;}
         #cancelButton1,#cancelButton2{width:68px;}
-        
+
 /* ============================================================================== */
 /* Smart Searches                                                                 */
@@ -101 +101 @@
         background:white;
         position:absolute;
+        z-index: 90;
 }
 
@@ -149 +150 @@
 .SBHeader{
         background:#EEEEEE;
-        text-align:right;       
+        text-align:right;
         padding:5px;
         height:16px;

branches/nathan/common/stylesheet/mozilla/menu.css

@@ -45 +45 @@
         border-bottom:1px solid #ACB7C4;
         margin:0;
-        padding:0 0 0 5px;      
+        padding:0 0 0 5px;
         height:26px;
 }
@@ -68 +68 @@
 }
 
-#menuBar .firstLevel a:hover, #menuBar a.hovered{ 
-        text-decoration:none; 
+#menuBar .firstLevel a:hover, #menuBar a.hovered{
+        text-decoration:none;
         background-color:#663366;
         color:white;
@@ -82 +82 @@
         margin-top:-1px;
         position:absolute;
+        z-index: 100;
         background-color:white;
         border:1px solid #999999;
@@ -91 +92 @@
         background-image:none;
         margin:0px;
-        display:block; 
+        display:block;
         padding:3px 25px 3px 15px;
         font-size:11px;
@@ -101 +102 @@
 
 #menuBar .submenuitems a:hover{
-        text-decoration:none; 
+        text-decoration:none;
         background-color:#663366;
         color:white;
@@ -116 +117 @@
 #SMText{
         background:url("image/statusmessage.png") 7px 5px no-repeat;
-        color:white; 
-        font-weight:bold; 
+        color:white;
+        font-weight:bold;
         font-size:15px;
         padding: 5px 5px 0px 30px;

branches/nathan/common/stylesheet/mozilla/pages/quickview.css

@@ -63 +63 @@
 
 .RDNames{
-        float:left; 
+        float:left;
         width:100px;
         text-align:right;
@@ -91 +91 @@
 .disabledP{display:none;}
 
-#clientrecord{
-        position:relative;
-        z-index:-1;
-}
 #theDetails{margin-top:15px;}
 #rightSideDiv{float:right;width:300px;margin-top:0;}

branches/nathan/common/stylesheet/mozilla/pages/snapshot.css

@@ -30 +30 @@
 
 h2{
-        margin:3px 0 5px; 
-        padding:0 0 4px; 
+        margin:3px 0 5px;
+        padding:0 0 4px;
         border:0;
         font-size:15px
@@ -40 +40 @@
         cursor:pointer;font-size:13px;background:#EEEEEE url("../image/section-down.png") 99% 3px no-repeat;
         padding:4px;
-        border-bottom:1px solid #BBBBBB;        
+        border-bottom:1px solid #BBBBBB;
 }
 #invoiceBox h3, #clientBox h3, #arBox h3{
@@ -59 +59 @@
 }
 
-.tasksDivs p{
-        margin:0; 
-        padding:4px 4px 4px 8px; 
-        border-bottom:1px solid #EEEEEE; 
-        font-size:11px;
+.tasksDivs div div{
+        clear: both;
+        margin:0;
+        padding:4px 4px 4px 8px;
+        border-bottom:1px solid #EEEEEE;
+        font-size:12px;
 }
 
-.tasksDivs a{font-weight:normal}
+        .tasksDivs div div:hover{
+                background: #EEEEEE;
+        }
 
-.tasksDivs .private a{font-weight:bold}
+        .tasksDivs div div.taskSection{
+                font-weight: bold;
+                border-bottom-color: #999999;
+                padding-top: 16px;
+        }
+
+                .tasksDivs div div.taskSection:hover{
+                        background: #FFF;
+                }
+
+        .taskRight{
+                padding-left: 2px;
+                font-size: 10px;
+                display: block;
+                float: right;
+                text-align: right;
+        }
+
+        .tasksDivs div div p{
+                font-style: italic;
+                font-size: 11px;
+                padding: 2px 20px;
+        }
+
+.tasksDivs a{
+        font-weight:bold;
+}
 
 
-.tasksDivs .complete, .tasksDivs .complete a {
+.tasksDivs .complete a {
         text-decoration:line-through;
         color:#CCCCCC;
@@ -84 +113 @@
 
 #eventsBox #eventsList td{
-        padding:10px 5px; 
-        border-bottom:1px solid #DDDDDD; 
+        padding:10px 5px;
+        border-bottom:1px solid #DDDDDD;
         font-size:11px;
 }
@@ -104 +133 @@
         float:right;
         margin:0;
-        padding:0;      
+        padding:0;
 }
 
@@ -110 +139 @@
         list-style-type:none;
         display:inline;
-        padding:0 4px 0 0;      
+        padding:0 4px 0 0;
         margin:0;
 }
@@ -118 +147 @@
 }
 
-#icalA { 
+#icalA {
         float:left;
         height:16px;

branches/nathan/include/fields.php

@@ -15 +15 @@
  |   notice, this list of conditions and the following disclaimer.         |
  |                                                                         |
- | - Redistributions in binary form must reproduce the above copyright     |            
+ | - 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.  |
@@ -39 +39 @@
 
 class phpbmsForm{
-        
+
         var $jsIncludes = array("common/javascript/fields.js");
         var $topJS = array(
@@ -52 +52 @@
                                  );
         var $bottomJS = array();
-        
+
         var $fields = array();
-        
+
         var $onload = array();
-        
+
         function phpbmsForm($action = NULL, $method="post", $name="record", $onsubmit="return validateForm(this);", $dontSubmit = true){
                 if ($action == NULL)
                         $action = $_SERVER["REQUEST_URI"];
-                        
+
                 $this->action= $action;
                 $this->method = $method;
                 $this->name = $name;
                 $this->onsubmit = $onsubmit;
-                
+
                 $this->dontSubmit = $dontSubmit;
-                
+
         }
 
         function startForm($pageTitle){
 
-                ?><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 
+                ?><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 showSaveCancel(1); ?></div>
-                <h1 id="h1Title"><span><?php echo $pageTitle ?></span></h1><?php        
-                
-        }//end method
-        
-        
+                <h1 id="h1Title"><span><?php echo $pageTitle ?></span></h1><?php
+
+        }//end method
+
+
         function showCreateModify($phpbms, $therecord){
         ?>
@@ -94 +94 @@
                                 <input name="createdby" type="hidden" value="<?php $therecord["createdby"] ?>" />
                                 <input name="creationdate" type="hidden" value="<?php echo formatFromSQLDatetime($therecord["creationdate"]) ?>"/>
-                                created                 
+                                created
                         </td>
                         <td><?php echo htmlQuotes($phpbms->getUserName($therecord["createdby"]))?></td>
@@ -114 +114 @@
         }//end method
 
-        
+
         function endForm(){
                 ?></form><?php
         }
-        
-        
+
+
         function addField($inputObject){
                 if(is_object($inputObject))
                         $this->fields[$inputObject->id] = $inputObject;
         }
-        
-        
+
+
         function showField($fieldname){
                 if(isset($this->fields[$fieldname])){
@@ -138 +138 @@
                         echo "Field Not Defined: ".$fieldname;
         }
-        
-        
-        function jsMerge(){             
+
+
+        function jsMerge(){
                 global $phpbms;
-                
+
                 $phpbms->jsIncludes = array_merge($phpbms->jsIncludes,$this->jsIncludes);
                 $phpbms->topJS = array_merge($this->topJS,$phpbms->topJS);
                 $phpbms->bottomJS = array_merge($this->bottomJS,$phpbms->bottomJS);
                 $phpbms->onload = array_merge($this->onload,$phpbms->onload);
-                
+
                 //next we go through the list of fields
                 foreach($this->fields as $field){
 
                         $toAdd = $field->getJSMods();
-                        
+
                         foreach($toAdd["jsIncludes"] as $jsinclude)
                                 if(!in_array($jsinclude,$phpbms->jsIncludes))
@@ -158 +158 @@
 
                         $phpbms->topJS = array_merge($phpbms->topJS,$toAdd["topJS"]);
-                        $phpbms->bottomJS = array_merge($phpbms->bottomJS,$toAdd["bottomJS"]);                  
-                        $phpbms->onload = array_merge($phpbms->onload,$toAdd["onload"]);                        
+                        $phpbms->bottomJS = array_merge($phpbms->bottomJS,$toAdd["bottomJS"]);
+                        $phpbms->onload = array_merge($phpbms->onload,$toAdd["onload"]);
 
                 }//endforeach
-                
+
         }//end method - jsMerge
 }//end class
@@ -174 +174 @@
 
                 value =                 Value of input
-                displayName =   Name to displayed in label, and on default messages when not overriden 
+                displayName =   Name to displayed in label, and on default messages when not overriden
                 required =              true/false wether the field is validated by javascript before submitting for blank values
                 type =                  Type of field (integer, phone, email, wwww, real, date) to validate against
-           
+
                 size =                  size of the input
                 maxlength               max length of the input
-           
-                displayLabel            (boolean default = true) use this if you want the object to display a label tag above the input 
+
+                displayLabel            (boolean default = true) use this if you want the object to display a label tag above the input
                                                 when displaying
-                                                
+
                                                 ==overridable variables==
-                                                
+
                 message =               message displayed if not validated
                 name =                  if your input needs a name different from the id
-           
+
                                                 == variable setting methods ==
-                                                
+
                 setAttribute($name,$values)
-                                                
+
                                                 Use this method to set an additional HTML property for the input
                                                 e.g. setAttribute("onclick","someJavascriptFunction()")
-                                                
+
                                                 == methods ==
                 getJSMods()
-                
+
                                                 Typically this get called from the form container object, but
                                                 you can use it to get an array of all the Javascript this input affects (include, top JS, and bottom JS)
-                                                
+
                 display()
-                                                
-                                                Use this method to display the input in your page.                              
+
+                                                Use this method to display the input in your page.
         */
 
@@ -210 +210 @@
         var $name;
         var $value;
-        
+
         var $displayName ="";
         var $message = "";
         var $displayLabel = true;
-        
+
         var $_attributes = array();
-        
+
         var $required = false;
         var $type = NULL;
-        
+
         var $jsIncludes = array();
-        
+
         function inputField($id, $value, $displayName = NULL ,$required = false, $type = NULL, $size = 32, $maxlength = 128, $displayLabel = true){
                 $this->id = $id;
@@ -229 +229 @@
                 else
                         $this->displayName = $displayName;
-                        
+
                 if($size)
                         $this->_attributes["size"] = $size;
                 if($maxlength)
                         $this->_attributes["maxlength"] = $maxlength;
-                
+
                 $this->displayLabel = $displayLabel;
-                
+
                 $this->value = $value;
 
@@ -242 +242 @@
                 $this->type = $type;
         }
-        
-        
+
+
         function setAttribute($name,$value){
                 $this->_attributes[strtolower($name)] = $value;
         }
 
-        
+
         function getJSMods(){
                 $thereturn = array("jsIncludes" => array(), "topJS" => array(), "bottomJS" => array(), "onload" => array());
-                
+
                 foreach($this->jsIncludes as $theinclude)
                         $thereturn["jsIncludes"][] = $theinclude;
@@ -261 +261 @@
                         $thereturn["topJS"][] = "requiredArray[requiredArray.length]=new Array(\"".$this->name."\",\"".$message."\");";
                 }
-                
+
                 if($this->type){
-                        $message = $this->message;                      
+                        $message = $this->message;
                         if($message == ""){
                                 switch($this->type){
@@ -286 +286 @@
                                         case "time":
                                                 $message = $this->displayName." must be a valid time.";
-                                        break;                                  
+                                        break;
                                 }
                         }//end if
                         $thereturn["topJS"][] = $this->type."Array[".$this->type."Array.length]=new Array(\"".$this->name."\",\"".$message."\");";
                 }
-                
+
                 return $thereturn;
         }//end if
-        
-        
+
+
         function displayAttributes(){
                 foreach($this->_attributes as $key => $value)
-                        echo " ".$key."=\"".$value."\"";                
-        }
-        
-        
+                        echo " ".$key."=\"".$value."\"";
+        }
+
+
         function showLabel(){
-                ?><label for="<?php echo $this->id?>" <?php 
+                ?><label for="<?php echo $this->id?>" <?php
                         if(isset($this->_attributes["class"]))
                                 if(strpos($this->_attributes["class"],"important") !== false)
@@ -309 +309 @@
                 ?>><?php echo $this->displayName?></label><br /><?php
         }
-        
-        
-        function display(){
-                
-                if($this->displayLabel)
-                        $this->showLabel();
-                
-                ?><input type="text" id="<?php echo $this->id?>" name="<?php echo $this->name?>" <?php 
-                        if($this->value !== "") 
+
+
+        function display(){
+
+                if($this->displayLabel)
+                        $this->showLabel();
+
+                ?><input type="text" id="<?php echo $this->id?>" name="<?php echo $this->name?>" <?php
+                        if($this->value !== "")
                                 echo " value=\"".htmlQuotes($this->value)."\"";
                         $this->displayAttributes();
                 ?> /><?php
-                
+
                 switch($this->type){
                         case "email":
                                 ?><button id="<?php echo $this->id?>Button" type="button" class="graphicButtons buttonEmail" onclick="openEmail('<?php echo $this->id?>')" title="Send E-Mail"><span>send e-mail</span></button><?php
                         break;
-                        
+
                         case "www":
                                 ?><button id="<?php echo $this->id?>Button" type="button" class="graphicButtons buttonWWW" onclick="openWebpage('<?php echo $this->id?>')" title="Visit site in new window"><span>visit site</span></button><?php
                         break;
                 }
-                
+
         }//end method
 }//end class
@@ -344 +344 @@
         */
         function inputCheckbox($id,$value = false, $displayName = NULL, $disabled = false, $displayLabel = true){
-                
+
                 parent::inputField($id, $value, $displayName, false, NULL, NULL, NULL, $displayLabel);
-                
+
                 if($disabled)
-                        $this->_attributes["disabled"] = "disabled";            
-        }//end method
-        
+                        $this->_attributes["disabled"] = "disabled";
+        }//end method
+
         function showLabel(){
                 $classText="";
@@ -363 +363 @@
                 if($classText!="")
                         $classText = ' class="'.$classText.'"';
-                        
+
                 ?><label id="<?php echo $this->id?>Label" for="<?php echo $this->id?>" <?php echo $classText?>><?php echo $this->displayName?></label><?php
         }
@@ -369 +369 @@
 
         function display(){
-                ?><input type="checkbox" id="<?php echo $this->id?>" name="<?php echo $this->name?>" value="1" class="radiochecks" <?php 
+                ?><input type="checkbox" id="<?php echo $this->id?>" name="<?php echo $this->name?>" value="1" class="radiochecks" <?php
                         if($this->value) echo "checked=\"checked\" ";
                         $this->displayAttributes();
-                ?> /> <?php 
-                
+                ?> /> <?php
+
                 if($this->displayLabel)
                         $this->showLabel();
@@ -387 +387 @@
         function inputBasicList ($id,$value = "",$list = array(), $displayName = NULL, $displayLabel = true){
                 parent::inputField($id, $value, $displayName, false, NULL, NULL, NULL, $displayLabel);
-                
+
                 $this->thelist = $list;
         }
-        
-        function display(){
-        
-                if($this->displayLabel)
-                        $this->showLabel();
-        
-                ?><select name="<?php echo $this->name?>" id="<?php echo $this->id?>" <?php 
-                        $this->displayAttributes();             
+
+        function display(){
+
+                if($this->displayLabel)
+                        $this->showLabel();
+
+                ?><select name="<?php echo $this->name?>" id="<?php echo $this->id?>" <?php
+                        $this->displayAttributes();
                 ?> > <?php
                         foreach($this->thelist as $key => $value){
-                                                                                        
+
                                 ?><option value="<?php echo htmlQuotes($value)?>" <?php if ($value == $this->value) echo " selected=\"selected\" "?> ><?php echo $key?></option><?php echo "\n";
 
@@ -421 +421 @@
            hasblank =           boolean, wehterh <none> (0) can be an option
         */
-        
-        function inputDataTableList($db, $id, $value, $table, $valuefield, $displayfield, 
+
+        function inputDataTableList($db, $id, $value, $table, $valuefield, $displayfield,
                                                                 $whereclause = "", $orderclause = "", $hasblank = true, $displayName=NULL, $displayLabel = true){
-                                                                
+
                 parent::inputField($id, $value, $displayName, false, NULL, NULL, NULL, $displayLabel);
-                
+
                 $this->hasblank = $hasblank;
                 $this->db = $db;
@@ -435 +435 @@
                 if($orderclause)
                         $querystatement.=" ORDER BY ".$orderclause;
-                
+
                 $this->queryresult=$this->db->query($querystatement);
 
         }//end method
-        
-        function display(){
-                
-                if($this->displayLabel)
-                        $this->showLabel();
-
-                ?><select name="<?php echo $this->name?>" id="<?php echo $this->id?>" <?php 
+
+        function display(){
+
+                if($this->displayLabel)
+                        $this->showLabel();
+
+                ?><select name="<?php echo $this->name?>" id="<?php echo $this->id?>" <?php
                         $this->displayAttributes();
                 ?> ><?php
@@ -460 +460 @@
                         }
                 ?></select>
-                <?php           
-                
+                <?php
+
         }
 }//end class
@@ -474 +474 @@
         function inputChoiceList($db, $id, $value, $listname, $displayName="", $blankvalue="none", $displayLabel = true){
                 parent::inputField($id, $value, $displayName, false, NULL, NULL, NULL, $displayLabel);
-                
+
                 $this->db = $db;
                 $this->listname = $listname;
                 $this->blankvalue = $blankvalue;
-                
+
                 $querystatement="SELECT thevalue FROM choices WHERE listname=\"".$this->listname."\" ORDER BY thevalue;";
                 $this->queryresult = $this->db->query($querystatement);
-                
+
                 $this->jsIncludes[] = "common/javascript/choicelist.js";
 
@@ -490 +490 @@
                 if($this->displayLabel)
                         $this->showLabel();
-                ?><select name="<?php echo $this->name?>" id="<?php echo $this->id?>" <?php 
+                ?><select name="<?php echo $this->name?>" id="<?php echo $this->id?>" <?php
                         $this->displayAttributes();
                         ?> onchange="changeChoiceList(this,'<?php echo APP_PATH?>','<?php echo $this->listname?>','<?php echo $this->blankvalue?>');"  onfocus="setInitialML(this)">
-                <?php 
+                <?php
                         $inlist=false;
                         while($therecord = $this->db->fetchArray($this->queryresult)){
@@ -520 +520 @@
                                         $theclass="";
                                 }
-                                ?><option value="<?php echo $this->value?>" <?php echo $theclass?> selected="selected"><?php echo $display?></option><?php                                      
+                                ?><option value="<?php echo $this->value?>" <?php echo $theclass?> selected="selected"><?php echo $display?></option><?php
                         }//end if
                 ?>
-        <option value="*mL*" class="choiceListModify">modify list...</option></select><?php 
+        <option value="*mL*" class="choiceListModify">modify list...</option></select><?php
 
         }
@@ -534 +534 @@
 
         function inputCurrency($id, $value, $displayName = NULL ,$required = false, $size = 10, $maxlength = 12, $displayLabel = true){
-        
+
                 $type = NULL;
                 parent::inputField($id, $value, $displayName,$required, $type, $size, $maxlength, $displayLabel);
@@ -547 +547 @@
                 if(!is_numeric($this->value)) $this->value = 0;
                 $this->value = htmlQuotes(numberToCurrency($this->value));
-                
+
                 if(!isset($this->_attributes["onchange"])) $this->_attributes["onchange"] = "";
                 $this->_attributes["onchange"] = "validateCurrency(this);".$this->_attributes["onchange"];
 
-                if(!isset($this->_attributes["class"])) 
+                if(!isset($this->_attributes["class"]))
                         $this->_attributes["class"] = "";
                 else
                         $this->_attributes["class"] = " ".$this->_attributes["class"];
-                
+
                 $this->_attributes["class"] = "currency".$this->_attributes["class"];
 
-                
+
                 ?><input name="<?php echo $this->name?>" id="<?php echo $this->id?>" type="text" value="<?php echo $this->value?>" <?php
                         $this->displayAttributes();
@@ -570 +570 @@
 //============================================================================================
 class inputTextarea extends inputField{
-        
+
         function inputTextarea($id, $value, $displayName = NULL ,$required = false, $rows = 5, $cols= 48, $displayLabel = true){
                 parent::inputField($id, $value, $displayName, $required, NULL, NULL, NULL, $displayLabel);
@@ -578 +578 @@
 
                 $this->_attributes["rows"] = $rows;
-                $this->_attributes["cols"] = $cols;             
-                        
-        }
-        
-
-        function display(){
-
-                if($this->displayLabel)
-                        $this->showLabel();
-                
-                ?><textarea id="<?php echo $this->id?>" name="<?php echo $this->name?>" <?php 
+                $this->_attributes["cols"] = $cols;
+
+        }
+
+
+        function display(){
+
+                if($this->displayLabel)
+                        $this->showLabel();
+
+                ?><textarea id="<?php echo $this->id?>" name="<?php echo $this->name?>" <?php
                         $this->displayAttributes();
                 ?>><?php echo htmlQuotes($this->value)?></textarea><?php
-        
+
         }//end method
 
@@ -603 +603 @@
         */
         function inputPercentage($id, $value, $displayName = NULL , $precision = 1, $required = false, $size = 9, $maxlength = 10, $displayLabel = true){
-                
+
                 $this->precision = (int) $precision;
-                
+
                 $type = NULL;
                 parent::inputField($id, $value, $displayName,$required, $type, $size, $maxlength, $displayLabel);
@@ -613 +613 @@
 
         function display() {
-        
-                if($this->displayLabel)
-                        $this->showLabel();
-
-                if(is_numeric($this->value)) $this->value = $this->value."%";   
-                
+
+                if($this->displayLabel)
+                        $this->showLabel();
+
+                if(is_numeric($this->value)) $this->value = $this->value."%";
+
                 if(!isset($this->_attributes["onchange"])) $this->_attributes["onchange"] = "";
                 $this->_attributes["onchange"] = "validatePercentage(this,".$this->precision.");".$this->_attributes["onchange"];
@@ -636 +636 @@
         function inputDatePicker($id, $value, $displayName = NULL ,$required = false, $size = 10, $maxlength = 15, $displayLabel = true){
                 $type = "date";
-                
+
                 parent::inputField($id, $value, $displayName,$required, $type, $size, $maxlength, $displayLabel);
-                
+
                 $this->jsIncludes[] = "common/javascript/datepicker.js";
         }
-        
+
         function display(){
 
@@ -648 +648 @@
 
                 $value = formatFromSQLDate($this->value);
-                
+
                 if(!isset($this->_attributes["onchange"])) $this->_attributes["onchange"] = "";
                 $this->_attributes["onchange"] = "formatDateField(this);".$this->_attributes["onchange"];
-                
+
                 ?><input name="<?php echo $this->name?>" id="<?php echo $this->id?>" type="text" value="<?php echo $value?>" <?php
                         $this->displayAttributes();
                 ?>/><button id="<?php echo $this->id?>Button" type="button" class="graphicButtons buttonDate" onclick="showDP('<?php echo APP_PATH?>','<?php echo $this->id?>');"><span>pick date</span></button><?php
-                
-        }//end method
-        
+
+        }//end method
+
 }//end class
 
@@ -666 +666 @@
         function inputTimePicker($id, $value, $displayName = NULL ,$required = false, $size = 10, $maxlength = 15, $displayLabel = true){
                 $type = "time";
-                
+
                 parent::inputField($id, $value, $displayName,$required, $type, $size, $maxlength, $displayLabel);
-                                
+
                 $this->jsIncludes[] = "common/javascript/timepicker.js";
         }
@@ -678 +678 @@
 
                 $value = formatFromSQLTime($this->value);
-                                
+
                 ?><input name="<?php echo $this->name?>" id="<?php echo $this->id?>" type="text" value="<?php echo $value?>" <?php
                         $this->displayAttributes();
                 ?>/><button id="<?php echo $this->id?>Button" type="button" class="graphicButtons buttonTime" onclick="showTP('<?php echo APP_PATH?>','<?php echo $this->id?>');"><span>pick time</span></button><?php
-                
-        }//end method
-
-}//end class
-
- 
+
+        }//end method
+
+}//end class
+
+
 //============================================================================================
 class inputRolesList extends inputField{
 
         function inputRolesList($db,$id,$selected,$displayName = NULL, $required = false, $displayLabel = true){
-                                
+
                 parent::inputField($id, $selected, $displayName, $required, NULL, NULL, NULL, $displayLabel);
 
                 $this->db = $db;
-                
+
                 $querystatement = "SELECT name, id FROM roles WHERE inactive = 0";
                 $this->queryresult = $this->db->query($querystatement);
-                        
-        }
-        
-        
-        function display(){
-                if($this->displayLabel)
-                        $this->showLabel();
-                
+
+        }
+
+
+        function display(){
+                if($this->displayLabel)
+                        $this->showLabel();
+
                         ?><select id="<?php echo $this->id?>" name="<?php echo $this->name?>" <?php $this->displayAttributes();?>>
                         <option value="0" <?php if($this->value==0) echo "selected=\"selected\""?>>EVERYONE</option>
                         <?php while($therecord = $this->db->fetchArray($this->queryresult)){ ?>
-                        <option value="<?php echo $therecord["id"]?>" <?php if($this->value==$therecord["id"]) echo "selected=\"selected\""?>><?php echo $therecord["name"]?></option>  
+                        <option value="<?php echo $therecord["id"]?>" <?php if($this->value==$therecord["id"]) echo "selected=\"selected\""?>><?php echo $therecord["name"]?></option>
                         <?php }?>
                         <option value="-100" <?php if($this->value == -100) echo "selected=\"selected\""?>>Administrators</option>
@@ -716 +716 @@
 
         }
-        
+
 }//end class
 
@@ -732 +732 @@
                 maxlength =             (int)           max length attribute for displayed input tag (255)
                 displayLabel    (boolean)       Show label tag with displayName (true)
-                
-                The JS used by this field type requires that the field NOT be implemented inside a p tag,  
-                inline element, or any tag that should not contain a div tag.  In IE, if the field placed 
-                inside an element that should not be able to handle a DIV tag inside it (standards-wise), 
+
+                The JS used by this field type requires that the field NOT be implemented inside a p tag,
+                inline element, or any tag that should not contain a div tag.  In IE, if the field placed
+                inside an element that should not be able to handle a DIV tag inside it (standards-wise),
                 IE will report a Javascript error.
 */
-        function inputSmartSearch($db, $id, $searchName, $initialvalue = "", $displayName = NULL, $required=false, 
-                                                                                $size = 32, $maxlength = 255, $displayLabel = true)  {
+        function inputSmartSearch($db, $id, $searchName, $initialvalue = "", $displayName = NULL, $required=false,
+                                        $size = 32, $maxlength = 255, $displayLabel = true, $allowFreeForm = false)  {
                 $this->db = $db;
-                
+
                 parent::inputField($id, $initialvalue, $displayName,$required, NULL, $size, $maxlength, $displayLabel);
 
                 $this->searchName = $searchName;
+                $this->allowFreeForm = $allowFreeForm;
+
 
                 //next I need to initialize and do the correct search
                 $this->searchInfo = $this->getSearchInfo($searchName);
-                
+
                 $this->displayValue = $this->getInitialDisplay();
 
@@ -755 +757 @@
 
         function getSearchInfo($searchInfo){
-        
+
                 $querystatement = "
                         SELECT
@@ -764 +766 @@
                                 name = '".mysql_real_escape_string($searchInfo)."'
                 ";
-                
+
                 return  $this->db->fetchArray($this->db->query($querystatement));
 
         }//end method getInfo
-        
+
         function getInitialDisplay(){
-        
+
                 $querystatement = "
                         SELECT
@@ -779 +781 @@
                                 ".$this->searchInfo["valuefield"]." = '".mysql_real_escape_string($this->value)."'
                 ";
-                
+
                 $queryresult = $this->db->query($querystatement);
 
@@ -786 +788 @@
                         $therecord = $this->db->fetchArray($queryresult);
                         return $therecord["display"];
-                        
+
                 } else
                         return '';
-        
+
         }//end method getInitialDisplay
 
@@ -795 +797 @@
         // CLASS OVERIDES ================================================
         function getJSMods(){
-        
+
                 $thereturn = array("jsIncludes" => array(), "topJS" => array(), "bottomJS" => array(), "onload" => array());
-                
+
                 $thereturn["jsIncludes"][] = "common/javascript/smartsearch.js";
 
                 if($this->required){
-                
+
                         $message = $this->message;
-                        
+
                         if($message == "")
                                 $message = $this->displayName." cannot be blank.";
                         $thereturn["topJS"][] = "requiredArray[requiredArray.length]= [ '".$this->name."','".$message."' ];";
-                        
+
                 }//endif - required
-                
+
                 return $thereturn;
-                                
+
         }//end method - getJSMods
-        
+
 
         function showLabel(){
@@ -819 +821 @@
         }//end method
 
-        
-        function display(){
-        
-                if($this->displayLabel)
-                        $this->showLabel();
-
-                if(!isset($this->_attributes["class"])) 
+
+        function display(){
+
+                if($this->displayLabel)
+                        $this->showLabel();
+
+                if(!isset($this->_attributes["class"]))
                         $this->_attributes["class"] = "";
                 else
                         $this->_attributes["class"] = " ".$this->_attributes["class"];
-                
+
                 $this->_attributes["class"] = "inputSmartSearch".$this->_attributes["class"];
 
                 ?><input type="hidden" name="<?php echo $this->id?>" id="<?php echo $this->id?>" value="<?php echo $this->value?>" />
+                <input type="hidden" id="sff-<?php echo $this->id?>" value="<?php echo ((int) $this->allowFreeForm); ?>"/>
                 <input type="hidden" id="sdbid-<?php echo $this->id?>" value="<?php echo $this->searchInfo["id"]?>"/>
-                <input type="text" name="ds-<?php echo $this->id?>" id="ds-<?php echo $this->id?>"  title="Use % for wildcard searches." <?php 
-                        
+                <input type="text" name="ds-<?php echo $this->id?>" id="ds-<?php echo $this->id?>"  title="Use % for wildcard searches." <?php
+
                 $this->displayAttributes();
-                
-                ?> value="<?php echo htmlQuotes($this->displayValue) ?>"/><?php 
+
+                ?> value="<?php echo htmlQuotes($this->displayValue) ?>"/><?php
 
         }//end method -display
-                
+
 }//end class - inputSmartSearch
 ?>

branches/nathan/include/jstransport.php

@@ -40 +40 @@
 
         ?>LOGIN_REFRESH=<?php echo LOGIN_REFRESH?>;<?php
-
+        
+        if(defined("TERM1_DAYS")){
         ?>TERM1_DAYS=<?php echo TERM1_DAYS?>;<?php
+        }//end if
         
         ?>MONTH_NAMES_LONG= [ <?php 

branches/nathan/install/install_include.php

@@ -2 +2 @@
 function processSQLfile($db,$filename){
         global $dblink;
-                        
+
         $thefile = @ fopen($filename,"r");
-        if(!$thefile) 
+        if(!$thefile)
                 return "Could not open the file ".$filename.".\n";
 
@@ -29 +29 @@
         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;
@@ -44 +44 @@
 
         $ver=$db->fetchArray($queryresult);
-        return $ver["version"];                 
+        return $ver["version"];
 }
 
@@ -52 +52 @@
 
         $thedir= @ opendir("../modules/");
-        
+
         echo 'modules = Array();'."\n";
-        
+
         $modules = array();
         while($entry=readdir($thedir)){
@@ -60 +60 @@
                         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)){
@@ -70 +70 @@
                                 echo 'modules["'.$name.'"]["'.$key.'"] = "'.$value.'";'."\n";
                 }
-        
+
         @ chdir ($currdirectory);
-        
+
         return $modules;
 }//end function
 
-        
+
 function showModules($modules){
         if(is_array($modules)){
@@ -92 +92 @@
         $sqlstatement="";
         $thereturn = "";
-        
+
         $createfile = @ fopen("createtables.sql","r");
-        if(!$createfile) 
-                return "Could not open SQL file: ".sqlfile;
+        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)); 
-                                
+
+                                $theresult = $db->query(trim($sqlstatement));
+
                                 if($db->error){
                                         return "Error creating tables: ".$db->error."\n\n".trim($sqlstatement);
@@ -109 +109 @@
                         }//end if;
                 }//end while
-                
-        }//end if       
+
+        }//end if
 
         return true;
@@ -117 +117 @@
 
 function importData($db,$tablename){
-        
+
         $tablefile = @ fopen($tablename.".sql","rb");
-        if(!$tablefile) 
+        if(!$tablefile)
                 return "Could not open the file ".$tablename.".sql\n";
 
@@ -125 +125 @@
         $counter=0;
         $failure = false;
-        
+
         while(!feof($tablefile)) {
                 $sqlstatement=trim(fgets($tablefile,8184));
@@ -142 +142 @@
                 }//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

branches/nathan/modules/base/adminsettings.php

@@ -1 @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -52 +52 @@
         goURL(APP_PATH."noaccess.php");
 
-if (isset($_POST["command"])) 
+if (isset($_POST["command"]))
         $statusmessage = $settings->processForm($_POST);
 
@@ -71 +71 @@
         $theform = new phpbmsForm();
         $theform->enctype="multiform/form-data";
-        
+
         $theinput = new inputField("application_name",$therecord["application_name"],"application name",true);
         $theform->addField($theinput);
@@ -77 +77 @@
         $theinput = new inputField("record_limit",$therecord["record_limit"],"record display limit",true,"integer",5,3);
         $theform->addField($theinput);
-                
+
         $theinput = new inputField("default_load_page",$therecord["default_load_page"],"default page",true);
         $theform->addField($theinput);
-        
+
         $theinput = new inputField("encryption_seed",$therecord["encryption_seed"],"encryption_seed",true);
         $theinput->setAttribute("readonly","readonly");
-        $theinput->setAttribute("class","uneditable");  
+        $theinput->setAttribute("class","uneditable");
         $theform->addField($theinput);
 
@@ -108 +108 @@
         foreach($phpbms->modules as $module => $moduleinfo)
                 if($module != "base" && class_exists($module."Display")){
-                
+
                         $class = $module."Display";
                         $theform->extraModules[$module] = new $class();
@@ -116 +116 @@
                         foreach($additionalFields as $field)
                                 $theform->addField($field);
-                }                       
-        
+                }
+
 
         $theform->jsMerge();
         //==============================================================
         //End Form Elements
-                
+
         include("header.php");
 ?>
 <div class="bodyline">
         <form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" enctype="multipart/form-data" name="record" onsubmit="return processForm(this);">
-                
+
         <h1 id="h1Title"><span><?php echo $pageTitle ?></span></h1>
-        
+
         <div id="phpbmsSplash" class="box">
                 <div id="phpbmslogo">
@@ -139 +139 @@
                 </div>
         </div>
-        
+
         <fieldset>
                 <legend>general</legend>
-                
-                <p>             
+
+                <p>
                         <?php $theform->fields["application_name"]->display();?><br />
                         <span class="notes">
@@ -154 +154 @@
                         <?php $theform->fields["record_limit"]->display();?>
                 </p>
-                
+
                 <p>
                         <?php $theform->fields["default_load_page"]->display();?>
@@ -163 +163 @@
                         <select id="stylesheet" name="stylesheet">
                                 <?php $settings->displayStylesheets($therecord["stylesheet"]);?>
-                        </select>               
-                </p>            
+                        </select>
+                </p>
         </fieldset>
         <p class="updateButtonP"><input name="command" type="submit" class="Buttons" value="update settings" /></p>
-                        
+
         <fieldset>
                 <legend>company</legend>
-                <p>             
+                <p>
                         <label for="company_name">company name</label><br />
                         <input id="company_name" name="company_name" type="text" size="40" maxlength="128" value="<?php echo htmlQuotes($therecord["company_name"]) ?>" />
@@ -179 +179 @@
                         <input id="company_address" name="company_address" type="text" value="<?php echo htmlQuotes($therecord["company_address"]) ?>" size="40" maxlength="128" />
                 </p>
-                
+
                 <p>
                         <label for="company_csz">city, state/province and zip/postal code</label><br />
                         <input id="company_csz" name="company_csz" type="text" size="40" maxlength="128"  value="<?php echo htmlQuotes($therecord["company_csz"]) ?>" />
                 </p>
-                
+
                 <p>
                         <label for="company_phone">phone number</label><br />
                         <input id="company_phone" name="company_phone" type="text" value="<?php echo htmlQuotes($therecord["company_phone"]) ?>" size="40" maxlength="128" />
                 </p>
-        
-                <p>
+
+                <?php if(isset($therecord["company_taxid"])){?>
+                <p>
                         <label for="company_taxid">company tax id</label><br />
                         <input id="company_taxid" name="company_taxid" type="text" value="<?php echo htmlQuotes($therecord["company_taxid"]) ?>" size="40" maxlength="128" />
                 </p>
+                <?php }//endif - tax id?>
 
                 <div class="fauxP">
@@ -199 +201 @@
                         <div id="graphicHolder"><img alt="logo" src="<?php echo APP_PATH?>dbgraphic.php?t=files&amp;f=file&amp;mf=type&amp;r=1" /></div>
                 </div>
-                
+
                 <p>
                         <label for="printedlogo">upload new logo file</label> <span class="notes">(PNG or JPEG format)</span><br />
                         <input id="printedlogo" name="printedlogo" type="file" size="64" /><br />
                 </p>
-                
+
                 <p class="notes">
                         <strong>Note:</strong> This graphic is used on some reports. <br />
@@ -213 +215 @@
         </fieldset>
         <p class="updateButtonP"><input name="command" type="submit" class="Buttons" value="update settings" /></p>
-                
+
         <fieldset>
                 <legend>Localization</legend>
@@ -256 +258 @@
         </fieldset>
         <p class="updateButtonP"><input name="command" type="submit" class="Buttons" value="update settings" /></p>
-        
+
         <fieldset>
                 <legend>encryption seed</legend>
@@ -271 +273 @@
                 </p>
 
-                <p>     
+                <p>
                         <?php $theform->fields["encryption_seed"]->display();?>
                 </p>
@@ -295 +297 @@
                 <p class="notes"><strong>Note:</strong> Does not work with Microsoft Internet Explorer versions less than 7.
                 </p>
-        </fieldset>     
+        </fieldset>
         <p class="updateButtonP"><input name="command" type="submit" class="Buttons" value="update settings" /></p>
-        
-        <?php   
+
+        <?php
         foreach($theform->extraModules as $module)
                 if(method_exists($module,"display")){

branches/nathan/modules/base/include/snapshot_include.php

@@ -1 @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-function showSystemMessages($db){
-        $querystatement="SELECT notes.id,subject,content,concat(users.firstname,\" \",users.lastname) as createdby,
-                                        notes.creationdate
-                                        FROM notes INNER JOIN users ON notes.createdby=users.id
-                                        WHERE type=\"SM\" ORDER BY importance DESC,notes.creationdate";
-                                        
-        $queryresult=$db->query($querystatement);
-                
-        if($db->numRows($queryresult)){ 
-        ?>
-        <div class="box" id="systemMessageContainer">   
-                <h2>System Messages</h2>
-                <?php while($therecord=$db->fetchArray($queryresult)) {
-                                $therecord["content"]=str_replace("\n","<br />",htmlQuotes($therecord["content"]));
+class baseSnapshot{
+
+        function baseSnapshot($db, $phpbms, $userid){
+
+                $this->db = $db;
+                $this->phpbms = $phpbms;
+                $this->userid = $userid;
+
+        }//endmethod (init)
+
+
+        function showSystemMessages(){
+
+                $querystatement = "
+                        SELECT
+                                notes.id,
+                                notes.subject,
+                                notes.content,
+                                concat(users.firstname,' ',users.lastname) AS createdby,
+                                notes.creationdate
+                        FROM
+                                notes INNER JOIN users ON notes.createdby=users.id
+                        WHERE
+                                type='SM'
+                        ORDER BY
+                                importance DESC,
+                                notes.creationdate";
+
+                $queryresult = $this->db->query($querystatement);
+
+                if($this->db->numRows($queryresult)){ ?>
+
+                <div class="box" id="systemMessageContainer">
+                        <h2>System Messages</h2>
+                        <?php while($therecord = $this->db->fetchArray($queryresult)) {
+
+                                        $therecord["content"] = str_replace("\n","<br />",htmlQuotes($therecord["content"]));
+
+                        ?>
+                        <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>
+                        <?php }//end while ?>
+                </div>
+                <?php }//endif
+
+        }//end method showSystemMessages
+
+
+        function showTasks($type){
+
+                $querystatement="
+                        SELECT
+                                id,
+                                type,
+                                subject,
+                                completed,
+                                if(enddate < CURDATE(),1,0) AS ispastdue,
+                                if(assignedtodate < CURDATE(),1,0) AS ispastassigneddate,
+                                startdate,
+                                enddate,
+                                assignedtodate,
+                                private,
+                                assignedbyid,
+                                assignedtoid,
+                                IF(assignedtodate IS NOT NULL, assignedtodate, IF((enddate IS NOT NULL && type = 'TS'), enddate, IF((startdate IS NOT NULL && type = 'EV'), startdate, CURDATE()))) AS xdate
+                        FROM
+                                notes
+                        WHERE";
+
+                switch($type){
+
+                        case "ReceivedAssignments":
+
+                                $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())
+                                        )";
+
+                                $title = "Assignments";
+                                $id = "AS";
+                                break;
+
+                        case "GivenAssignments":
+
+                                $querystatement.="
+                                        assignedbyid = ".$this->userid."
+                                        AND (completed = 0
+                                                OR (completed = 1 AND completeddate >= CURDATE())
+                                        )";
+
+                                $title = "Delegations";
+                                $id = "DG";
+                                break;
+
+                }//endswitch
+
+
+                $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))
+                                   )";
+
+                $querystatement.=" ORDER BY
+                                importance DESC,
+                                xdate,
+                                subject";
+
+
+                $queryresult = $this->db->query($querystatement);
+
+                $numRows = $this->db->numRows($queryresult);
                 ?>
-                <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>                                          
-                <?php }//end while ?>
-        </div>
-        <?php } 
-}
-
-
-function showTasks($db,$userid,$type="Tasks"){
-
-        global $phpbms;
-
-        $querystatement="SELECT id,type,subject, completed, if(enddate < CURDATE(),1,0) as ispastdue, startdate, enddate, private, assignedbyid, assignedtoid
-                                FROM notes
-                                WHERE ";
-        switch($type){
-                case "Tasks":
-                        $querystatement.=" type=\"TS\" AND (private=0 or (private=1 and createdby=".$userid.")) 
-                                                           AND (completed=0 or (completed=1 and completeddate=CURDATE()))
-                                                           AND (assignedtoid is null or assignedtoid=0)";
-                        $title="Tasks";
-                        $id = "TS";
-                        break;
-                
-                case "ReceivedAssignments":
-                        $querystatement.=" assignedtoid=".$userid." AND (completed=0 or (completed=1 and completeddate=CURDATE()))";
-                        $title="Assignments";
-                        $id = "AS";
-                        break;
-                
-                case "GivenAssignments":
-                        $querystatement.=" assignedbyid=".$userid." AND (completed=0 or (completed=1 and completeddate=CURDATE()))";
-                        $title="Delegations";
-                        $id = "DG";
-                break;
-        }
-        $querystatement.="AND (
-                                        (startdate is null AND enddate is null) OR
-                                        (startdate is not null AND startdate <= DATE_ADD(CURDATE(),INTERVAL 7 DAY)) OR
-                                        (enddate is not null AND enddate <= DATE_ADD(CURDATE(),INTERVAL 7 DAY)) 
-                                   )";
-
-        $querystatement.=" ORDER BY importance DESC,notes.enddate,notes.endtime,notes.startdate DESC,notes.starttime DESC,notes.creationdate DESC";
-
-
-        $queryresult=$db->query($querystatement);
-        
-        ?>
-        <h3 class="tasksLinks"><?php echo $title; if($db->numRows($queryresult)) {?> <span class="small">(<?php echo $db->numRows($queryresult)?>)</span><?php } ?></h3>
-        <div class="tasksDivs"><div>
-        <?php
-        
-        if($db->numRows($queryresult)){         
-                while($therecord=$db->fetchArray($queryresult)) {
-
-                $className="tasks";
-
-                if($therecord["completed"]) 
-                        $className.=" complete";
-                else if($therecord["ispastdue"]) 
-                        $className.=" pastDue";
-
-                if($therecord["private"]) $className.=" private";
-        
-                $className.=" ".$therecord["type"];
-                
-                $checkBoxID = $id.$therecord["type"]."C".$therecord["id"];
-        ?>
-        <p id="<?php echo $id.$therecord["id"]?>" class="<?php echo $className?>">
-                <input class="radiochecks taskChecks" id="<?php  echo $checkBoxID?>" name="<?php  echo $checkBoxID?>" type="checkbox" value="1" <?php if($therecord["completed"]) echo 'checked="checked"'?>  align="middle" />
-                <a href="<?php echo getAddEditFile($db,12)."?id=".$therecord["id"]?>&amp;backurl=snapshot.php"><?php echo htmlQuotes($therecord["subject"])?></a>
-                <?php 
-                        if($type == "Tasks") {
-                                if($therecord["enddate"]) {
-                                ?><em >(<?php echo htmlQuotes(formatFromSQLDate($therecord["enddate"])) ?>)</em><?php 
-                                }
-                        } else {
-                                ?> <em>(<?php if($type=="ReceivedAssignments") $tid=$therecord["assignedbyid"]; else $tid=$therecord["assignedtoid"]; echo htmlQuotes($phpbms->getUserName($tid))?>)</em><?php 
-                        } ?>
-        </p>
-        <?php } } else {
-        ?><p class="small disabledtext">no <?php echo strtolower($title)?></p><?php
-        }?></div></div> <?php 
-}
-
+
+                <h3 class="tasksLinks"><?php echo $title; if($numRows) {?> <span class="small">(<?php echo $numRows?>)</span><?php } ?></h3>
+
+                <div class="tasksDivs">
+                        <div>
+
+                        <?php if($numRows){
+
+                                $linkStart = getAddEditFile($this->db,12);
+                                $section["title"] = "Now";
+                                $section["date"] = mktime(0,0,0,date("m"),date("d")+3,date("Y"));;
+
+                                while($therecord = $this->db->fetchArray($queryresult)) {
+
+                                        $className="tasks";
+
+                                        if($therecord["completed"])
+                                                $className.=" complete";
+                                        else if($therecord["ispastdue"] || $therecord["ispastassigneddate"])
+                                                $className.=" pastDue";
+
+                                        if($therecord["private"]) $className.=" private";
+
+                                        $className.=" ".$therecord["type"];
+
+                                        $checkBoxID = $id.$therecord["type"]."C".$therecord["id"];
+
+                                        $link = $linkStart."?id=".$therecord["id"]."&amp;backurl=snapshot.php";
+
+                                        $rightSide = "";
+
+                                        if($therecord["assignedtodate"])
+                                                $rightSide .= "FUP: ".formatFromSQLDate($therecord["assignedtodate"])."<br />";
+
+                                        switch($therecord["type"] ){
+
+                                                case "TS":
+                                                        if($therecord["enddate"])
+                                                                $rightSide .= "Due: ".formatFromSQLDate($therecord["enddate"])."<br />";
+                                                        break;
+
+                                                case "EV":
+                                                        $rightSide .= "Start: ".formatFromSQLDate($therecord["startdate"])."<br />";
+                                                        $rightSide .= "End: ".formatFromSQLDate($therecord["enddate"])."<br />";
+                                                        break;
+
+                                        }//endswitch
+
+                                        if(!$rightSide)
+                                                $rightSide = "&nbsp;";
+
+                                        $bottomInfo = "";
+
+                                        switch($type){
+
+                                                case "ReceivedAssignments":
+                                                        if($therecord["assignedbyid"])
+                                                                $bottomInfo = "Assigned By: ".htmlQuotes($this->phpbms->getUserName($therecord["assignedbyid"]));
+                                                        break;
+
+                                                case "GivenAssignments":
+                                                        $bottomInfo = "Assigned To: ".htmlQuotes($this->phpbms->getUserName($therecord["assignedtoid"]));
+                                                        break;
+
+                                        }//endswitch
+
+                                        // Looking for grouping changes in headers (3 days, 4-7 days, > 7 days)
+                                        $xdate = stringToDate($therecord["xdate"],"SQL") ;
+                                        if($xdate > $section["date"]){
+
+                                                while($xdate > $section["date"]){
+
+                                                        switch($section["title"]){
+
+                                                                case "Now":
+                                                                        $section["title"] = "Soon";
+                                                                        $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"));;
+                                                                        break;
+
+                                                        }//end switch
+
+                                                }//endwhile
+
+                                                ?><div class="taskSection"><?php echo $section["title"] ?></div><?php
+
+                                        }//end if
+
+                                        ?>
+
+                                        <div id="<?php echo $id.$therecord["id"]?>" class="<?php echo $className?>">
+
+                                                <span class="taskRight"><?php echo $rightSide ?></span>
+
+                                                <input class="radiochecks taskChecks" id="<?php  echo $checkBoxID?>" name="<?php  echo $checkBoxID?>" type="checkbox" value="1" <?php if($therecord["completed"]) echo 'checked="checked"'?>  align="middle" />
+
+                                                <a href="<?php echo $link?>"><?php echo htmlQuotes($therecord["subject"])?></a>
+
+                                                <?php if($bottomInfo){ ?>
+
+                                                        <p><?php echo $bottomInfo ?></p>
+
+                                                <? }//endif ?>
+                                        </div>
+
+                                <?php }//endwhile
+                                } else { ?>
+                                        <p class="small disabledtext">no <?php echo strtolower($title)?></p><?php
+                                }?>
+                        </div>
+                </div> <?php
+
+        }//end method showTasks
+
+
+}// end class baseSnapshot
 
 ?>
-

branches/nathan/modules/base/javascript/snapshot.js

@@ -38 +38 @@
 
 theEvent = {
-        
+
         idents: Array(),
-        
+
         getWeek: function(e){
-                
+
                 var eventDate;
 
                 if(e){
                         var srcObj = e.src();
-                        
+
                         for(var i=0; i<theEvent.idents.length; i++)
                                 disconnect(theEvent.idents[i]);
-                                        
+
                         switch(srcObj.id) {
-        
+
                                 case "eventLastWeek":
                                         eventDate = getObjectFromID("eventDateLast").value;
                                         break;
-                                        
+
                                 case "eventToday":
                                         eventDate = getObjectFromID("eventDateToday").value;
                                         break;
-                                        
+
                                 case "eventNextWeek":
                                         eventDate = getObjectFromID("eventDateNext").value;
@@ -67 +67 @@
                         }//endswitch
                 }//endif
-                
+
                 var theURL = "snapshot_ajax.php?cm=getWeek";
                 if(eventDate)
                         theURL += "&d="+eventDate;
-                        
+
                 var weekContainer = getObjectFromID("eventsBox");
                 loadXMLDoc(theURL,null,false);
@@ -78 +78 @@
                 theEvent.idents[theEvent.idents.length] = connect(getObjectFromID("eventLastWeek"),"onclick",theEvent.getWeek);
                 theEvent.idents[theEvent.idents.length] = connect(getObjectFromID("eventToday"),"onclick",theEvent.getWeek);
-                theEvent.idents[theEvent.idents.length] = connect(getObjectFromID("eventNextWeek"),"onclick",theEvent.getWeek);         
-                
+                theEvent.idents[theEvent.idents.length] = connect(getObjectFromID("eventNextWeek"),"onclick",theEvent.getWeek);
+
         }//end method
-        
+
 }//end class
 
 
 task = {
-        
+
         check: function(e){
                 var srcObj = e.src();
-                
+
                 var id = srcObj.id.substr(5);
                 var type =  srcObj.id.substr(2,2);
                 var section = srcObj.id.substr(0,2);
-                
+
                 var checkBox = srcObj;
                 var containerP = srcObj.parentNode;
-                                
+
                 var theURL = "snapshot_ajax.php?id="+id+"&ty="+type+"&cm=updateTask&cp=";
 
                 if(checkBox.checked){
-                        
+
                         theURL += 1;
-                        
+
                         containerP.className += " complete";
-                                                
+
                 } else {
-                        
+
                         theURL += 0;
-                        
+
                         containerP.className = containerP.className.replace(/complete/g, "");
-                        
+
                 }//end if
-                
+
                 loadXMLDoc(theURL,null,false);
-                
+
         }//end method
 }//end class
@@ -127 +127 @@
         for(var i=0; i<taskChecks.length; i++)
                 connect(taskChecks[i],"onclick",task.check);
-        
+
         var systemMessageDivs = getElementsByClassName('systemMessages');
         var systemMessageLinks = getElementsByClassName('systemMessageLinks');
@@ -136 +136 @@
         var systemMessageAccordion = new fx.Accordion(systemMessageLinks, systemMessageDivs, {opacity: true, duration:150});
         var taskAccordion = new fx.Accordion(taskLinks, taskDivs, {opacity: true, duration:300});
-        taskAccordion.showThisHideOpen(taskDivs[2]);
-        
+        taskAccordion.showThisHideOpen(taskDivs[1]);
+
         theEvent.getWeek();
 });

branches/nathan/modules/base/snapshot.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        require_once("../../include/session.php");      
+        require_once("../../include/session.php");
         require_once("include/snapshot_include.php");
-        
+
         //Page details;
         $pageTitle = APPLICATION_NAME;
-        
+
         $phpbms->cssIncludes[] = "pages/snapshot.css";
-        
+
         $phpbms->jsIncludes[] = "modules/base/javascript/snapshot.js";
-        
+
         foreach($phpbms->modules as $modulename => $modinfo){
                 if(file_exists("../".$modulename."/javascript/snapshot.js") && $modulename != "base")
                         $phpbms->jsIncludes[] = "modules/".$modulename."/javascript/snapshot.js";
-                        
+
                 if(file_exists("../../common/stylesheet/".STYLESHEET."/pages/".$modulename."/snapshot.css"))
                         $phpbms->cssIncludes[] = "pages/".$modulename."/snapshot.css";
-                
+
         }//end if
-        
+
         require("header.php");
-        
+
+        $myBase = new baseSnapshot($db, $phpbms, $_SESSION["userinfo"]["id"]);
+
 ?>
 <div class="bodyline">
         <h1><?php echo $_SESSION["userinfo"]["firstname"]; if($_SESSION["userinfo"]["lastname"]) echo " ".$_SESSION["userinfo"]["lastname"]?>'s Snapshot</h1>
-        <?php showSystemMessages($db) ?>
-        
+        <?php $myBase->showSystemMessages() ?>
+
         <div id="notesStuff">
         <table cellpadding="0" cellspacing="0" border="0">
@@ -70 +72 @@
                         <td class="box" id="tasksBox">
                                 <h2>Workload</h2>
-                                <?php 
-                                        showTasks($db,$_SESSION["userinfo"]["id"],"GivenAssignments");
-                                        showTasks($db,$_SESSION["userinfo"]["id"],"ReceivedAssignments"); 
-                                        showTasks($db,$_SESSION["userinfo"]["id"],"Tasks");
+                                <?php
+                                        $myBase->showTasks("GivenAssignments");
+                                        $myBase->showTasks("ReceivedAssignments");
+                                        //showTasks($db,$_SESSION["userinfo"]["id"],"Tasks");
                                 ?>
                         </td>
@@ -79 +81 @@
         </table>
         </div>
-        
+
         <div style="clear:both;"></div>
 
-        <?php   
-        foreach($phpbms->modules as $modulename => $modinfo)                            
+        <?php
+        foreach($phpbms->modules as $modulename => $modinfo)
                 if(file_exists("../".$modulename."/snapshot.php") && $modulename != "base")
                         include("../".$modulename."/snapshot.php");

branches/nathan/modules/bms/clients_credit.php

@@ -1 @@
-<?php 
+<?php
 /*
  $Rev: 285 $ | $LastChangedBy: brieb $
@@ -46 +46 @@
         $clientCredit = new clientCredit($db, $_GET["id"]);
 
-        if(isset($_POST["hascredit"])){
+        if(isset($_POST["creditlimit"])){
                 if($clientCredit->update(addSlashesToArray($_POST) ))
-                        $statusMessage = "Credit Updated";
+                        $statusmessage = "Credit Updated";
         }
-        
+
         $therecord = $clientCredit->get();
-        
+
         //setting page title
         $pageTitle="Credit: ";
@@ -76 +76 @@
                         $theinput->setAttribute("readonly","readonly");
                 $theform->addField($theinput);
-                
+
                 $theinput = new inputCurrency("creditleft", ($therecord["creditlimit"]-$therecord["outstanding"]), "credit left");
                 $theinput->setAttribute("readonly","readonly");
@@ -86 +86 @@
 
 
-        include("header.php");  
+        include("header.php");
 
         $phpbms->showTabs("clients entry",300,$_GET["id"]);?><div class="bodyline">
-        <form action="<?php echo str_replace("&","&amp;",$_SERVER["REQUEST_URI"]) ?>" 
+        <form action="<?php echo str_replace("&","&amp;",$_SERVER["REQUEST_URI"]) ?>"
         method="post" name="record" id="record">
                 <div id="topButtons">
                         <input type="button" class="Buttons" id="update1" name="update" value="save"/>
                 </div>
-        
+
                 <h1 id="h1Title"><span><?php echo $pageTitle ?></span></h1>
                 <input type="hidden" id="type" name="type" value="<?php echo $therecord["type"]?>" />
-                
+
                 <fieldset>
                         <legend>Credit</legend>
@@ -103 +103 @@
                         <p class="notes">Credit can only be set for clients.</p>
                         <?php }?>
-                        
+
                         <p><?php $theform->showField("hascredit")?></p>
-                        
+
                         <p><?php $theform->showField("creditlimit")?></p>
 
@@ -114 +114 @@
 
                 <?php  if($therecord["hascredit"]) {?>
-                
+
                 <fieldset>
                         <legend>open items</legend>
                         <div class="fauxP">
-                        
+
                                 <?php $clientCredit->showHistory($_GET["id"])?>
-                                
+
                         </div>
                 </fieldset>
-                
+
                 <?php  } //end if?>
 

branches/nathan/modules/bms/install/updatev0.96.sql

@@ -18 +18 @@
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('2', 'e-mail', 'clients.email', 'left', '', '3', '', '0', '', NULL, '0');
 INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('2', 'has credit', 'clients.hascredit', 'center', '', '1', '', '0', '', 'boolean', '80');
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('2', 'name / location', 'CONCAT(\'[b]\',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}\')), \'\')),\'[/b][br][space]\', IF(addresses.city != \'\' OR addresses.state !=\'\' OR addresses.postalcode != \'\', CONCAT(IF(addresses.city != \'\',addresses.city,\'\'),\', \',IF(addresses.state != \'\', addresses.state, \'\'),\' \',IF(addresses.postalcode != \'\', addresses.postalcode, \'\')),\'(no location)\'))', 'left', '', '2', 'concat(clients.company,cliennts.lastname,clients.firstname)', '0', '100%', 'bbcode', '0');
+INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`, `roleid`) VALUES ('2', 'name / location', 'CONCAT(\'[b]\',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}\')), \'\')),\'[/b][br][space]\', IF(addresses.city != \'\' OR addresses.state !=\'\' OR addresses.postalcode != \'\', CONCAT(IF(addresses.city != \'\',addresses.city,\'\'),\', \',IF(addresses.state != \'\', addresses.state, \'\'),\' \',IF(addresses.postalcode != \'\', addresses.postalcode, \'\')),\'(no location)\'))', 'left', '', '2', 'concat(clients.company,clients.lastname,clients.firstname)', '0', '100%', 'bbcode', '0');
 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');

branches/nathan/report/report_class.php

@@ -58 +58 @@
                                 $this->sortorder = $_SESSION["printing"]["sortorder"];
                                 
-                        if(isset($_SESSION["printing"]["whereclause"]))
+                        if(isset($_SESSION["printing"]["whereclause"])){
+                                
+                                if(strpos($_SESSION["printing"]["whereclause"],"WHERE") === 0)
+                                        $this->whereclause = substr($this->whereclause, 5);
+                                        
                                 $this->whereclause = $_SESSION["printing"]["whereclause"];
+                                
+                        }//endif
                         
                         //backwards compatibility

branches/nathan/smartsearch.php

@@ -47 +47 @@
 
         function smartSearch($db, $sdbid){
-                
+
                 $this->db = $db;
-                
+
                 $this->getSearchParams($sdbid);
-                
+
         }//end method init
-        
+
 
         function getSearchParams($sdbid){
-        
+
                 $querystatement = "
                         SELECT
@@ -64 +64 @@
                         WHERE
                                 id = ".((int) $sdbid);
-                
+
                 $this->searchParams = $this->db->fetchArray($this->db->query($querystatement));
-        
+
         }//end method - getSearchParams
 
@@ -73 +73 @@
 
                 $term = trim(mysql_real_escape_string($term));
-                
+
                 // first we take the entered text and explode int by words
                 $terms = explode(" ",$term);
-                
+
                 //next we take the list of fields to search and create an array
                 $searchFields = explode(",", $this->searchParams["searchfields"]);
-                        
+
                 $wheres="";
                 foreach($terms as $value){
-                        
+
                         // this series of foreachs builds a SQL OR clause to search
                         // the search fields to match things that start with the term
                         // or has words inside that start with the term.
-                                                
+
                         $wheres .="AND (";
-                        
+
                         foreach($searchFields as $field)
                                 $wheres .= trim($field)." LIKE '".$value."%' OR ".trim($field)." LIKE '% ".$value."%'\nOR ";
-                        
+
                         $wheres = substr($wheres,0,strlen($wheres)-3);
                         $wheres .= ")";
-                        
+
                 }//endforeach
 
                 if($wheres){
-                
+
                         $finalsearch = "";
                         foreach($searchFields as $field)
                                 $finalsearch .= trim($field)." LIKE '".$term."%'\nOR ";
-                        
+
                         $finalsearch = substr($finalsearch,0,strlen($finalsearch)-3);
-                        
+
                         $wheres = "AND ( (".$finalsearch.") OR (".substr($wheres,4)."))";
 
                 }//endif - where
-                
+
                 $securityWhere = "";
-                
+
                 if($this->searchParams["rolefield"]){
-                
+
                         // If the rolefield is present, we need to make sure the rolefield
                         // of each record matches the logged in users array of roles
-                        
+
                         if ($_SESSION["userinfo"]["admin"]!=1){
-                        
+
                                 if(count($_SESSION["userinfo"]["roles"])>0)
                                         $securityWhere = " AND ".$this->searchParams["rolefield"]." IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";
                                 else
                                         $securityWhere = " AND ".$this->searchParams["rolefield"]." = 0";
-                                        
+
                         }//endif admin
-                
+
                 }//endif rolefield
-        
+
                 $querystatement = "
                         SELECT DISTINCT
@@ -136 +136 @@
                                 ".$this->searchParams["fromclause"]."
                         WHERE
-                                (".$this->searchParams["filterclause"].")
+                                (".$this->subout($this->searchParams["filterclause"]).")
                                 ".$securityWhere."
                                 ".$wheres."
@@ -145 +145 @@
 
                 //need to retireve count of all records so
-                // the JS can know wheher to put the show more results on.              
+                // the JS can know wheher to put the show more results on.
                 $totalCountStatement = "
                         SELECT
@@ -155 +155 @@
                                 ".$securityWhere."
                                 ".$wheres;
-                                
+
                 $countrecord = $this->db->fetchArray($this->db->query($totalCountStatement));
                 $this->totalcount = $countrecord["thecount"];
 
                 return $this->db->query($querystatement);
-        
+
         }//end method
 
-        
+
         function display($result){
                 // This function will spit out a JSON array of records
-                
+
                 $output = "{totalRecords: ".$this->totalcount.", resultRecords: [";
-                
+
                 while($therecord = $this->db->fetchArray($result)){
-                
+
                         $output .= "{display: '".str_replace("'", "\'", formatVariable($therecord["display"],"bbcode"))."',";
                         $output .= "value: '".str_replace("'", "\'", formatVariable($therecord["value"]))."',";
                         $output .= "secondary: '".str_replace("'", "\'", formatVariable($therecord["secondary"],"bbcode"))."',";
                         $output .= "classname: '".str_replace("'", "\'", formatVariable($therecord["classname"]))."'},";
-                
+
                 }//endwhile
-                
+
                 if($output != "{totalRecords: ".$this->totalcount.", resultRecords: [")
                         $output = substr($output, 0, strlen($output)-1);
-                
+
                 $output .= "] }";
 
                 header("Content-type: text/plain");
                 echo $output;
-                
+
         }//end method - display
+
+
+        // replace variables
+        // strings with entrys like " {{$ENTRY}} "
+        // get everything in the {{ }} evaluated
+        function subout($string){
+
+                while(strpos($string,"{{")){
+                        $start=strpos($string,"{{");
+                        $startsubout=$start+2;
+                        $endsubout=strpos($string,"}}");
+                        $end=$endsubout+2;
+                        $temp="";
+                        eval(stripslashes("\$temp=".substr($string,$startsubout,$endsubout-$startsubout).";"));
+                        $string=substr($string,0,$start).$temp.substr($string,$end);
+                }
+
+                return $string;
+
+        }//end function
         
 }//end class
@@ -196 +216 @@
 
         $smartSearch = new smartSearch($db, $_GET["sdbid"]);
-        
+
         if(!isset($_GET["o"]))
                 $_GET["o"] = 0;
@@ -202 +222 @@
         $theresult = $smartSearch->find($_GET["t"],((int) $_GET["o"]));
 
-        if(isset($theresult))   
+        if(isset($theresult))
                 $smartSearch->display($theresult);
-        
+
 }//end if
 ?>