From 1df5ab2b43787add041856e5e66e581ffd73a979 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 27 Apr 2015 12:16:42 -0400 Subject: [PATCH 1/2] PM-807 "Change especify to specify" SOLVED > Code Isuue: Change "especify" to "specify" > Solution: Se corrige el texto especify a specify en los archivos mencionados en el presente ticket. --- gulliver/core/Session/PmSessionHandler.php | 4 ++-- gulliver/js/highlight/core/test.html | 4 ++-- gulliver/system/class.bootstrap.php | 9 ++++----- gulliver/system/class.g.php | 19 +++++++++---------- workflow/engine/bin/rest-gen | 6 +++--- workflow/engine/bin/tasks/cliUpgrade.php | 2 +- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/gulliver/core/Session/PmSessionHandler.php b/gulliver/core/Session/PmSessionHandler.php index 94ab7d676..4dc6702c0 100644 --- a/gulliver/core/Session/PmSessionHandler.php +++ b/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 specify 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)); } -} \ No newline at end of file +} diff --git a/gulliver/js/highlight/core/test.html b/gulliver/js/highlight/core/test.html index c1256f8a5..e65c1b716 100755 --- a/gulliver/js/highlight/core/test.html +++ b/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) 
<div id="contents">
   <p>Hello, World!
 </div>
-
\ No newline at end of file + diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index f625536db..23fcffe45 100644 --- a/gulliver/system/class.bootstrap.php +++ b/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 does mean it was specify to use 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 specify files * @return 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); } } - diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 846fbd558..e2e5321ac 100755 --- a/gulliver/system/class.g.php +++ b/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 does mean it was specify 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 ); @@ -3634,7 +3634,7 @@ class G * @author Erik Amaru Ortiz * * @param $path path to scan recursively the write permission - * @param $pattern pattern to filter some especified files + * @param $pattern pattern to filter some specify files * @return if the $path, assuming that is a directory -> all files in it are writeables or not */ public function is_rwritable($path, $pattern = '*') @@ -3655,7 +3655,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 specify files * @return array containing the recursive glob results */ public static function rglob($pattern = '*', $flags = 0, $path = '') @@ -5705,4 +5705,3 @@ function __ ($msgID, $lang = SYS_LANG, $data = null) { return G::LoadTranslation( $msgID, $lang, $data ); } - diff --git a/workflow/engine/bin/rest-gen b/workflow/engine/bin/rest-gen index aa2135bc2..d4899f4f2 100755 --- a/workflow/engine/bin/rest-gen +++ b/workflow/engine/bin/rest-gen @@ -24,8 +24,8 @@ Usage: {$argv[0]} [build-crud] [gen-ini] [-p ] [-w 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. - -w : Especify a workspace to set as enviroment to perform the tasks. + -p : Specify a plugin to set as enviroment to perform the tasks. + -w : Specify a workspace to set as enviroment 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]) { diff --git a/workflow/engine/bin/tasks/cliUpgrade.php b/workflow/engine/bin/tasks/cliUpgrade.php index 5d6bd71bf..958413427 100755 --- a/workflow/engine/bin/tasks/cliUpgrade.php +++ b/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; } } From ab0bc199e6a6f32358bd570a31ca34289ff5beb4 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Mon, 27 Apr 2015 15:49:30 -0400 Subject: [PATCH 2/2] PM-807 "Change especify to specify" SOLVED --- gulliver/core/Session/PmSessionHandler.php | 2 +- gulliver/system/class.bootstrap.php | 4 ++-- gulliver/system/class.g.php | 6 +++--- workflow/engine/bin/rest-gen | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gulliver/core/Session/PmSessionHandler.php b/gulliver/core/Session/PmSessionHandler.php index 4dc6702c0..6d3b7b321 100644 --- a/gulliver/core/Session/PmSessionHandler.php +++ b/gulliver/core/Session/PmSessionHandler.php @@ -229,7 +229,7 @@ class PmSessionHandler //implements SessionHandlerInterface /** * Garbase Collection method * - * @param int $maxlifetime max time that specify 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) diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index 23fcffe45..07e535060 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -1376,7 +1376,7 @@ class Bootstrap { global $translation; - // if the second parameter $lang is an array does mean it was specify 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 specify files + * @param $pattern pattern to filter some specified files * @return array containing the recursive glob results */ public function rglob($pattern = '*', $flags = 0, $path = '') diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index e2e5321ac..bf29c9699 100755 --- a/gulliver/system/class.g.php +++ b/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 specify 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; @@ -3634,7 +3634,7 @@ class G * @author Erik Amaru Ortiz * * @param $path path to scan recursively the write permission - * @param $pattern pattern to filter some specify files + * @param $pattern pattern to filter some specified files * @return if the $path, assuming that is a directory -> all files in it are writeables or not */ public function is_rwritable($path, $pattern = '*') @@ -3655,7 +3655,7 @@ class G * * @param $path path to scan recursively the write permission * @param $flags to notive glob function - * @param $pattern pattern to filter some specify files + * @param $pattern pattern to filter some specified files * @return array containing the recursive glob results */ public static function rglob($pattern = '*', $flags = 0, $path = '') diff --git a/workflow/engine/bin/rest-gen b/workflow/engine/bin/rest-gen index d4899f4f2..e5b3bf127 100755 --- a/workflow/engine/bin/rest-gen +++ b/workflow/engine/bin/rest-gen @@ -24,8 +24,8 @@ Usage: {$argv[0]} [build-crud] [gen-ini] [-p ] [-w Options: build-crud : Task, build Rest Crud API. gen-ini : Task, generates the rest config ini file. - -p : Specify a plugin to set as enviroment to perform the tasks. - -w : Specify a workspace to set as enviroment to perform the tasks. + -p : Specifies a plugin to set as environment to perform the tasks. + -w : Specifies a workspace to set as environment to perform the tasks. EOT;