Merged in luisfernandosl/processmaker/PM-807 (pull request #2019)

PM-807 "Change especify to specify" SOLVED

gulliver/core/Session/PmSessionHandler.php

@@ -229,7 +229,7 @@ class PmSessionHandler //implements SessionHandlerInterface
     /**
      * Garbase Collection method 
      * 
-     * @param  int $maxlifetime max time that especify if the session is active or not
+     * @param int $maxlifetime max time that specifies if the session is active or not
      * @return bool always returns true
      */
     public function gc($maxlifetime)
@@ -255,4 +255,4 @@ class PmSessionHandler //implements SessionHandlerInterface
 
         error_log('PM Session Handler :: ' . print_r($data, true));
     }
-}
+}

gulliver/js/highlight/core/test.html

@@ -160,7 +160,7 @@ abstract class Zend_Uri
          */
         $uri = explode(':', $uri, 2);
         $scheme = strtolower($uri[0]);
-        $schemeSpecific = isset($uri[1]) ? $uri[1] : '';
+        $schemeSpecify = isset($uri[1]) ? $uri[1] : '';
 
         if (!strlen($scheme)) {
             throw new Zend_Uri_Exception('An empty string was supplied for the scheme');
@@ -617,4 +617,4 @@ public boolean unpack(container packedClass)
 <pre><code class="no-highlight">&lt;div id="contents"&gt;
   &lt;p&gt;Hello, World!
 &lt;/div&gt;
-</code></pre>
+</code></pre>

gulliver/system/class.bootstrap.php

@@ -463,7 +463,7 @@ class Bootstrap
         $filter = new InputFilter();
         $file = $filter->xssFilterHard($file);
         $downloadFileName = $filter->xssFilterHard($downloadFileName);
-        
+
         $fileNameIni = $file;
 
         $browserCacheFilesUid = G::browserCacheFilesGetUid();
@@ -1376,7 +1376,7 @@ class Bootstrap
     {
         global $translation;
 
-        // if the second parameter $lang is an array does mean it was especified to use as data
+        // if the second parameter ($lang) is an array, it was specified to use it as data
         if (is_array($lang)) {
             $data = $lang;
             $lang = SYS_LANG;
@@ -1409,7 +1409,7 @@ class Bootstrap
      *
      * @param $path path to scan recursively the write permission
      * @param $flags to notive glob function
-     * @param $pattern pattern to filter some especified files
+     * @param $pattern pattern to filter some specified files
      * @return <array> array containing the recursive glob results
      */
     public function rglob($pattern = '*', $flags = 0, $path = '')
@@ -2894,7 +2894,7 @@ class Bootstrap
         if ($hashType == '') {
             $hashType = Bootstrap::getPasswordHashType();
         }
-        
+
         G::LoadSystem('inputfilter');
         $filter = new InputFilter();
         $hashType = $filter->validateInput($hashType);
@@ -2934,4 +2934,3 @@ class Bootstrap
         return md5($string);
     }
 }
-

gulliver/system/class.g.php

@@ -2095,7 +2095,7 @@ class G
     {
         global $translation;
 
-        // if the second parameter $lang is an array does mean it was especified to use as data
+        // if the second parameter ($lang) is an array, it was specified to use as data
         if (is_array( $lang )) {
             $data = $lang;
             $lang = SYS_LANG;
@@ -2634,8 +2634,8 @@ class G
             $oldumask = umask( 0 );
             if (! is_dir( $path )) {
                 G::verifyPath( $path, true );
-            }     
+            }
-            
+
             if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
                 $file = str_replace("\\\\","\\",$file,$count);
                 if(!$count) {
@@ -2647,13 +2647,13 @@ class G
                         }
                     }
                     $file = substr($file,0,-1);
-                }   
+                }
             }
-            
+
             G::LoadSystem('inputfilter');
             $filter = new InputFilter();
-            $file = $filter->validateInput($file, "path"); 
+            $file = $filter->validateInput($file, "path");
-            
+
             move_uploaded_file( $file, $path . "/" . $nameToSave );
             @chmod( $path . "/" . $nameToSave, $permission );
             umask( $oldumask );
@@ -3637,7 +3637,7 @@ class G
      * @author Erik Amaru Ortiz <erik@colosa.com>
      *
      * @param $path path to scan recursively the write permission
-     * @param $pattern pattern to filter some especified files
+     * @param $pattern pattern to filter some specified files
      * @return <boolean> if the $path, assuming that is a directory -> all files in it are writeables or not
      */
     public function is_rwritable($path, $pattern = '*')
@@ -3658,7 +3658,7 @@ class G
      *
      * @param $path path to scan recursively the write permission
      * @param $flags to notive glob function
-     * @param $pattern pattern to filter some especified files
+     * @param $pattern pattern to filter some specified files
      * @return <array> array containing the recursive glob results
      */
     public static function rglob($pattern = '*', $flags = 0, $path = '')
@@ -5719,4 +5719,3 @@ function __ ($msgID, $lang = SYS_LANG, $data = null)
 {
     return G::LoadTranslation( $msgID, $lang, $data );
 }
-

workflow/engine/bin/rest-gen

@@ -24,8 +24,8 @@ Usage: {$argv[0]} [build-crud] [gen-ini] [-p <plugin name>] [-w <workspace name>
 Options:
     build-crud : Task, build Rest Crud API.
     gen-ini    : Task, generates the rest config ini file.
-    -p         : Especify a plugin to set as enviroment to perform the tasks.
+    -p         : Specifies a plugin to set as environment to perform the tasks.
-    -w         : Especify a workspace to set as enviroment to perform the tasks.
+    -w         : Specifies a workspace to set as environment to perform the tasks.
 
 EOT;
 
@@ -42,7 +42,7 @@ try {
         case 'gen-ini':
             if (isset($argv[2])) {
                 if (! isset($argv[3])) {
-                    throw new Exception("Missing option, need especify a valid argument after option '{$argv[2]}'");
+                    throw new Exception("Missing option, need specify a valid argument after option '{$argv[2]}'");
                 }
 
                 switch ($argv[2]) {

workflow/engine/bin/tasks/cliUpgrade.php

@@ -217,7 +217,7 @@ function run_unify_database($args)
 
     if ($count > 1) {
         if(!Bootstrap::isLinuxOs()){
-            CLI::error("This is not a Linux enviroment, please especify workspace.\n");
+            CLI::error("This is not a Linux enviroment, please specify workspace.\n");
             return;
         }
     }