Changeset 672

Timestamp:

10/26/09 14:08:14 (3 years ago)

Author:

nate

Message:

• Fixed typos as per the patch in ticket #369.

Location:

trunk/phpbms

Files:

• include/search_class.php (modified) (2 diffs)
• install/index.php (modified) (2 diffs)
• modules/base/general_import.php (modified) (1 diff)
• modules/base/include/widgets.php (modified) (2 diffs)
• modules/base/tabledefs_addedit.php (modified) (2 diffs)
• modules/base/users_addedit.php (modified) (1 diff)
• modules/base/widgets/workload/class.php (modified) (1 diff)
• modules/bms/clients_import.php (modified) (2 diffs)
• modules/bms/include/receipts.php (modified) (1 diff)
• modules/sample/include/sampletable.php (modified) (1 diff)
• report/pdfreport_class.php (modified) (7 diffs)
• requirements.php (modified) (2 diffs)

trunk/phpbms/include/search_class.php

@@ -1013 +1013 @@
 
 
-                        //check to see if critera has been saved to Session
+                        //check to see if criteria has been saved to Session
                         if(isset($_SESSION["tableparams"][$this->ref]))
                                 //grab the session
@@ -1287 +1287 @@
                         return $message;
                 }
-                
+
                 /*
                  * function runPush
                  * @param string $pushRecordUuid
                  */
-                
+
                 function runPush($pushRecordUuid) {
-                        
+
                         include_once("modules/api/include/push.php");
-                        
+
                         $uuidArray = getUuidArray($this->db, $this->tabledefuuid, $this->idsArray);
-                        
+
                         if($uuidArray === false)
                                 $uuidArray = array();
-                        
+
                         $push = new push($this->db, $pushRecordUuid, $uuidArray);
                         $thereturn = $push->process();
-                        
+
                         if($thereturn !== false)
                                 $message = count($push->uuidArray)." record(s) pushed.";
                         else
                                 $message = "An error has occured.";
-                        
+
                         return $message;
-                        
+
                 }//end function
 

trunk/phpbms/install/index.php

@@ -335 +335 @@
                                 </p>
 
-                                <h2>Availale Modules</h2>
+                                <h2>Available Modules</h2>
 
                                 <?php $moduleClass->displayInstallTable() ?>
@@ -377 +377 @@
                                                     phpBMS has a scheduler function that runs items on a timed basis using cron
                                                     or another scheduler program to run php via command line.  Check the
-                                                    Scheduler under the system menu after loggin in for details on configuring this
+                                                    Scheduler under the system menu after logging in for details on configuring this
                                                     in your crontab file.  Once configured, you will want to disable your web server from
                                                     allowing this file to be called from your web server (the outside).

trunk/phpbms/modules/base/general_import.php

@@ -154 +154 @@
                                         </p>
                                         <p>
-                                                Delimeters are commas (,) and enclosures are double-quotes (").  If you
+                                                Delimiters are commas (,) and enclosures are double-quotes (").  If you
                                                 wish to escape a double-quote character inside of an enclosure, add another
                                                 double-quote character (e.g ...,"Benny ""The Jet"" Rodriguez",...), or with

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

@@ -78 +78 @@
                         if(isset($variables["title"])){
                                 if($variables["title"] === "" || $variables["title"] === NULL)
-                                        $this->verifyErrors[] = "The `title` field must be not be blank.";
+                                        $this->verifyErrors[] = "The `title` field must not be blank.";
                         }else
                                 $this->verifyErrors[] = "The `title` field must be set.";
@@ -84 +84 @@
                         if(isset($variables["file"])){
                                 if($variables["file"] === "" || $variables["file"] === NULL)
-                                        $this->verifyErrors[] = "The `file` field must be not be blank.";
+                                        $this->verifyErrors[] = "The `file` field must not be blank.";
                         }else
                                 $this->verifyErrors[] = "The `file` field must be set.";

trunk/phpbms/modules/base/tabledefs_addedit.php

@@ -203 +203 @@
                                 <?php $theform->showField("importfile") ?><br />
                                 <span class="notes">file name, including path from application root, that is used for importing records. If none
-                                is specfied, the general import for the table def will be used.  This may not always result in accurate imports for
+                                is specified, the general import for the table def will be used.  This may not always result in accurate imports for
                                 the more complicated table definitions.</span>
                         </p>
@@ -241 +241 @@
                         <div id="defaultQuickSearch" <?php if($therecord["defaultsearchtype"]=="") echo "style=\"display:none;\""?>>
                                 <p>
-                                        <label for="defaultcriteriafindoptions">critera: selected find option</label> <span class="notes">(quick search)</span><br/>
+                                        <label for="defaultcriteriafindoptions">criteria: selected find option</label> <span class="notes">(quick search)</span><br/>
                                         <textarea id="defaultcriteriafindoptions" name="defaultcriteriafindoptions" cols="32" rows="2"><?php echo htmlQuotes($therecord["defaultcriteriafindoptions"])?></textarea>
 

trunk/phpbms/modules/base/users_addedit.php

@@ -123 +123 @@
                 <p class="notes">
                         user accounts marked as portal access cannot login to phpBMS, but are used by external applications
-                        when creating/modifiying information from outside the application for recording purposes.
+                        when creating/modifying information from outside the application for recording purposes.
                 </p>
         </fieldset>

trunk/phpbms/modules/base/widgets/workload/class.php

@@ -253 +253 @@
                                                         <p><?php echo $bottomInfo ?></p>
 
-                                                <? }//endif ?>
+                                                <?php }//endif ?>
                                         </div>
 

trunk/phpbms/modules/bms/clients_import.php

@@ -175 +175 @@
                                         </p>
                                         <p>
-                                                Delimeters are commas (,) and enclosures are double-quotes (").  If you
+                                                Delimiters are commas (,) and enclosures are double-quotes (").  If you
                                                 wish to escape a double-quote character inside of an enclosure, add another
                                                 double-quote character (e.g ...,"Benny ""The Jet"" Rodriguez",...), or with
@@ -195 +195 @@
                                         </p>
                                         <p>
-                                                Delimeters are commas (,) and enclosures are double-quotes ("). <span class="notes" >(This
+                                                Delimiters are commas (,) and enclosures are double-quotes ("). <span class="notes" >(This
                                                 is done by default by Sugar CRM)</span> If you wish to escape a double-quote character
                                                 inside of an enclosure, add another double-quote character (e.g ...,"Benny

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

@@ -407 +407 @@
 
                                 if(!in_array(((string)$variables["paymentmethodid"]),$this->_availablePaymentMethodUUIDs))
-                                        $this->verifyErrors[] = "The `paymentmethod` field does not give an existing/accpetable payment method uuid.";
+                                        $this->verifyErrors[] = "The `paymentmethod` field does not give an existing/acceptable payment method uuid.";
 
                         }else

trunk/phpbms/modules/sample/include/sampletable.php

@@ -7 +7 @@
         that helps in the above functions, or with display.
 
-        This sample will show you how to do some basic overides.
-        Remember to instantiate the overrided class on the add/edit page.
+        This sample will show you how to do some basic overrides.
+        Remember to instantiate the overridden class on the add/edit page.
 
 

trunk/phpbms/report/pdfreport_class.php

@@ -38 +38 @@
 */
         class pdfColumn{
-                
+
                 var $title;
                 var $fieldname;
@@ -44 +44 @@
                 var $format;
                 var $align = "L";
-        
+
                 function pdfColumn($title, $fieldname, $size = 1, $format = "", $align = "L"){
-                
+
                         $this->title = $title;
                         $this->fieldname = $fieldname;
@@ -52 +52 @@
                         $this->format = $format;
                         $this->align = $align;
-                
-                }//end method
-        
+
+                }//end method
+
         }//end class
 
         class pdfColor{
-                
+
                 var $r = 0;
                 var $g = 0;
@@ -64 +64 @@
 
                 function pdfColor($r = 0,$g = 0,$b = 0){
-                
+
                         $this->r = $r;
                         $this->g = $g;
                         $this->b = $b;
-                
-                }//end method
-                                
-        }//end class
-
-        
+
+                }//end method
+
+        }//end class
+
+
         class pdfFont {
-        
+
                 var $family = "Arial";
                 var $style = "";
                 var $size = 8;
-                
+
                 function pdfFont($family = "Arial", $style ="", $size = 8){
-                        
+
                         $this->family = $family;
                         $this->style = $style;
-                        $this->size = $size;                    
-                
-                }//end method
-        
-        }//end class
-        
-        
+                        $this->size = $size;
+
+                }//end method
+
+        }//end class
+
+
         class pdfStyle{
-        
+
                 var $font = NULL;
                 var $textColor = NULL;
                 var $backgroundColor = NULL;
-                
+
                 function pdfStyle($font = NULL, $textColor = NULL, $backgroundColor = NULL){
-                        
+
                         if($font) $this->font = $font;
                         if($textColor) $this->textColor = $textColor;
                         if($backgroundColor) $this->backgroundColor = $backgroundColor;
-                
-                }//end method
-                
-        }//end class
-        
+
+                }//end method
+
+        }//end class
+
 
         if(!class_exists("MEM_IMAGE")){
-        
+
                 include("fpdf/fpdf.php");
                 include("fpdf/mem_image.php");
-        
+
         }//end if
 
         class phpbmsPDFReport extends MEM_IMAGE {
-        
+
                 var $borderDebug = 0;
-        
+
                 var $leftmargin = 0.5;
                 var $rightmargin = 0.5;
@@ -124 +124 @@
                 var $paperwidth = 8.5;
                 var $paperlength = 11;
-                
+
                 var $hasComapnyHeader = false;
                 var $companyImageWidth = 1;
-                
+
                 var $styles = array();
-                
-        
+
+
                 function phpbmsPDFReport($db, $orientation='P', $unit='mm', $format='Letter'){
-                
+
                         $this->db = $db;
-                        
+
                         parent::MEM_IMAGE($orientation, $unit, $format);
-                        
+
                         $this->initStyles();
                         $this->SetLineWidth(0.01);
-                        
-                }//end method
-                
-                
+
+                }//end method
+
+
                 function initStyles(){
-                        
+
                         //here we set the standard styles
 
-                        // NORMAL                       
+                        // NORMAL
                         $font = new pdfFont("Arial", "", 8);
                         $style = new pdfStyle($font);
@@ -168 +168 @@
 
                         $this->styles["header"] = $style;
-                
+
                 }//end method
 
 
                 function defineStyle($name, $pdfStyleObj){
-                
+
                         if(get_class($pdfStyleObj) != "pdfStyle")
-                                $error = new appError(1400,"defineStyle Method needs pdfStyle obeject as paramater 2","PDF Error",true,true,false);
-                        
+                                $error = new appError(1400,"defineStyle Method needs pdfStyle object as parameter 2","PDF Error",true,true,false);
+
                         $this->styles[$name] = $pdfStyleObj;
-                
+
                 }//end if
 
 
                 function setStyle($name){
-                
+
                         if(!isset($this->styles[$name]))
                                 $name = "normal";
-                                
+
                         $newStyle = $this->styles[$name];
 
@@ -193 +193 @@
                         else
                                 $this->SetFont("Arial", "", 8);
-                                
+
                         if(isset($newStyle->textColor))
                                 $this->SetTextColor($newStyle->textColor->r, $newStyle->textColor->g, $newStyle->textColor->b);
                         else
                                 $this->SetTextColor(0,0,0);
-                
+
                         if(isset($newStyle->backgroundColor))
                                 $this->SetFillColor($newStyle->backgroundColor->r, $newStyle->backgroundColor->g, $newStyle->backgroundColor->b);
                         else
                                 $this->SetFillColor(255,255,255);
-                
+
                 }//end if
 
 
                 function SetMargins(){
-                                                
+
                         parent::SetMargins($this->leftmargin, $this->topmargin, $this->rightmargin);
-                        
-                }//end method
-                
-                
-                function Header(){                      
+
+                }//end method
+
+
+                function Header(){
                         if($this->hasComapnyHeader){
-                        
+
                                 $cname = COMPANY_NAME;
-                                $caddress = COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;                        
-                                
+                                $caddress = COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
+
                                 $querystatement = "
-                                        SELECT 
+                                        SELECT
                                                 `file`,
                                                 UPPER(`type`) AS `type`
-                                        FROM 
-                                                files 
-                                        WHERE 
+                                        FROM
+                                                files
+                                        WHERE
                                                 id=1";
-                                                
+
                                 $pictureresult = $this->db->query($querystatement);
-                                
+
                                 $thepicture = $this->db->fetchArray($pictureresult);
-                                
+
                                 if($thepicture["type"]=="IMAGE/JPEG"){
-                                
+
                                         global $image;
                                         $image = $thepicture["file"];
-                                        $this->Image('var://image', $this->leftmargin,$this->topmargin, $this->companyImageWidth, 0, "JPEG");   
-                                        
+                                        $this->Image('var://image', $this->leftmargin,$this->topmargin, $this->companyImageWidth, 0, "JPEG");
+
                                 } elseif($thepicture["type"]=="IMAGE/PNG")
-                                        $this->MemImage($thepicture["file"], $this->leftmargin, $this->topmargin, $this->companyImageWidth);    
-                                
+                                        $this->MemImage($thepicture["file"], $this->leftmargin, $this->topmargin, $this->companyImageWidth);
+
                                 //company name
                                 $this->SetXY($this->companyImageWidth + $this->leftmargin, $this->topmargin);
                                 $this->SetFont("Times","B",12);
                                 $this->Cell(4, 0.25, $cname, $this->borderDebug, 2, "L");
-                        
+
                                 //and last, company address
                                 $this->SetFont("Times","",8);
                                 $this->MultiCell(4, .125 , $caddress, $this->borderDebug);
-                                                                
+
                         }//end if
-                        
-                }//end method   
-                
-        }//end class
-        
+
+                }//end method
+
+        }//end class
+
 ?>

trunk/phpbms/requirements.php

@@ -75 +75 @@
                         <h3>Cookie support</h3>
                         <p>
-                                phpBMS sets a single cookie to track your login.  Cookie suport for this site
+                                phpBMS sets a single cookie to track your login.  Cookie support for this site
                                 must be enabled in order for the application to allow you to log in
                         </p>
@@ -81 +81 @@
 
                 <li>
-                        <h3>Full Casscading Style Sheet (CSS) v1.2 support</h3>
+                        <h3>Full Cascading Style Sheet (CSS) v1.2 support</h3>
                         <p>
                                 phpBMS takes advantage of CSS v1.2 to render pages.  Without this