@@ -29,12 +29,12 @@ discard block |
||
| 29 | 29 | public static function read($sConfigFile, $sLibKey = '', $sAppKey = null) |
| 30 | 30 | { |
| 31 | 31 | $sConfigFile = realpath($sConfigFile); |
| 32 | - if(!is_readable($sConfigFile)) |
|
| 32 | + if (!is_readable($sConfigFile)) |
|
| 33 | 33 | { |
| 34 | 34 | throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile))); |
| 35 | 35 | } |
| 36 | 36 | $aConfigOptions = include($sConfigFile); |
| 37 | - if(!is_array($aConfigOptions)) |
|
| 37 | + if (!is_array($aConfigOptions)) |
|
| 38 | 38 | { |
| 39 | 39 | throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile))); |
| 40 | 40 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | // Setup the config options into the library. |
| 43 | 43 | $jaxon = jaxon(); |
| 44 | 44 | $jaxon->setOptions($aConfigOptions, $sLibKey); |
| 45 | - if(!is_string($sAppKey)) |
|
| 45 | + if (!is_string($sAppKey)) |
|
| 46 | 46 | { |
| 47 | 47 | return null; |
| 48 | 48 | } |
@@ -91,19 +91,19 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | public static function make($xValue) |
| 93 | 93 | { |
| 94 | - if($xValue instanceof Interfaces\Parameter) |
|
| 94 | + if ($xValue instanceof Interfaces\Parameter) |
|
| 95 | 95 | { |
| 96 | 96 | return $xValue; |
| 97 | 97 | } |
| 98 | - elseif(is_numeric($xValue)) |
|
| 98 | + elseif (is_numeric($xValue)) |
|
| 99 | 99 | { |
| 100 | 100 | return new Parameter(Jaxon::NUMERIC_VALUE, $xValue); |
| 101 | 101 | } |
| 102 | - elseif(is_string($xValue)) |
|
| 102 | + elseif (is_string($xValue)) |
|
| 103 | 103 | { |
| 104 | 104 | return new Parameter(Jaxon::QUOTED_VALUE, $xValue); |
| 105 | 105 | } |
| 106 | - elseif(is_bool($xValue)) |
|
| 106 | + elseif (is_bool($xValue)) |
|
| 107 | 107 | { |
| 108 | 108 | return new Parameter(Jaxon::BOOL_VALUE, $xValue); |
| 109 | 109 | } |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | { |
| 123 | 123 | $sJsCode = ''; |
| 124 | 124 | $sQuoteCharacter = "'"; |
| 125 | - switch($this->sType) |
|
| 125 | + switch ($this->sType) |
|
| 126 | 126 | { |
| 127 | 127 | case Jaxon::FORM_VALUES: |
| 128 | 128 | $sFormID = (string)$this->xValue; |
@@ -130,11 +130,11 @@ discard block |
||
| 130 | 130 | break; |
| 131 | 131 | case Jaxon::INPUT_VALUE: |
| 132 | 132 | $sInputID = (string)$this->xValue; |
| 133 | - $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sInputID . $sQuoteCharacter . ").value"; |
|
| 133 | + $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sInputID . $sQuoteCharacter . ").value"; |
|
| 134 | 134 | break; |
| 135 | 135 | case Jaxon::CHECKED_VALUE: |
| 136 | 136 | $sCheckedID = (string)$this->xValue; |
| 137 | - $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sCheckedID . $sQuoteCharacter . ").checked"; |
|
| 137 | + $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sCheckedID . $sQuoteCharacter . ").checked"; |
|
| 138 | 138 | break; |
| 139 | 139 | case Jaxon::ELEMENT_INNERHTML: |
| 140 | 140 | $sElementID = (string)$this->xValue; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $sJsCode = (string)$this->xValue; |
| 154 | 154 | break; |
| 155 | 155 | case Jaxon::JS_VALUE: |
| 156 | - if(is_array($this->xValue) || is_object($this->xValue)) |
|
| 156 | + if (is_array($this->xValue) || is_object($this->xValue)) |
|
| 157 | 157 | { |
| 158 | 158 | // Unable to use double quotes here because they cannot be handled on client side. |
| 159 | 159 | // So we are using simple quotes even if the Json standard recommends double quotes. |
@@ -94,20 +94,16 @@ discard block |
||
| 94 | 94 | if($xValue instanceof Interfaces\Parameter) |
| 95 | 95 | { |
| 96 | 96 | return $xValue; |
| 97 | - } |
|
| 98 | - elseif(is_numeric($xValue)) |
|
| 97 | + } elseif(is_numeric($xValue)) |
|
| 99 | 98 | { |
| 100 | 99 | return new Parameter(Jaxon::NUMERIC_VALUE, $xValue); |
| 101 | - } |
|
| 102 | - elseif(is_string($xValue)) |
|
| 100 | + } elseif(is_string($xValue)) |
|
| 103 | 101 | { |
| 104 | 102 | return new Parameter(Jaxon::QUOTED_VALUE, $xValue); |
| 105 | - } |
|
| 106 | - elseif(is_bool($xValue)) |
|
| 103 | + } elseif(is_bool($xValue)) |
|
| 107 | 104 | { |
| 108 | 105 | return new Parameter(Jaxon::BOOL_VALUE, $xValue); |
| 109 | - } |
|
| 110 | - else // if(is_array($xValue) || is_object($xValue)) |
|
| 106 | + } else // if(is_array($xValue) || is_object($xValue)) |
|
| 111 | 107 | { |
| 112 | 108 | return new Parameter(Jaxon::JS_VALUE, $xValue); |
| 113 | 109 | } |
@@ -158,8 +154,7 @@ discard block |
||
| 158 | 154 | // Unable to use double quotes here because they cannot be handled on client side. |
| 159 | 155 | // So we are using simple quotes even if the Json standard recommends double quotes. |
| 160 | 156 | $sJsCode = str_replace(['"'], ["'"], json_encode($this->xValue, JSON_HEX_APOS | JSON_HEX_QUOT)); |
| 161 | - } |
|
| 162 | - else |
|
| 157 | + } else |
|
| 163 | 158 | { |
| 164 | 159 | $sJsCode = (string)$this->xValue; |
| 165 | 160 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | // Verify the file extension |
| 130 | 130 | $xDefault = $this->xConfig->getOption('upload.default.types'); |
| 131 | 131 | $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.types', $xDefault); |
| 132 | - if(is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed)) |
|
| 132 | + if (is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed)) |
|
| 133 | 133 | { |
| 134 | 134 | $this->sErrorMessage = $this->xTranslator->trans('errors.upload.type', $aUploadedFile); |
| 135 | 135 | return false; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | // Verify the file extension |
| 138 | 138 | $xDefault = $this->xConfig->getOption('upload.default.extensions'); |
| 139 | 139 | $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.extensions', $xDefault); |
| 140 | - if(is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed)) |
|
| 140 | + if (is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed)) |
|
| 141 | 141 | { |
| 142 | 142 | $this->sErrorMessage = $this->xTranslator->trans('errors.upload.extension', $aUploadedFile); |
| 143 | 143 | return false; |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | // Verify the max size |
| 146 | 146 | $xDefault = $this->xConfig->getOption('upload.default.max-size', 0); |
| 147 | 147 | $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.max-size', $xDefault); |
| 148 | - if($iSize > 0 && $aUploadedFile['size'] > $iSize) |
|
| 148 | + if ($iSize > 0 && $aUploadedFile['size'] > $iSize) |
|
| 149 | 149 | { |
| 150 | 150 | $this->sErrorMessage = $this->xTranslator->trans('errors.upload.max-size', $aUploadedFile); |
| 151 | 151 | return false; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | // Verify the min size |
| 154 | 154 | $xDefault = $this->xConfig->getOption('upload.default.min-size', 0); |
| 155 | 155 | $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.min-size', $xDefault); |
| 156 | - if($iSize > 0 && $aUploadedFile['size'] < $iSize) |
|
| 156 | + if ($iSize > 0 && $aUploadedFile['size'] < $iSize) |
|
| 157 | 157 | { |
| 158 | 158 | $this->sErrorMessage = $this->xTranslator->trans('errors.upload.min-size', $aUploadedFile); |
| 159 | 159 | return false; |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | } |
| 122 | 122 | if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage])) |
| 123 | 123 | { |
| 124 | - return $sText; |
|
| 124 | + return $sText; |
|
| 125 | 125 | } |
| 126 | 126 | $message = $this->aTranslations[$sLanguage][$sText]; |
| 127 | 127 | foreach($aPlaceHolders as $name => $value) |
@@ -63,8 +63,7 @@ |
||
| 63 | 63 | { |
| 64 | 64 | // Save this translation |
| 65 | 65 | $this->aTranslations[$sLanguage][$sName] = $xTranslation; |
| 66 | - } |
|
| 67 | - else |
|
| 66 | + } else |
|
| 68 | 67 | { |
| 69 | 68 | // Recursively read the translations in the array |
| 70 | 69 | $this->_loadTranslations($sLanguage, $sName, $xTranslation); |
@@ -55,11 +55,11 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | private function _loadTranslations($sLanguage, $sPrefix, array $aTranslations) |
| 57 | 57 | { |
| 58 | - foreach($aTranslations as $sName => $xTranslation) |
|
| 58 | + foreach ($aTranslations as $sName => $xTranslation) |
|
| 59 | 59 | { |
| 60 | 60 | $sName = trim($sName); |
| 61 | 61 | $sName = ($sPrefix) ? $sPrefix . '.' . $sName : $sName; |
| 62 | - if(!is_array($xTranslation)) |
|
| 62 | + if (!is_array($xTranslation)) |
|
| 63 | 63 | { |
| 64 | 64 | // Save this translation |
| 65 | 65 | $this->aTranslations[$sLanguage][$sName] = $xTranslation; |
@@ -82,17 +82,17 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | public function loadTranslations($sFilePath, $sLanguage) |
| 84 | 84 | { |
| 85 | - if(!file_exists($sFilePath)) |
|
| 85 | + if (!file_exists($sFilePath)) |
|
| 86 | 86 | { |
| 87 | 87 | return; |
| 88 | 88 | } |
| 89 | 89 | $aTranslations = require($sFilePath); |
| 90 | - if(!is_array($aTranslations)) |
|
| 90 | + if (!is_array($aTranslations)) |
|
| 91 | 91 | { |
| 92 | 92 | return; |
| 93 | 93 | } |
| 94 | 94 | // Load the translations |
| 95 | - if(!array_key_exists($sLanguage, $this->aTranslations)) |
|
| 95 | + if (!array_key_exists($sLanguage, $this->aTranslations)) |
|
| 96 | 96 | { |
| 97 | 97 | $this->aTranslations[$sLanguage] = []; |
| 98 | 98 | } |
@@ -111,20 +111,20 @@ discard block |
||
| 111 | 111 | public function trans($sText, array $aPlaceHolders = [], $sLanguage = null) |
| 112 | 112 | { |
| 113 | 113 | $sText = trim((string)$sText); |
| 114 | - if(!$sLanguage) |
|
| 114 | + if (!$sLanguage) |
|
| 115 | 115 | { |
| 116 | 116 | $sLanguage = $this->xConfig->getOption('language'); |
| 117 | 117 | } |
| 118 | - if(!$sLanguage) |
|
| 118 | + if (!$sLanguage) |
|
| 119 | 119 | { |
| 120 | 120 | $sLanguage = $this->sDefaultLocale; |
| 121 | 121 | } |
| 122 | - if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage])) |
|
| 122 | + if (!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage])) |
|
| 123 | 123 | { |
| 124 | 124 | return $sText; |
| 125 | 125 | } |
| 126 | 126 | $message = $this->aTranslations[$sLanguage][$sText]; |
| 127 | - foreach($aPlaceHolders as $name => $value) |
|
| 127 | + foreach ($aPlaceHolders as $name => $value) |
|
| 128 | 128 | { |
| 129 | 129 | $message = str_replace(':' . $name, $value, $message); |
| 130 | 130 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * @param array $aArgs An array containing the event specification |
| 282 | 282 | * |
| 283 | - * @return \Jaxon\Request\Request |
|
| 283 | + * @return boolean |
|
| 284 | 284 | */ |
| 285 | 285 | public function register($aArgs) |
| 286 | 286 | { |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | /** |
| 343 | 343 | * Check uploaded files validity and move them to the user dir |
| 344 | 344 | * |
| 345 | - * @return boolean |
|
| 345 | + * @return string |
|
| 346 | 346 | */ |
| 347 | 347 | public function saveUploadedFiles() |
| 348 | 348 | { |
@@ -217,7 +217,7 @@ |
||
| 217 | 217 | $aFiles[$sVarName] = []; |
| 218 | 218 | foreach($aUserFiles as $aUserFile) |
| 219 | 219 | { |
| 220 | - $aFiles[$sVarName][] = $aUserFile->toTempData(); |
|
| 220 | + $aFiles[$sVarName][] = $aUserFile->toTempData(); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | // Save upload data in a temp file |
@@ -52,8 +52,7 @@ discard block |
||
| 52 | 52 | if(array_key_exists('jxnupl', $_POST)) |
| 53 | 53 | { |
| 54 | 54 | $this->sTempFile = $_POST['jxnupl']; |
| 55 | - } |
|
| 56 | - elseif(array_key_exists('jxnupl', $_GET)) |
|
| 55 | + } elseif(array_key_exists('jxnupl', $_GET)) |
|
| 57 | 56 | { |
| 58 | 57 | $this->sTempFile = $_GET['jxnupl']; |
| 59 | 58 | } |
@@ -125,8 +124,7 @@ discard block |
||
| 125 | 124 | 'extension' => pathinfo($aFile['name'][$i], PATHINFO_EXTENSION), |
| 126 | 125 | ]; |
| 127 | 126 | } |
| 128 | - } |
|
| 129 | - else |
|
| 127 | + } else |
|
| 130 | 128 | { |
| 131 | 129 | if(!$aFile['name']) |
| 132 | 130 | { |
@@ -331,8 +329,7 @@ discard block |
||
| 331 | 329 | if(count($_FILES) > 0) |
| 332 | 330 | { |
| 333 | 331 | $this->readFromHttpData(); |
| 334 | - } |
|
| 335 | - elseif(($this->sTempFile)) |
|
| 332 | + } elseif(($this->sTempFile)) |
|
| 336 | 333 | { |
| 337 | 334 | $this->readFromTempFile(); |
| 338 | 335 | } |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | use Jaxon\Jaxon; |
| 16 | 16 | use Jaxon\Plugin\Request as RequestPlugin; |
| 17 | 17 | use Jaxon\Request\Support\UploadedFile; |
| 18 | - |
|
| 19 | 18 | use Closure; |
| 20 | 19 | |
| 21 | 20 | class FileUpload extends RequestPlugin |
@@ -59,11 +59,11 @@ discard block |
||
| 59 | 59 | $this->aUserFiles = []; |
| 60 | 60 | $this->sUploadSubdir = uniqid() . DIRECTORY_SEPARATOR; |
| 61 | 61 | |
| 62 | - if(array_key_exists('jxnupl', $_POST)) |
|
| 62 | + if (array_key_exists('jxnupl', $_POST)) |
|
| 63 | 63 | { |
| 64 | 64 | $this->sTempFile = $_POST['jxnupl']; |
| 65 | 65 | } |
| 66 | - elseif(array_key_exists('jxnupl', $_GET)) |
|
| 66 | + elseif (array_key_exists('jxnupl', $_GET)) |
|
| 67 | 67 | { |
| 68 | 68 | $this->sTempFile = $_GET['jxnupl']; |
| 69 | 69 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | protected function filterFilename($sFilename, $sVarName) |
| 93 | 93 | { |
| 94 | - if(($this->fFileFilter)) |
|
| 94 | + if (($this->fFileFilter)) |
|
| 95 | 95 | { |
| 96 | 96 | $fFileFilter = $this->fFileFilter; |
| 97 | 97 | $sFilename = (string)$fFileFilter($sFilename, $sVarName); |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | $sUploadDir = $this->getOption('upload.files.' . $sFieldId . '.dir', $sDefaultUploadDir); |
| 114 | 114 | $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
| 115 | 115 | // Verify that the upload dir exists and is writable |
| 116 | - if(!is_writable($sUploadDir)) |
|
| 116 | + if (!is_writable($sUploadDir)) |
|
| 117 | 117 | { |
| 118 | 118 | throw new \Jaxon\Exception\Error($this->trans('errors.upload.access')); |
| 119 | 119 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $sUploadDir = $this->getOption('upload.default.dir'); |
| 134 | 134 | $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
| 135 | 135 | // Verify that the upload dir exists and is writable |
| 136 | - if(!is_writable($sUploadDir)) |
|
| 136 | + if (!is_writable($sUploadDir)) |
|
| 137 | 137 | { |
| 138 | 138 | throw new \Jaxon\Exception\Error($this->trans('errors.upload.access')); |
| 139 | 139 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
| 154 | 154 | $sUploadDir .= 'tmp' . DIRECTORY_SEPARATOR; |
| 155 | 155 | $sUploadTempFile = $sUploadDir . $this->sTempFile . '.json'; |
| 156 | - if(!is_readable($sUploadTempFile)) |
|
| 156 | + if (!is_readable($sUploadTempFile)) |
|
| 157 | 157 | { |
| 158 | 158 | throw new \Jaxon\Exception\Error($this->trans('errors.upload.access')); |
| 159 | 159 | } |
@@ -169,17 +169,17 @@ discard block |
||
| 169 | 169 | { |
| 170 | 170 | // Check validity of the uploaded files |
| 171 | 171 | $aTempFiles = []; |
| 172 | - foreach($_FILES as $sVarName => $aFile) |
|
| 172 | + foreach ($_FILES as $sVarName => $aFile) |
|
| 173 | 173 | { |
| 174 | - if(is_array($aFile['name'])) |
|
| 174 | + if (is_array($aFile['name'])) |
|
| 175 | 175 | { |
| 176 | - for($i = 0; $i < count($aFile['name']); $i++) |
|
| 176 | + for ($i = 0; $i < count($aFile['name']); $i++) |
|
| 177 | 177 | { |
| 178 | - if(!$aFile['name'][$i]) |
|
| 178 | + if (!$aFile['name'][$i]) |
|
| 179 | 179 | { |
| 180 | 180 | continue; |
| 181 | 181 | } |
| 182 | - if(!array_key_exists($sVarName, $aTempFiles)) |
|
| 182 | + if (!array_key_exists($sVarName, $aTempFiles)) |
|
| 183 | 183 | { |
| 184 | 184 | $aTempFiles[$sVarName] = []; |
| 185 | 185 | } |
@@ -199,11 +199,11 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | else |
| 201 | 201 | { |
| 202 | - if(!$aFile['name']) |
|
| 202 | + if (!$aFile['name']) |
|
| 203 | 203 | { |
| 204 | 204 | continue; |
| 205 | 205 | } |
| 206 | - if(!array_key_exists($sVarName, $aTempFiles)) |
|
| 206 | + if (!array_key_exists($sVarName, $aTempFiles)) |
|
| 207 | 207 | { |
| 208 | 208 | $aTempFiles[$sVarName] = []; |
| 209 | 209 | } |
@@ -223,17 +223,17 @@ discard block |
||
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | // Check uploaded files validity |
| 226 | - foreach($aTempFiles as $sVarName => $aFiles) |
|
| 226 | + foreach ($aTempFiles as $sVarName => $aFiles) |
|
| 227 | 227 | { |
| 228 | - foreach($aFiles as $aFile) |
|
| 228 | + foreach ($aFiles as $aFile) |
|
| 229 | 229 | { |
| 230 | 230 | // Verify upload result |
| 231 | - if($aFile['error'] != 0) |
|
| 231 | + if ($aFile['error'] != 0) |
|
| 232 | 232 | { |
| 233 | 233 | throw new \Jaxon\Exception\Error($this->trans('errors.upload.failed', $aFile)); |
| 234 | 234 | } |
| 235 | 235 | // Verify file validity (format, size) |
| 236 | - if(!$this->validateUploadedFile($sVarName, $aFile)) |
|
| 236 | + if (!$this->validateUploadedFile($sVarName, $aFile)) |
|
| 237 | 237 | { |
| 238 | 238 | throw new \Jaxon\Exception\Error($this->getValidatorMessage()); |
| 239 | 239 | } |
@@ -243,10 +243,10 @@ discard block |
||
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | // Copy the uploaded files from the temp dir to the user dir |
| 246 | - foreach($aTempFiles as $sVarName => $aTempFiles) |
|
| 246 | + foreach ($aTempFiles as $sVarName => $aTempFiles) |
|
| 247 | 247 | { |
| 248 | 248 | $this->aUserFiles[$sVarName] = []; |
| 249 | - foreach($aTempFiles as $aFile) |
|
| 249 | + foreach ($aTempFiles as $aFile) |
|
| 250 | 250 | { |
| 251 | 251 | // Get the path to the upload dir |
| 252 | 252 | $sUploadDir = $this->getUploadDir($sVarName); |
@@ -268,10 +268,10 @@ discard block |
||
| 268 | 268 | { |
| 269 | 269 | // Convert uploaded file to an array |
| 270 | 270 | $aFiles = []; |
| 271 | - foreach($this->aUserFiles as $sVarName => $aUserFiles) |
|
| 271 | + foreach ($this->aUserFiles as $sVarName => $aUserFiles) |
|
| 272 | 272 | { |
| 273 | 273 | $aFiles[$sVarName] = []; |
| 274 | - foreach($aUserFiles as $aUserFile) |
|
| 274 | + foreach ($aUserFiles as $aUserFile) |
|
| 275 | 275 | { |
| 276 | 276 | $aFiles[$sVarName][] = $aUserFile->toTempData(); |
| 277 | 277 | } |
@@ -292,10 +292,10 @@ discard block |
||
| 292 | 292 | // Upload temp file |
| 293 | 293 | $sUploadTempFile = $this->getUploadTempFile(); |
| 294 | 294 | $aFiles = json_decode(file_get_contents($sUploadTempFile), true); |
| 295 | - foreach($aFiles as $sVarName => $aUserFiles) |
|
| 295 | + foreach ($aFiles as $sVarName => $aUserFiles) |
|
| 296 | 296 | { |
| 297 | 297 | $this->aUserFiles[$sVarName] = []; |
| 298 | - foreach($aUserFiles as $aUserFile) |
|
| 298 | + foreach ($aUserFiles as $aUserFile) |
|
| 299 | 299 | { |
| 300 | 300 | $this->aUserFiles[$sVarName][] = UploadedFile::fromTempData($aUserFile); |
| 301 | 301 | } |
@@ -372,15 +372,15 @@ discard block |
||
| 372 | 372 | */ |
| 373 | 373 | public function processRequest() |
| 374 | 374 | { |
| 375 | - if(!$this->canProcessRequest()) |
|
| 375 | + if (!$this->canProcessRequest()) |
|
| 376 | 376 | { |
| 377 | 377 | return false; |
| 378 | 378 | } |
| 379 | - if(count($_FILES) > 0) |
|
| 379 | + if (count($_FILES) > 0) |
|
| 380 | 380 | { |
| 381 | 381 | $this->readFromHttpData(); |
| 382 | 382 | } |
| 383 | - elseif(($this->sTempFile)) |
|
| 383 | + elseif (($this->sTempFile)) |
|
| 384 | 384 | { |
| 385 | 385 | $this->readFromTempFile(); |
| 386 | 386 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | public function saveUploadedFiles() |
| 396 | 396 | { |
| 397 | 397 | // Process uploaded files |
| 398 | - if(!$this->processRequest()) |
|
| 398 | + if (!$this->processRequest()) |
|
| 399 | 399 | { |
| 400 | 400 | return ''; |
| 401 | 401 | } |
@@ -14,18 +14,18 @@ |
||
| 14 | 14 | jaxon.config.defaultMode = "<?php echo $this->sDefaultMode ?>"; |
| 15 | 15 | jaxon.config.defaultMethod = "<?php echo $this->sDefaultMethod ?>"; |
| 16 | 16 | jaxon.config.responseType = "<?php echo $this->sResponseType ?>"; |
| 17 | -<?php if($this->nResponseQueueSize > 0): ?> |
|
| 17 | +<?php if ($this->nResponseQueueSize > 0): ?> |
|
| 18 | 18 | jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>; |
| 19 | 19 | <?php endif ?> |
| 20 | -<?php if(($this->bDebug)): ?> |
|
| 21 | -<?php if(($this->sDebugOutputID)): ?> |
|
| 20 | +<?php if (($this->bDebug)): ?> |
|
| 21 | +<?php if (($this->sDebugOutputID)): ?> |
|
| 22 | 22 | jaxon.debug.outputID = "<?php echo $this->sDebugOutputID ?>"; |
| 23 | 23 | <?php endif ?> |
| 24 | -<?php if(($this->bVerboseDebug)): ?> |
|
| 24 | +<?php if (($this->bVerboseDebug)): ?> |
|
| 25 | 25 | jaxon.debug.verbose.active = true; |
| 26 | 26 | <?php endif ?> |
| 27 | 27 | <?php endif ?> |
| 28 | -<?php if(($this->sCsrfMetaName)): ?> |
|
| 28 | +<?php if (($this->sCsrfMetaName)): ?> |
|
| 29 | 29 | metaTags = document.getElementsByTagName('meta'); |
| 30 | 30 | for(i = 0; i < metaTags.length; i++) |
| 31 | 31 | { |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * @param array $aAttributes Associative array of attributes that will describe the command |
| 160 | 160 | * @param mixed $mData The data to be associated with this command |
| 161 | 161 | * |
| 162 | - * @return \Jaxon\Plugin\Response |
|
| 162 | + * @return Response |
|
| 163 | 163 | */ |
| 164 | 164 | public function addCommand($aAttributes, $mData) |
| 165 | 165 | { |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | /** |
| 201 | 201 | * Clear all the commands already added to the response |
| 202 | 202 | * |
| 203 | - * @return \Jaxon\Plugin\Response |
|
| 203 | + * @return Response |
|
| 204 | 204 | */ |
| 205 | 205 | public function clearCommands() |
| 206 | 206 | { |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @param \Jaxon\Plugin\Plugin $xPlugin The plugin object |
| 216 | 216 | * @param array $aAttributes The attributes for this response command |
| 217 | - * @param mixed $mData The data to be sent with this command |
|
| 217 | + * @param string $mData The data to be sent with this command |
|
| 218 | 218 | * |
| 219 | - * @return \Jaxon\Plugin\Response |
|
| 219 | + * @return Response |
|
| 220 | 220 | */ |
| 221 | 221 | public function addPluginCommand($xPlugin, $aAttributes, $mData) |
| 222 | 222 | { |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | * @param integer $iCmdNumber The number of commands to skip upon cancel |
| 278 | 278 | * @param string $sMessage The message to display to the user |
| 279 | 279 | * |
| 280 | - * @return \Jaxon\Plugin\Response |
|
| 280 | + * @return Response |
|
| 281 | 281 | */ |
| 282 | 282 | public function confirmCommands($iCmdNumber, $sMessage) |
| 283 | 283 | { |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | * @param string $sAttribute The attribute to be assigned |
| 298 | 298 | * @param string $sData The value to be assigned to the attribute |
| 299 | 299 | * |
| 300 | - * @return \Jaxon\Plugin\Response |
|
| 300 | + * @return Response |
|
| 301 | 301 | */ |
| 302 | 302 | public function assign($sTarget, $sAttribute, $sData) |
| 303 | 303 | { |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | * @param string $sTarget The id of the html element on the browser |
| 320 | 320 | * @param string $sData The value to be assigned to the attribute |
| 321 | 321 | * |
| 322 | - * @return \Jaxon\Plugin\Response |
|
| 322 | + * @return Response |
|
| 323 | 323 | */ |
| 324 | 324 | public function html($sTarget, $sData) |
| 325 | 325 | { |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | * @param string $sAttribute The name of the attribute to be appended to |
| 334 | 334 | * @param string $sData The data to be appended to the attribute |
| 335 | 335 | * |
| 336 | - * @return \Jaxon\Plugin\Response |
|
| 336 | + * @return Response |
|
| 337 | 337 | */ |
| 338 | 338 | public function append($sTarget, $sAttribute, $sData) |
| 339 | 339 | { |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | * @param string $sAttribute The name of the attribute to be prepended to |
| 355 | 355 | * @param string $sData The value to be prepended to the attribute |
| 356 | 356 | * |
| 357 | - * @return \Jaxon\Plugin\Response |
|
| 357 | + * @return Response |
|
| 358 | 358 | */ |
| 359 | 359 | public function prepend($sTarget, $sAttribute, $sData) |
| 360 | 360 | { |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | * @param string $sSearch The needle to search for |
| 377 | 377 | * @param string $sData The data to use in place of the needle |
| 378 | 378 | * |
| 379 | - * @return \Jaxon\Plugin\Response |
|
| 379 | + * @return Response |
|
| 380 | 380 | */ |
| 381 | 381 | public function replace($sTarget, $sAttribute, $sSearch, $sData) |
| 382 | 382 | { |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | * @param string $sTarget The id of the element to be updated. |
| 400 | 400 | * @param string $sAttribute The attribute to be cleared |
| 401 | 401 | * |
| 402 | - * @return \Jaxon\Plugin\Response |
|
| 402 | + * @return Response |
|
| 403 | 403 | */ |
| 404 | 404 | public function clear($sTarget, $sAttribute) |
| 405 | 405 | { |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | * @param string $sAttribute The attribute to be updated |
| 416 | 416 | * @param string $sData The value to assign |
| 417 | 417 | * |
| 418 | - * @return \Jaxon\Plugin\Response |
|
| 418 | + * @return Response |
|
| 419 | 419 | */ |
| 420 | 420 | public function contextAssign($sAttribute, $sData) |
| 421 | 421 | { |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | * @param string $sAttribute The attribute to be appended to |
| 438 | 438 | * @param string $sData The value to append |
| 439 | 439 | * |
| 440 | - * @return \Jaxon\Plugin\Response |
|
| 440 | + * @return Response |
|
| 441 | 441 | */ |
| 442 | 442 | public function contextAppend($sAttribute, $sData) |
| 443 | 443 | { |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | * @param string $sAttribute The attribute to be updated |
| 460 | 460 | * @param string $sData The value to be prepended |
| 461 | 461 | * |
| 462 | - * @return \Jaxon\Plugin\Response |
|
| 462 | + * @return Response |
|
| 463 | 463 | */ |
| 464 | 464 | public function contextPrepend($sAttribute, $sData) |
| 465 | 465 | { |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | * |
| 481 | 481 | * @param string $sAttribute The attribute to be cleared |
| 482 | 482 | * |
| 483 | - * @return \Jaxon\Plugin\Response |
|
| 483 | + * @return Response |
|
| 484 | 484 | */ |
| 485 | 485 | public function contextClear($sAttribute) |
| 486 | 486 | { |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | * |
| 493 | 493 | * @param string $sMessage The message to be displayed |
| 494 | 494 | * |
| 495 | - * @return \Jaxon\Plugin\Response |
|
| 495 | + * @return Response |
|
| 496 | 496 | */ |
| 497 | 497 | public function alert($sMessage) |
| 498 | 498 | { |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | * |
| 510 | 510 | * @param string $sMessage The message to be displayed |
| 511 | 511 | * |
| 512 | - * @return \Jaxon\Plugin\Response |
|
| 512 | + * @return Response |
|
| 513 | 513 | */ |
| 514 | 514 | public function debug($sMessage) |
| 515 | 515 | { |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | * @param string $sURL The relative or fully qualified URL |
| 528 | 528 | * @param integer $iDelay Number of seconds to delay before the redirect occurs |
| 529 | 529 | * |
| 530 | - * @return \Jaxon\Plugin\Response |
|
| 530 | + * @return Response |
|
| 531 | 531 | */ |
| 532 | 532 | public function redirect($sURL, $iDelay=0) |
| 533 | 533 | { |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | * |
| 581 | 581 | * @param string $sJS The script to execute |
| 582 | 582 | * |
| 583 | - * @return \Jaxon\Plugin\Response |
|
| 583 | + * @return Response |
|
| 584 | 584 | */ |
| 585 | 585 | public function script($sJS) |
| 586 | 586 | { |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | * |
| 598 | 598 | * @param string $sFunc The name of the function to call |
| 599 | 599 | * |
| 600 | - * @return \Jaxon\Plugin\Response |
|
| 600 | + * @return Response |
|
| 601 | 601 | */ |
| 602 | 602 | public function call($sFunc) |
| 603 | 603 | { |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | * |
| 618 | 618 | * @param string $sTarget The id of the element to be removed |
| 619 | 619 | * |
| 620 | - * @return \Jaxon\Plugin\Response |
|
| 620 | + * @return Response |
|
| 621 | 621 | */ |
| 622 | 622 | public function remove($sTarget) |
| 623 | 623 | { |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | * @param string $sTag The tag name to be used for the new element |
| 638 | 638 | * @param string $sId The id to assign to the new element |
| 639 | 639 | * |
| 640 | - * @return \Jaxon\Plugin\Response |
|
| 640 | + * @return Response |
|
| 641 | 641 | */ |
| 642 | 642 | public function create($sParent, $sTag, $sId) |
| 643 | 643 | { |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | * @param string $sTag The tag name to be used for the new element |
| 659 | 659 | * @param string $sId The id to assign to the new element |
| 660 | 660 | * |
| 661 | - * @return \Jaxon\Plugin\Response |
|
| 661 | + * @return Response |
|
| 662 | 662 | */ |
| 663 | 663 | public function insert($sBefore, $sTag, $sId) |
| 664 | 664 | { |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | * @param string $sTag The tag name to be used for the new element |
| 680 | 680 | * @param string $sId The id to assign to the new element |
| 681 | 681 | * |
| 682 | - * @return \Jaxon\Plugin\Response |
|
| 682 | + * @return Response |
|
| 683 | 683 | */ |
| 684 | 684 | public function insertAfter($sAfter, $sTag, $sId) |
| 685 | 685 | { |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | * @param string $sName The name of the new input element |
| 702 | 702 | * @param string $sId The id of the new element |
| 703 | 703 | * |
| 704 | - * @return \Jaxon\Plugin\Response |
|
| 704 | + * @return Response |
|
| 705 | 705 | */ |
| 706 | 706 | public function createInput($sParent, $sType, $sName, $sId) |
| 707 | 707 | { |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | * @param string $sName The name of the new input element |
| 725 | 725 | * @param string $sId The id of the new element |
| 726 | 726 | * |
| 727 | - * @return \Jaxon\Plugin\Response |
|
| 727 | + * @return Response |
|
| 728 | 728 | */ |
| 729 | 729 | public function insertInput($sBefore, $sType, $sName, $sId) |
| 730 | 730 | { |
@@ -747,7 +747,7 @@ discard block |
||
| 747 | 747 | * @param string $sName The name of the new input element |
| 748 | 748 | * @param string $sId The id of the new element |
| 749 | 749 | * |
| 750 | - * @return \Jaxon\Plugin\Response |
|
| 750 | + * @return Response |
|
| 751 | 751 | */ |
| 752 | 752 | public function insertInputAfter($sAfter, $sType, $sName, $sId) |
| 753 | 753 | { |
@@ -769,7 +769,7 @@ discard block |
||
| 769 | 769 | * @param string $sEvent The name of the event |
| 770 | 770 | * @param string $sScript The javascript to execute when the event is fired |
| 771 | 771 | * |
| 772 | - * @return \Jaxon\Plugin\Response |
|
| 772 | + * @return Response |
|
| 773 | 773 | */ |
| 774 | 774 | public function setEvent($sTarget, $sEvent, $sScript) |
| 775 | 775 | { |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | * @param string $sTarget The id of the element that contains the event |
| 790 | 790 | * @param string $sScript The javascript to execute when the event is fired |
| 791 | 791 | * |
| 792 | - * @return \Jaxon\Plugin\Response |
|
| 792 | + * @return Response |
|
| 793 | 793 | */ |
| 794 | 794 | public function onClick($sTarget, $sScript) |
| 795 | 795 | { |
@@ -805,7 +805,7 @@ discard block |
||
| 805 | 805 | * @param string $sEvent The name of the event |
| 806 | 806 | * @param string $sHandler The name of the javascript function to call when the event is fired |
| 807 | 807 | * |
| 808 | - * @return \Jaxon\Plugin\Response |
|
| 808 | + * @return Response |
|
| 809 | 809 | */ |
| 810 | 810 | public function addHandler($sTarget, $sEvent, $sHandler) |
| 811 | 811 | { |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | * @param string $sEvent The name of the event |
| 827 | 827 | * @param string $sHandler The name of the javascript function called when the event is fired |
| 828 | 828 | * |
| 829 | - * @return \Jaxon\Plugin\Response |
|
| 829 | + * @return Response |
|
| 830 | 830 | */ |
| 831 | 831 | public function removeHandler($sTarget, $sEvent, $sHandler) |
| 832 | 832 | { |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | * @param string $sArgs Comma separated list of parameter names |
| 848 | 848 | * @param string $sScript The javascript code that will become the body of the function |
| 849 | 849 | * |
| 850 | - * @return \Jaxon\Plugin\Response |
|
| 850 | + * @return Response |
|
| 851 | 851 | */ |
| 852 | 852 | public function setFunction($sFunction, $sArgs, $sScript) |
| 853 | 853 | { |
@@ -874,7 +874,7 @@ discard block |
||
| 874 | 874 | * @param string $sReturnValueVar The name of the variable that will retain the return value |
| 875 | 875 | * from the call to the original function |
| 876 | 876 | * |
| 877 | - * @return \Jaxon\Plugin\Response |
|
| 877 | + * @return Response |
|
| 878 | 878 | */ |
| 879 | 879 | public function wrapFunction($sFunction, $sArgs, $aScripts, $sReturnValueVar) |
| 880 | 880 | { |
@@ -895,7 +895,7 @@ discard block |
||
| 895 | 895 | * @param string $sFileName The relative or fully qualified URI of the javascript file |
| 896 | 896 | * @param string $sType Determines the script type. Defaults to 'text/javascript' |
| 897 | 897 | * |
| 898 | - * @return \Jaxon\Plugin\Response |
|
| 898 | + * @return Response |
|
| 899 | 899 | */ |
| 900 | 900 | public function includeScript($sFileName, $sType = null, $sId = null) |
| 901 | 901 | { |
@@ -916,7 +916,7 @@ discard block |
||
| 916 | 916 | * @param string $sFileName The relative or fully qualified URI of the javascript file |
| 917 | 917 | * @param string $sType Determines the script type. Defaults to 'text/javascript' |
| 918 | 918 | * |
| 919 | - * @return \Jaxon\Plugin\Response |
|
| 919 | + * @return Response |
|
| 920 | 920 | */ |
| 921 | 921 | public function includeScriptOnce($sFileName, $sType = null, $sId = null) |
| 922 | 922 | { |
@@ -939,7 +939,7 @@ discard block |
||
| 939 | 939 | * @param string $sFileName The relative or fully qualified URI of the javascript file |
| 940 | 940 | * @param string $sUnload Name of a javascript function to call prior to unlaoding the file |
| 941 | 941 | * |
| 942 | - * @return \Jaxon\Plugin\Response |
|
| 942 | + * @return Response |
|
| 943 | 943 | */ |
| 944 | 944 | public function removeScript($sFileName, $sUnload = '') |
| 945 | 945 | { |
@@ -960,7 +960,7 @@ discard block |
||
| 960 | 960 | * @param string $sFileName The relative or fully qualified URI of the css file |
| 961 | 961 | * @param string $sMedia The media type of the CSS file. Defaults to 'screen' |
| 962 | 962 | * |
| 963 | - * @return \Jaxon\Plugin\Response |
|
| 963 | + * @return Response |
|
| 964 | 964 | */ |
| 965 | 965 | public function includeCSS($sFileName, $sMedia = null) |
| 966 | 966 | { |
@@ -979,7 +979,7 @@ discard block |
||
| 979 | 979 | * |
| 980 | 980 | * @param string $sFileName The relative or fully qualified URI of the css file |
| 981 | 981 | * |
| 982 | - * @return \Jaxon\Plugin\Response |
|
| 982 | + * @return Response |
|
| 983 | 983 | */ |
| 984 | 984 | public function removeCSS($sFileName, $sMedia = null) |
| 985 | 985 | { |
@@ -1004,7 +1004,7 @@ discard block |
||
| 1004 | 1004 | * @param integer $iTimeout The number of 1/10ths of a second to pause before timing out |
| 1005 | 1005 | * and continuing with the execution of the response commands |
| 1006 | 1006 | * |
| 1007 | - * @return \Jaxon\Plugin\Response |
|
| 1007 | + * @return Response |
|
| 1008 | 1008 | */ |
| 1009 | 1009 | public function waitForCSS($iTimeout = 600) |
| 1010 | 1010 | { |
@@ -1029,7 +1029,7 @@ discard block |
||
| 1029 | 1029 | * @param integer $tenths The number of 1/10ths of a second to wait before timing out |
| 1030 | 1030 | * and continuing with the execution of the response commands. |
| 1031 | 1031 | * |
| 1032 | - * @return \Jaxon\Plugin\Response |
|
| 1032 | + * @return Response |
|
| 1033 | 1033 | */ |
| 1034 | 1034 | public function waitFor($script, $tenths) |
| 1035 | 1035 | { |
@@ -1050,7 +1050,7 @@ discard block |
||
| 1050 | 1050 | * |
| 1051 | 1051 | * @param integer $tenths The number of 1/10ths of a second to sleep |
| 1052 | 1052 | * |
| 1053 | - * @return \Jaxon\Plugin\Response |
|
| 1053 | + * @return Response |
|
| 1054 | 1054 | */ |
| 1055 | 1055 | public function sleep($tenths) |
| 1056 | 1056 | { |
@@ -1079,7 +1079,7 @@ discard block |
||
| 1079 | 1079 | * @param string $variable The DOM element name (id or class) |
| 1080 | 1080 | * @param string $tag The HTML tag of the new DOM element |
| 1081 | 1081 | * |
| 1082 | - * @return \Jaxon\Plugin\Response |
|
| 1082 | + * @return Response |
|
| 1083 | 1083 | */ |
| 1084 | 1084 | public function domCreateElement($variable, $tag) |
| 1085 | 1085 | { |
@@ -1099,7 +1099,7 @@ discard block |
||
| 1099 | 1099 | * @param string $key The name of the attribute |
| 1100 | 1100 | * @param string $value The value of the attribute |
| 1101 | 1101 | * |
| 1102 | - * @return \Jaxon\Plugin\Response |
|
| 1102 | + * @return Response |
|
| 1103 | 1103 | */ |
| 1104 | 1104 | public function domSetAttribute($variable, $key, $value) |
| 1105 | 1105 | { |
@@ -1120,7 +1120,7 @@ discard block |
||
| 1120 | 1120 | * @param string $skip The ?? |
| 1121 | 1121 | * @param string $remove The ?? |
| 1122 | 1122 | * |
| 1123 | - * @return \Jaxon\Plugin\Response |
|
| 1123 | + * @return Response |
|
| 1124 | 1124 | */ |
| 1125 | 1125 | public function domRemoveChildren($parent, $skip = null, $remove = null) |
| 1126 | 1126 | { |
@@ -1141,7 +1141,7 @@ discard block |
||
| 1141 | 1141 | * @param string $parent The DOM parent element |
| 1142 | 1142 | * @param string $variable The DOM element name (id or class) |
| 1143 | 1143 | * |
| 1144 | - * @return \Jaxon\Plugin\Response |
|
| 1144 | + * @return Response |
|
| 1145 | 1145 | */ |
| 1146 | 1146 | public function domAppendChild($parent, $variable) |
| 1147 | 1147 | { |
@@ -1160,7 +1160,7 @@ discard block |
||
| 1160 | 1160 | * @param string $target The DOM target element |
| 1161 | 1161 | * @param string $variable The DOM element name (id or class) |
| 1162 | 1162 | * |
| 1163 | - * @return \Jaxon\Plugin\Response |
|
| 1163 | + * @return Response |
|
| 1164 | 1164 | */ |
| 1165 | 1165 | public function domInsertBefore($target, $variable) |
| 1166 | 1166 | { |
@@ -1179,7 +1179,7 @@ discard block |
||
| 1179 | 1179 | * @param string $target The DOM target element |
| 1180 | 1180 | * @param string $variable The DOM element name (id or class) |
| 1181 | 1181 | * |
| 1182 | - * @return \Jaxon\Plugin\Response |
|
| 1182 | + * @return Response |
|
| 1183 | 1183 | */ |
| 1184 | 1184 | public function domInsertAfter($target, $variable) |
| 1185 | 1185 | { |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | * @param string $parent The DOM parent element |
| 1199 | 1199 | * @param string $text The HTML text to append |
| 1200 | 1200 | * |
| 1201 | - * @return \Jaxon\Plugin\Response |
|
| 1201 | + * @return Response |
|
| 1202 | 1202 | */ |
| 1203 | 1203 | public function domAppendText($parent, $text) |
| 1204 | 1204 | { |
@@ -1239,7 +1239,7 @@ discard block |
||
| 1239 | 1239 | * |
| 1240 | 1240 | * @param mixed $value Any value |
| 1241 | 1241 | * |
| 1242 | - * @return \Jaxon\Plugin\Response |
|
| 1242 | + * @return Response |
|
| 1243 | 1243 | */ |
| 1244 | 1244 | public function setReturnValue($value) |
| 1245 | 1245 | { |
@@ -174,20 +174,17 @@ discard block |
||
| 174 | 174 | $aLastCommand['cmd'] == 'js') |
| 175 | 175 | { |
| 176 | 176 | $mData = $aLastCommand['data'].'; '.$mData; |
| 177 | - } |
|
| 178 | - elseif($this->getOption('core.response.merge.ap') && |
|
| 177 | + } elseif($this->getOption('core.response.merge.ap') && |
|
| 179 | 178 | $aLastCommand['cmd'] == 'ap' && |
| 180 | 179 | $aLastCommand['id'] == $aAttributes['id'] && |
| 181 | 180 | $aLastCommand['prop'] == $aAttributes['prop']) |
| 182 | 181 | { |
| 183 | 182 | $mData = $aLastCommand['data'].' '.$mData; |
| 184 | - } |
|
| 185 | - else |
|
| 183 | + } else |
|
| 186 | 184 | { |
| 187 | 185 | $this->aCommands[] = $aLastCommand; |
| 188 | 186 | } |
| 189 | - } |
|
| 190 | - else |
|
| 187 | + } else |
|
| 191 | 188 | { |
| 192 | 189 | $this->aCommands[] = $aLastCommand; |
| 193 | 190 | } |
@@ -244,24 +241,20 @@ discard block |
||
| 244 | 241 | if($bBefore) |
| 245 | 242 | { |
| 246 | 243 | $this->aCommands = array_merge($mCommands->aCommands, $this->aCommands); |
| 247 | - } |
|
| 248 | - else |
|
| 244 | + } else |
|
| 249 | 245 | { |
| 250 | 246 | $this->aCommands = array_merge($this->aCommands, $mCommands->aCommands); |
| 251 | 247 | } |
| 252 | - } |
|
| 253 | - elseif(is_array($mCommands)) |
|
| 248 | + } elseif(is_array($mCommands)) |
|
| 254 | 249 | { |
| 255 | 250 | if($bBefore) |
| 256 | 251 | { |
| 257 | 252 | $this->aCommands = array_merge($mCommands, $this->aCommands); |
| 258 | - } |
|
| 259 | - else |
|
| 253 | + } else |
|
| 260 | 254 | { |
| 261 | 255 | $this->aCommands = array_merge($this->aCommands, $mCommands); |
| 262 | 256 | } |
| 263 | - } |
|
| 264 | - else |
|
| 257 | + } else |
|
| 265 | 258 | { |
| 266 | 259 | if(!empty($mCommands)) |
| 267 | 260 | { |
@@ -541,8 +534,9 @@ discard block |
||
| 541 | 534 | { |
| 542 | 535 | $queryStart++; |
| 543 | 536 | $queryEnd = strpos($sURL, '#', $queryStart); |
| 544 | - if($queryEnd === false) |
|
| 545 | - $queryEnd = strlen($sURL); |
|
| 537 | + if($queryEnd === false) { |
|
| 538 | + $queryEnd = strlen($sURL); |
|
| 539 | + } |
|
| 546 | 540 | $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart); |
| 547 | 541 | parse_str($queryPart, $queryParts); |
| 548 | 542 | $newQueryPart = ""; |
@@ -551,10 +545,11 @@ discard block |
||
| 551 | 545 | $first = true; |
| 552 | 546 | foreach($queryParts as $key => $value) |
| 553 | 547 | { |
| 554 | - if($first) |
|
| 555 | - $first = false; |
|
| 556 | - else |
|
| 557 | - $newQueryPart .= '&'; |
|
| 548 | + if($first) { |
|
| 549 | + $first = false; |
|
| 550 | + } else { |
|
| 551 | + $newQueryPart .= '&'; |
|
| 552 | + } |
|
| 558 | 553 | $newQueryPart .= rawurlencode($key).'='.rawurlencode($value); |
| 559 | 554 | } |
| 560 | 555 | } elseif($_SERVER['QUERY_STRING']) { |
@@ -565,10 +560,11 @@ discard block |
||
| 565 | 560 | } |
| 566 | 561 | $sURL = str_replace($queryPart, $newQueryPart, $sURL); |
| 567 | 562 | } |
| 568 | - if($iDelay) |
|
| 569 | - $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');'); |
|
| 570 | - else |
|
| 571 | - $this->script('window.location = "' . $sURL . '";'); |
|
| 563 | + if($iDelay) { |
|
| 564 | + $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');'); |
|
| 565 | + } else { |
|
| 566 | + $this->script('window.location = "' . $sURL . '";'); |
|
| 567 | + } |
|
| 572 | 568 | return $this; |
| 573 | 569 | } |
| 574 | 570 | |
@@ -903,11 +899,13 @@ discard block |
||
| 903 | 899 | { |
| 904 | 900 | $command = array('cmd' => 'in'); |
| 905 | 901 | |
| 906 | - if(($sType)) |
|
| 907 | - $command['type'] = trim((string)$sType, " \t"); |
|
| 902 | + if(($sType)) { |
|
| 903 | + $command['type'] = trim((string)$sType, " \t"); |
|
| 904 | + } |
|
| 908 | 905 | |
| 909 | - if(($sId)) |
|
| 910 | - $command['elm_id'] = trim((string)$sId, " \t"); |
|
| 906 | + if(($sId)) { |
|
| 907 | + $command['elm_id'] = trim((string)$sId, " \t"); |
|
| 908 | + } |
|
| 911 | 909 | |
| 912 | 910 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
| 913 | 911 | } |
@@ -924,11 +922,13 @@ discard block |
||
| 924 | 922 | { |
| 925 | 923 | $command = array('cmd' => 'ino'); |
| 926 | 924 | |
| 927 | - if(($sType)) |
|
| 928 | - $command['type'] = trim((string)$sType, " \t"); |
|
| 925 | + if(($sType)) { |
|
| 926 | + $command['type'] = trim((string)$sType, " \t"); |
|
| 927 | + } |
|
| 929 | 928 | |
| 930 | - if(($sId)) |
|
| 931 | - $command['elm_id'] = trim((string)$sId, " \t"); |
|
| 929 | + if(($sId)) { |
|
| 930 | + $command['elm_id'] = trim((string)$sId, " \t"); |
|
| 931 | + } |
|
| 932 | 932 | |
| 933 | 933 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
| 934 | 934 | } |
@@ -968,8 +968,9 @@ discard block |
||
| 968 | 968 | { |
| 969 | 969 | $command = array('cmd' => 'css'); |
| 970 | 970 | |
| 971 | - if(($sMedia)) |
|
| 972 | - $command['media'] = trim((string)$sMedia, " \t"); |
|
| 971 | + if(($sMedia)) { |
|
| 972 | + $command['media'] = trim((string)$sMedia, " \t"); |
|
| 973 | + } |
|
| 973 | 974 | |
| 974 | 975 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
| 975 | 976 | } |
@@ -987,8 +988,9 @@ discard block |
||
| 987 | 988 | { |
| 988 | 989 | $command = array('cmd' => 'rcss'); |
| 989 | 990 | |
| 990 | - if(($sMedia)) |
|
| 991 | - $command['media'] = trim((string)$sMedia, " \t"); |
|
| 991 | + if(($sMedia)) { |
|
| 992 | + $command['media'] = trim((string)$sMedia, " \t"); |
|
| 993 | + } |
|
| 992 | 994 | |
| 993 | 995 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
| 994 | 996 | } |
@@ -1128,11 +1130,13 @@ discard block |
||
| 1128 | 1130 | { |
| 1129 | 1131 | $command = array('cmd' => 'DRC'); |
| 1130 | 1132 | |
| 1131 | - if(($skip)) |
|
| 1132 | - $command['skip'] = $skip; |
|
| 1133 | + if(($skip)) { |
|
| 1134 | + $command['skip'] = $skip; |
|
| 1135 | + } |
|
| 1133 | 1136 | |
| 1134 | - if(($remove)) |
|
| 1135 | - $command['remove'] = $remove; |
|
| 1137 | + if(($remove)) { |
|
| 1138 | + $command['remove'] = $remove; |
|
| 1139 | + } |
|
| 1136 | 1140 | |
| 1137 | 1141 | return $this->addCommand($command, $parent); |
| 1138 | 1142 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | public function plugin($sName) |
| 102 | 102 | { |
| 103 | 103 | $xPlugin = $this->getPluginManager()->getResponsePlugin($sName); |
| 104 | - if(!$xPlugin) |
|
| 104 | + if (!$xPlugin) |
|
| 105 | 105 | { |
| 106 | 106 | return null; |
| 107 | 107 | } |
@@ -164,23 +164,23 @@ discard block |
||
| 164 | 164 | public function addCommand($aAttributes, $mData) |
| 165 | 165 | { |
| 166 | 166 | /* merge commands if possible */ |
| 167 | - if(in_array($aAttributes['cmd'], array('js', 'ap'))) |
|
| 167 | + if (in_array($aAttributes['cmd'], array('js', 'ap'))) |
|
| 168 | 168 | { |
| 169 | - if(($aLastCommand = array_pop($this->aCommands))) |
|
| 169 | + if (($aLastCommand = array_pop($this->aCommands))) |
|
| 170 | 170 | { |
| 171 | - if($aLastCommand['cmd'] == $aAttributes['cmd']) |
|
| 171 | + if ($aLastCommand['cmd'] == $aAttributes['cmd']) |
|
| 172 | 172 | { |
| 173 | - if($this->getOption('core.response.merge.js') && |
|
| 173 | + if ($this->getOption('core.response.merge.js') && |
|
| 174 | 174 | $aLastCommand['cmd'] == 'js') |
| 175 | 175 | { |
| 176 | - $mData = $aLastCommand['data'].'; '.$mData; |
|
| 176 | + $mData = $aLastCommand['data'] . '; ' . $mData; |
|
| 177 | 177 | } |
| 178 | - elseif($this->getOption('core.response.merge.ap') && |
|
| 178 | + elseif ($this->getOption('core.response.merge.ap') && |
|
| 179 | 179 | $aLastCommand['cmd'] == 'ap' && |
| 180 | 180 | $aLastCommand['id'] == $aAttributes['id'] && |
| 181 | 181 | $aLastCommand['prop'] == $aAttributes['prop']) |
| 182 | 182 | { |
| 183 | - $mData = $aLastCommand['data'].' '.$mData; |
|
| 183 | + $mData = $aLastCommand['data'] . ' ' . $mData; |
|
| 184 | 184 | } |
| 185 | 185 | else |
| 186 | 186 | { |
@@ -237,11 +237,11 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | public function appendResponse($mCommands, $bBefore = false) |
| 239 | 239 | { |
| 240 | - if($mCommands instanceof Response) |
|
| 240 | + if ($mCommands instanceof Response) |
|
| 241 | 241 | { |
| 242 | 242 | $this->returnValue = $mCommands->returnValue; |
| 243 | 243 | |
| 244 | - if($bBefore) |
|
| 244 | + if ($bBefore) |
|
| 245 | 245 | { |
| 246 | 246 | $this->aCommands = array_merge($mCommands->aCommands, $this->aCommands); |
| 247 | 247 | } |
@@ -250,9 +250,9 @@ discard block |
||
| 250 | 250 | $this->aCommands = array_merge($this->aCommands, $mCommands->aCommands); |
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | - elseif(is_array($mCommands)) |
|
| 253 | + elseif (is_array($mCommands)) |
|
| 254 | 254 | { |
| 255 | - if($bBefore) |
|
| 255 | + if ($bBefore) |
|
| 256 | 256 | { |
| 257 | 257 | $this->aCommands = array_merge($mCommands, $this->aCommands); |
| 258 | 258 | } |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | else |
| 265 | 265 | { |
| 266 | - if(!empty($mCommands)) |
|
| 266 | + if (!empty($mCommands)) |
|
| 267 | 267 | { |
| 268 | 268 | throw new \Jaxon\Exception\Error($this->trans('errors.response.data.invalid')); |
| 269 | 269 | } |
@@ -531,33 +531,33 @@ discard block |
||
| 531 | 531 | * |
| 532 | 532 | * @return \Jaxon\Plugin\Response |
| 533 | 533 | */ |
| 534 | - public function redirect($sURL, $iDelay=0) |
|
| 534 | + public function redirect($sURL, $iDelay = 0) |
|
| 535 | 535 | { |
| 536 | 536 | // we need to parse the query part so that the values are rawurlencode()'ed |
| 537 | 537 | // can't just use parse_url() cos we could be dealing with a relative URL which |
| 538 | 538 | // parse_url() can't deal with. |
| 539 | 539 | $queryStart = strpos($sURL, '?', strrpos($sURL, '/')); |
| 540 | - if($queryStart !== false) |
|
| 540 | + if ($queryStart !== false) |
|
| 541 | 541 | { |
| 542 | 542 | $queryStart++; |
| 543 | 543 | $queryEnd = strpos($sURL, '#', $queryStart); |
| 544 | - if($queryEnd === false) |
|
| 544 | + if ($queryEnd === false) |
|
| 545 | 545 | $queryEnd = strlen($sURL); |
| 546 | - $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart); |
|
| 546 | + $queryPart = substr($sURL, $queryStart, $queryEnd - $queryStart); |
|
| 547 | 547 | parse_str($queryPart, $queryParts); |
| 548 | 548 | $newQueryPart = ""; |
| 549 | - if($queryParts) |
|
| 549 | + if ($queryParts) |
|
| 550 | 550 | { |
| 551 | 551 | $first = true; |
| 552 | - foreach($queryParts as $key => $value) |
|
| 552 | + foreach ($queryParts as $key => $value) |
|
| 553 | 553 | { |
| 554 | - if($first) |
|
| 554 | + if ($first) |
|
| 555 | 555 | $first = false; |
| 556 | 556 | else |
| 557 | 557 | $newQueryPart .= '&'; |
| 558 | - $newQueryPart .= rawurlencode($key).'='.rawurlencode($value); |
|
| 558 | + $newQueryPart .= rawurlencode($key) . '=' . rawurlencode($value); |
|
| 559 | 559 | } |
| 560 | - } elseif($_SERVER['QUERY_STRING']) { |
|
| 560 | + } elseif ($_SERVER['QUERY_STRING']) { |
|
| 561 | 561 | //couldn't break up the query, but there's one there |
| 562 | 562 | //possibly "http://url/page.html?query1234" type of query? |
| 563 | 563 | //just encode it and hope it works |
@@ -565,8 +565,8 @@ discard block |
||
| 565 | 565 | } |
| 566 | 566 | $sURL = str_replace($queryPart, $newQueryPart, $sURL); |
| 567 | 567 | } |
| 568 | - if($iDelay) |
|
| 569 | - $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');'); |
|
| 568 | + if ($iDelay) |
|
| 569 | + $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay * 1000) . ');'); |
|
| 570 | 570 | else |
| 571 | 571 | $this->script('window.location = "' . $sURL . '";'); |
| 572 | 572 | return $this; |
@@ -903,10 +903,10 @@ discard block |
||
| 903 | 903 | { |
| 904 | 904 | $command = array('cmd' => 'in'); |
| 905 | 905 | |
| 906 | - if(($sType)) |
|
| 906 | + if (($sType)) |
|
| 907 | 907 | $command['type'] = trim((string)$sType, " \t"); |
| 908 | 908 | |
| 909 | - if(($sId)) |
|
| 909 | + if (($sId)) |
|
| 910 | 910 | $command['elm_id'] = trim((string)$sId, " \t"); |
| 911 | 911 | |
| 912 | 912 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
@@ -924,10 +924,10 @@ discard block |
||
| 924 | 924 | { |
| 925 | 925 | $command = array('cmd' => 'ino'); |
| 926 | 926 | |
| 927 | - if(($sType)) |
|
| 927 | + if (($sType)) |
|
| 928 | 928 | $command['type'] = trim((string)$sType, " \t"); |
| 929 | 929 | |
| 930 | - if(($sId)) |
|
| 930 | + if (($sId)) |
|
| 931 | 931 | $command['elm_id'] = trim((string)$sId, " \t"); |
| 932 | 932 | |
| 933 | 933 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | { |
| 969 | 969 | $command = array('cmd' => 'css'); |
| 970 | 970 | |
| 971 | - if(($sMedia)) |
|
| 971 | + if (($sMedia)) |
|
| 972 | 972 | $command['media'] = trim((string)$sMedia, " \t"); |
| 973 | 973 | |
| 974 | 974 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | { |
| 988 | 988 | $command = array('cmd' => 'rcss'); |
| 989 | 989 | |
| 990 | - if(($sMedia)) |
|
| 990 | + if (($sMedia)) |
|
| 991 | 991 | $command['media'] = trim((string)$sMedia, " \t"); |
| 992 | 992 | |
| 993 | 993 | return $this->addCommand($command, trim((string)$sFileName, " \t")); |
@@ -1128,10 +1128,10 @@ discard block |
||
| 1128 | 1128 | { |
| 1129 | 1129 | $command = array('cmd' => 'DRC'); |
| 1130 | 1130 | |
| 1131 | - if(($skip)) |
|
| 1131 | + if (($skip)) |
|
| 1132 | 1132 | $command['skip'] = $skip; |
| 1133 | 1133 | |
| 1134 | - if(($remove)) |
|
| 1134 | + if (($remove)) |
|
| 1135 | 1135 | $command['remove'] = $remove; |
| 1136 | 1136 | |
| 1137 | 1137 | return $this->addCommand($command, $parent); |
@@ -1257,7 +1257,7 @@ discard block |
||
| 1257 | 1257 | public function sendHeaders() |
| 1258 | 1258 | { |
| 1259 | 1259 | $xRequestManager = $this->getRequestManager(); |
| 1260 | - if($xRequestManager->getRequestMethod() == Jaxon::METHOD_GET) |
|
| 1260 | + if ($xRequestManager->getRequestMethod() == Jaxon::METHOD_GET) |
|
| 1261 | 1261 | { |
| 1262 | 1262 | header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); |
| 1263 | 1263 | header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); |
@@ -1267,7 +1267,7 @@ discard block |
||
| 1267 | 1267 | |
| 1268 | 1268 | $sCharacterSet = ''; |
| 1269 | 1269 | $sCharacterEncoding = trim($this->getOption('core.encoding')); |
| 1270 | - if(($sCharacterEncoding) && strlen($sCharacterEncoding) > 0) |
|
| 1270 | + if (($sCharacterEncoding) && strlen($sCharacterEncoding) > 0) |
|
| 1271 | 1271 | { |
| 1272 | 1272 | $sCharacterSet = '; charset="' . trim($sCharacterEncoding) . '"'; |
| 1273 | 1273 | } |
@@ -1284,13 +1284,13 @@ discard block |
||
| 1284 | 1284 | { |
| 1285 | 1285 | $response = []; |
| 1286 | 1286 | |
| 1287 | - if(($this->returnValue)) |
|
| 1287 | + if (($this->returnValue)) |
|
| 1288 | 1288 | { |
| 1289 | 1289 | $response['jxnrv'] = $this->returnValue; |
| 1290 | 1290 | } |
| 1291 | 1291 | $response['jxnobj'] = []; |
| 1292 | 1292 | |
| 1293 | - foreach($this->aCommands as $xCommand) |
|
| 1293 | + foreach ($this->aCommands as $xCommand) |
|
| 1294 | 1294 | { |
| 1295 | 1295 | $response['jxnobj'][] = $xCommand; |
| 1296 | 1296 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @param string $sLibKey The key of the library options in the file |
| 70 | 70 | * @param string|null $sAppKey The key of the application options in the file |
| 71 | 71 | * |
| 72 | - * @return array |
|
| 72 | + * @return null|\Jaxon\Utils\Config\Config |
|
| 73 | 73 | */ |
| 74 | 74 | public function readPhpConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null) |
| 75 | 75 | { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | * @param string $sLibKey The key of the library options in the file |
| 84 | 84 | * @param string|null $sAppKey The key of the application options in the file |
| 85 | 85 | * |
| 86 | - * @return array |
|
| 86 | + * @return null|\Jaxon\Utils\Config\Config |
|
| 87 | 87 | */ |
| 88 | 88 | public function readYamlConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null) |
| 89 | 89 | { |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | * @param string $sLibKey The key of the library options in the file |
| 98 | 98 | * @param string|null $sAppKey The key of the application options in the file |
| 99 | 99 | * |
| 100 | - * @return array |
|
| 100 | + * @return \Jaxon\Utils\Config\Config|null |
|
| 101 | 101 | */ |
| 102 | 102 | public function readJsonConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null) |
| 103 | 103 | { |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @param string $sLibKey The key of the library options in the file |
| 112 | 112 | * @param string|null $sAppKey The key of the application options in the file |
| 113 | 113 | * |
| 114 | - * @return array |
|
| 114 | + * @return null|\Jaxon\Utils\Config\Config |
|
| 115 | 115 | */ |
| 116 | 116 | public function readConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null) |
| 117 | 117 | { |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | 'core.prefix.event' => 'jaxon_event_', |
| 44 | 44 | // 'core.request.uri' => '', |
| 45 | 45 | 'core.request.mode' => 'asynchronous', |
| 46 | - 'core.request.method' => 'POST', // W3C: Method is case sensitive |
|
| 46 | + 'core.request.method' => 'POST', // W3C: Method is case sensitive |
|
| 47 | 47 | 'core.response.merge.ap' => true, |
| 48 | 48 | 'core.response.merge.js' => true, |
| 49 | 49 | 'core.debug.on' => false, |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | public function readConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null) |
| 119 | 119 | { |
| 120 | 120 | $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION); |
| 121 | - switch($sExt) |
|
| 121 | + switch ($sExt) |
|
| 122 | 122 | { |
| 123 | 123 | case 'php': |
| 124 | 124 | return $this->readPhpConfigFile($sConfigFile, $sLibKey, $sAppKey); |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | * - 1000 thru 8999: User created plugins, typically, these plugins don't care about order |
| 32 | 32 | * - 9000 thru 9999: Plugins that generally need to be last or near the end of the plugin list |
| 33 | 33 | * |
| 34 | - * @param Plugin $xPlugin An instance of a plugin |
|
| 34 | + * @param \Jaxon\Plugin\Plugin $xPlugin An instance of a plugin |
|
| 35 | 35 | * @param integer $nPriority The plugin priority, used to order the plugins |
| 36 | 36 | * |
| 37 | 37 | * @return void |
@@ -19,8 +19,6 @@ |
||
| 19 | 19 | |
| 20 | 20 | namespace Jaxon\Traits; |
| 21 | 21 | |
| 22 | -use Jaxon\DI\Container; |
|
| 23 | - |
|
| 24 | 22 | trait Plugin |
| 25 | 23 | { |
| 26 | 24 | /** |