@@ -746,22 +746,22 @@ discard block |
||
746 | 746 | return $this->loaderInstance; |
747 | 747 | } |
748 | 748 | |
749 | - /** |
|
750 | - * Get the return type array or object |
|
751 | - * @return string|boolean |
|
752 | - */ |
|
749 | + /** |
|
750 | + * Get the return type array or object |
|
751 | + * @return string|boolean |
|
752 | + */ |
|
753 | 753 | protected function getReturnType(){ |
754 | 754 | $type = false; |
755 | 755 | if ($this->_temporary_return_type == 'array') { |
756 | - $type = 'array'; |
|
756 | + $type = 'array'; |
|
757 | 757 | } |
758 | 758 | return $type; |
759 | 759 | } |
760 | 760 | |
761 | - /** |
|
762 | - * Check if soft delete is enable setting the condition |
|
763 | - * @return object the current instance |
|
764 | - */ |
|
761 | + /** |
|
762 | + * Check if soft delete is enable setting the condition |
|
763 | + * @return object the current instance |
|
764 | + */ |
|
765 | 765 | protected function checkForSoftDelete(){ |
766 | 766 | if ($this->soft_delete && $this->_temporary_with_deleted !== true) { |
767 | 767 | $this->getQueryBuilder()->where($this->soft_delete_key, (bool) $this->_temporary_only_deleted); |
@@ -769,14 +769,14 @@ discard block |
||
769 | 769 | return $this; |
770 | 770 | } |
771 | 771 | |
772 | - /** |
|
773 | - * Relate for "belongs_to" and "has_many" |
|
774 | - * @param string $relationship the name of relation |
|
775 | - * @param string|array $options the model and primary key values |
|
776 | - * @param object|array $row the row to update |
|
777 | - * @param string $type the type can be "belongs_to", "has_many" |
|
778 | - * @return mixed the final row values |
|
779 | - */ |
|
772 | + /** |
|
773 | + * Relate for "belongs_to" and "has_many" |
|
774 | + * @param string $relationship the name of relation |
|
775 | + * @param string|array $options the model and primary key values |
|
776 | + * @param object|array $row the row to update |
|
777 | + * @param string $type the type can be "belongs_to", "has_many" |
|
778 | + * @return mixed the final row values |
|
779 | + */ |
|
780 | 780 | protected function relateBelongsToAndHasMany($relationship, $options, $row, $type){ |
781 | 781 | if (in_array($relationship, $this->_with)) { |
782 | 782 | $loaderInstance = $this->getLoaderInstanceOrCreate(); |
@@ -44,7 +44,7 @@ |
||
44 | 44 | self::$logger = $logger[0]; |
45 | 45 | } |
46 | 46 | if ($setLoggerName) { |
47 | - self::$logger->setLogger('Class::' . get_called_class()); |
|
47 | + self::$logger->setLogger('Class::' . get_called_class()); |
|
48 | 48 | } |
49 | 49 | return self::$logger; |
50 | 50 | } |
@@ -189,11 +189,11 @@ |
||
189 | 189 | */ |
190 | 190 | define('VAR_PATH', ROOT_PATH . 'var' . DS); |
191 | 191 | |
192 | - /** |
|
193 | - * The path to the directory of your cache files. |
|
194 | - * |
|
195 | - * This feature is available currently for database and views. |
|
196 | - */ |
|
192 | + /** |
|
193 | + * The path to the directory of your cache files. |
|
194 | + * |
|
195 | + * This feature is available currently for database and views. |
|
196 | + */ |
|
197 | 197 | define('CACHE_PATH', VAR_PATH . 'cache' . DS); |
198 | 198 | |
199 | 199 | /** |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | } |
283 | 283 | $filename = $this->encodeUtf8($this->filterOther((string) $filename)); |
284 | 284 | if (empty($data)) { |
285 | - $data = $this->getAttachmentData($path); |
|
285 | + $data = $this->getAttachmentData($path); |
|
286 | 286 | } |
287 | 287 | $this->_attachments[] = array( |
288 | 288 | 'path' => $path, |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | $addresses = array(); |
347 | 347 | foreach ($pairs as $name => $email) { |
348 | 348 | if (is_numeric($name)) { |
349 | - $name = null; |
|
349 | + $name = null; |
|
350 | 350 | } |
351 | 351 | $addresses[] = $this->formatHeader($email, $name); |
352 | 352 | } |
@@ -25,103 +25,103 @@ |
||
25 | 25 | */ |
26 | 26 | |
27 | 27 | /** |
28 | - * This file contains the configuration of resources that you want to load automatically: |
|
29 | - * personals or systems libraries, configuration files, models, languages |
|
30 | - * personals functions or systems that are used often in your application |
|
31 | - * instead of loading them every time you want to use it. |
|
32 | - * Note: loading a lot of resources can decrease the performance of your application. |
|
33 | - */ |
|
28 | + * This file contains the configuration of resources that you want to load automatically: |
|
29 | + * personals or systems libraries, configuration files, models, languages |
|
30 | + * personals functions or systems that are used often in your application |
|
31 | + * instead of loading them every time you want to use it. |
|
32 | + * Note: loading a lot of resources can decrease the performance of your application. |
|
33 | + */ |
|
34 | 34 | |
35 | 35 | |
36 | - /** |
|
37 | - * If you have personals libraries or systems to load automatically, then list them in the following array. |
|
38 | - * For example : |
|
39 | - * |
|
40 | - * $autoload['libraries'] = array('library1', 'library2'); |
|
41 | - * |
|
42 | - * Using module: |
|
43 | - * |
|
44 | - * $autoload['libraries'] = array('module1/library1', 'module2/library1'); |
|
45 | - * |
|
46 | - * Note: Systems libraries have priority over personals libraries, |
|
47 | - * ie the loading order is as follows: it looks in the folder of the systems libraries, |
|
48 | - * if it is found, it is loaded, if not, it search in the module directories, if it is found, |
|
49 | - * it is loaded, if not will search in personals libraries folder, |
|
50 | - * before returning an error in case it does not find it. |
|
51 | - */ |
|
36 | + /** |
|
37 | + * If you have personals libraries or systems to load automatically, then list them in the following array. |
|
38 | + * For example : |
|
39 | + * |
|
40 | + * $autoload['libraries'] = array('library1', 'library2'); |
|
41 | + * |
|
42 | + * Using module: |
|
43 | + * |
|
44 | + * $autoload['libraries'] = array('module1/library1', 'module2/library1'); |
|
45 | + * |
|
46 | + * Note: Systems libraries have priority over personals libraries, |
|
47 | + * ie the loading order is as follows: it looks in the folder of the systems libraries, |
|
48 | + * if it is found, it is loaded, if not, it search in the module directories, if it is found, |
|
49 | + * it is loaded, if not will search in personals libraries folder, |
|
50 | + * before returning an error in case it does not find it. |
|
51 | + */ |
|
52 | 52 | $autoload['libraries'] = array(); |
53 | 53 | |
54 | 54 | /** |
55 | - * If you have configuration files to load automatically, then list them in the following array. |
|
56 | - * For example : |
|
57 | - * |
|
58 | - * $autoload['config'] = array('config1', 'config2'); |
|
59 | - * |
|
60 | - * Using module: |
|
61 | - * |
|
62 | - * $autoload['config'] = array('module1/config1', 'module2/config2'); |
|
63 | - * |
|
64 | - * Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder |
|
65 | - * for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config, |
|
66 | - * otherwise the system can not find this configuration file. |
|
67 | - * For example : |
|
68 | - * |
|
69 | - * $config['key1'] = value1; |
|
70 | - * $config['key2'] = value2; |
|
71 | - * |
|
72 | - * Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php". |
|
73 | - * or inside the "config" of your application modules |
|
74 | - */ |
|
55 | + * If you have configuration files to load automatically, then list them in the following array. |
|
56 | + * For example : |
|
57 | + * |
|
58 | + * $autoload['config'] = array('config1', 'config2'); |
|
59 | + * |
|
60 | + * Using module: |
|
61 | + * |
|
62 | + * $autoload['config'] = array('module1/config1', 'module2/config2'); |
|
63 | + * |
|
64 | + * Note 1: the file name must have as prefix "config_" for config file inside CONFIG_PATH folder |
|
65 | + * for example "config_name_of_the_file_config.php" and contains as configuration variable the array $config, |
|
66 | + * otherwise the system can not find this configuration file. |
|
67 | + * For example : |
|
68 | + * |
|
69 | + * $config['key1'] = value1; |
|
70 | + * $config['key2'] = value2; |
|
71 | + * |
|
72 | + * Note 2: the files to be loaded must be in the folder defined by the constant "CONFIG_PATH" in "index.php". |
|
73 | + * or inside the "config" of your application modules |
|
74 | + */ |
|
75 | 75 | $autoload['config'] = array(); |
76 | 76 | |
77 | 77 | /** |
78 | - * If you have models to load automatically, then list them in the following array. |
|
79 | - * For example : |
|
80 | - * |
|
81 | - * $autoload['models'] = array('model1', 'model2'); |
|
82 | - * |
|
83 | - * Using module: |
|
84 | - * |
|
85 | - * $autoload['models'] = array('module1/model1', 'module2/model2'); |
|
86 | - */ |
|
78 | + * If you have models to load automatically, then list them in the following array. |
|
79 | + * For example : |
|
80 | + * |
|
81 | + * $autoload['models'] = array('model1', 'model2'); |
|
82 | + * |
|
83 | + * Using module: |
|
84 | + * |
|
85 | + * $autoload['models'] = array('module1/model1', 'module2/model2'); |
|
86 | + */ |
|
87 | 87 | $autoload['models'] = array(); |
88 | 88 | |
89 | 89 | /** |
90 | - * If you have systems or personals functions to load automatically, specify them in the following array. |
|
91 | - * For example : |
|
92 | - * |
|
93 | - * $autoload['functions'] = array('function1', 'function2'); |
|
94 | - * |
|
95 | - * Using module: |
|
96 | - * |
|
97 | - * $autoload['functions'] = array('module1/function1', 'module2/function2'); |
|
98 | - * |
|
99 | - * Note 1: Personal functions have priority over system functions, |
|
100 | - * that is to say that the order of loading is the following : it looks in the directory of the modules functions, |
|
101 | - * if it is found, it is loaded, otherwise, it looks in the directory of the personal functions, |
|
102 | - * if it is found, it is loaded, otherwise, it looks in the directory of the system functions, |
|
103 | - * before returning an error in case he does not find it. |
|
104 | - * |
|
105 | - * Note 2: the file name must have as prefix "function_" for example "function_foo.php" then |
|
106 | - * will use: |
|
107 | - * |
|
108 | - * $autoload['functions'] = array('foo'); |
|
109 | - */ |
|
90 | + * If you have systems or personals functions to load automatically, specify them in the following array. |
|
91 | + * For example : |
|
92 | + * |
|
93 | + * $autoload['functions'] = array('function1', 'function2'); |
|
94 | + * |
|
95 | + * Using module: |
|
96 | + * |
|
97 | + * $autoload['functions'] = array('module1/function1', 'module2/function2'); |
|
98 | + * |
|
99 | + * Note 1: Personal functions have priority over system functions, |
|
100 | + * that is to say that the order of loading is the following : it looks in the directory of the modules functions, |
|
101 | + * if it is found, it is loaded, otherwise, it looks in the directory of the personal functions, |
|
102 | + * if it is found, it is loaded, otherwise, it looks in the directory of the system functions, |
|
103 | + * before returning an error in case he does not find it. |
|
104 | + * |
|
105 | + * Note 2: the file name must have as prefix "function_" for example "function_foo.php" then |
|
106 | + * will use: |
|
107 | + * |
|
108 | + * $autoload['functions'] = array('foo'); |
|
109 | + */ |
|
110 | 110 | $autoload['functions'] = array(); |
111 | 111 | |
112 | 112 | /** |
113 | - * If you have systems or personals languages to load automatically, specify them in the following array. |
|
114 | - * For example : |
|
115 | - * |
|
116 | - * $autoload['languages'] = array('lang1', 'lang2'); |
|
117 | - * |
|
118 | - * Using module: |
|
119 | - * |
|
120 | - * $autoload['languages'] = array('module1/lang1', 'module2/lang2'); |
|
121 | - * |
|
122 | - * Note: the file name must have as prefix "lang_" for example "lang_foo.php" then |
|
123 | - * will use: |
|
124 | - * |
|
125 | - * $autoload['languages'] = array('foo'); |
|
126 | - */ |
|
113 | + * If you have systems or personals languages to load automatically, specify them in the following array. |
|
114 | + * For example : |
|
115 | + * |
|
116 | + * $autoload['languages'] = array('lang1', 'lang2'); |
|
117 | + * |
|
118 | + * Using module: |
|
119 | + * |
|
120 | + * $autoload['languages'] = array('module1/lang1', 'module2/lang2'); |
|
121 | + * |
|
122 | + * Note: the file name must have as prefix "lang_" for example "lang_foo.php" then |
|
123 | + * will use: |
|
124 | + * |
|
125 | + * $autoload['languages'] = array('foo'); |
|
126 | + */ |
|
127 | 127 | $autoload['languages'] = array(); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | } else { |
186 | 186 | $logger->info('Cannot find view [' . $view . '] in module [' . $module . '] using the default location'); |
187 | 187 | } |
188 | - if (!$path) { |
|
188 | + if (!$path) { |
|
189 | 189 | $path = $this->getDefaultFilePathForView($viewFile); |
190 | 190 | } |
191 | 191 | $logger->info('The view file path to be loaded is [' . $path . ']'); |
@@ -273,12 +273,12 @@ discard block |
||
273 | 273 | return $this->_pageRender; |
274 | 274 | } |
275 | 275 | |
276 | - /** |
|
277 | - * Set the final page to be rendered |
|
278 | - * @param string $finalPage the content of the final page |
|
279 | - * |
|
280 | - * @return object |
|
281 | - */ |
|
276 | + /** |
|
277 | + * Set the final page to be rendered |
|
278 | + * @param string $finalPage the content of the final page |
|
279 | + * |
|
280 | + * @return object |
|
281 | + */ |
|
282 | 282 | public function setFinalPageContent($finalPage) { |
283 | 283 | $this->_pageRender = $finalPage; |
284 | 284 | return $this; |
@@ -351,12 +351,12 @@ discard block |
||
351 | 351 | ob_end_flush(); |
352 | 352 | } |
353 | 353 | |
354 | - /** |
|
355 | - * Return the default full file path for view |
|
356 | - * @param string $file the filename |
|
357 | - * |
|
358 | - * @return string|null the full file path |
|
359 | - */ |
|
354 | + /** |
|
355 | + * Return the default full file path for view |
|
356 | + * @param string $file the filename |
|
357 | + * |
|
358 | + * @return string|null the full file path |
|
359 | + */ |
|
360 | 360 | protected static function getDefaultFilePathForView($file){ |
361 | 361 | $searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
362 | 362 | $fullFilePath = null; |
@@ -548,18 +548,18 @@ discard block |
||
548 | 548 | } |
549 | 549 | } |
550 | 550 | |
551 | - /** |
|
552 | - * Set the mandory headers, like security, etc. |
|
553 | - */ |
|
551 | + /** |
|
552 | + * Set the mandory headers, like security, etc. |
|
553 | + */ |
|
554 | 554 | protected static function setRequiredHeaders() { |
555 | 555 | $requiredHeaders = array( |
556 | 556 | 'X-XSS-Protection' => '1; mode=block', |
557 | 557 | 'X-Frame-Options' => 'SAMEORIGIN' |
558 | 558 | ); |
559 | 559 | foreach ($requiredHeaders as $key => $value) { |
560 | - if (!isset(self::$headers[$key])) { |
|
560 | + if (!isset(self::$headers[$key])) { |
|
561 | 561 | self::$headers[$key] = $value; |
562 | - } |
|
562 | + } |
|
563 | 563 | } |
564 | 564 | } |
565 | 565 | } |
@@ -241,12 +241,12 @@ discard block |
||
241 | 241 | } |
242 | 242 | |
243 | 243 | /** |
244 | - * Setting the route configuration using the configuration file and additional configuration from param |
|
245 | - * @param array $overwriteConfig the additional configuration to overwrite with the existing one |
|
246 | - * @param boolean $useConfigFile whether to use route configuration file |
|
247 | - * |
|
248 | - * @return object |
|
249 | - */ |
|
244 | + * Setting the route configuration using the configuration file and additional configuration from param |
|
245 | + * @param array $overwriteConfig the additional configuration to overwrite with the existing one |
|
246 | + * @param boolean $useConfigFile whether to use route configuration file |
|
247 | + * |
|
248 | + * @return object |
|
249 | + */ |
|
250 | 250 | public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) { |
251 | 251 | $route = array(); |
252 | 252 | if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) { |
@@ -423,11 +423,11 @@ discard block |
||
423 | 423 | } |
424 | 424 | } |
425 | 425 | |
426 | - /** |
|
427 | - * Remove the URL suffix and query string values if exists |
|
428 | - * @param string $uri the route URI to process |
|
429 | - * @return string the final route uri after processed |
|
430 | - */ |
|
426 | + /** |
|
427 | + * Remove the URL suffix and query string values if exists |
|
428 | + * @param string $uri the route URI to process |
|
429 | + * @return string the final route uri after processed |
|
430 | + */ |
|
431 | 431 | protected function removeSuffixAndQueryStringFromUri($uri) { |
432 | 432 | $this->logger->debug('Check if URL suffix is enabled in the configuration'); |
433 | 433 | //remove url suffix from the request URI |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | $this->logger->info( |
541 | 541 | 'After loop in predefined routes configuration,' |
542 | 542 | . 'the module name is set but the controller is not set,' |
543 | - . 'so we will use module as the controller' |
|
543 | + . 'so we will use module as the controller' |
|
544 | 544 | ); |
545 | 545 | $this->controller = $this->module; |
546 | 546 | } |
@@ -84,10 +84,10 @@ |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
87 | - * This method is used to check the whitelist IP address access |
|
88 | - * |
|
89 | - * @return boolean |
|
90 | - */ |
|
87 | + * This method is used to check the whitelist IP address access |
|
88 | + * |
|
89 | + * @return boolean |
|
90 | + */ |
|
91 | 91 | public static function checkWhiteListIpAccess() { |
92 | 92 | $logger = self::getLogger(); |
93 | 93 | $logger->debug('Validation of the IP address access ...'); |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $attributes['accept-charset'] = get_config('charset', 'UTF-8'); |
46 | 46 | } |
47 | 47 | if (!empty($enctype)) { |
48 | - $attributes['enctype'] = $enctype; |
|
48 | + $attributes['enctype'] = $enctype; |
|
49 | 49 | } |
50 | 50 | $str .= attributes_to_string($attributes); |
51 | 51 | $str .= '>'; |