@@ -117,8 +117,8 @@ discard block |
||
117 | 117 | // $network seems to be a real network address |
118 | 118 | $x = ip2long($ip_arr[1]); |
119 | 119 | // Evaluate the netmask: <Network Mask> or <CIDR> |
120 | - $mask = ( long2ip($x) == $ip_arr[1] ? $x : 0xffffffff << (32 - $ip_arr[1])); |
|
121 | - $matched = ( ($ip_long & $mask) == ($network_long & $mask) ); |
|
120 | + $mask = (long2ip($x) == $ip_arr[1] ? $x : 0xffffffff << (32 - $ip_arr[1])); |
|
121 | + $matched = (($ip_long & $mask) == ($network_long & $mask)); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | return $matched; |
@@ -153,8 +153,8 @@ discard block |
||
153 | 153 | $bytes_addr = unpack("n*", inet_pton($addr)); |
154 | 154 | $bytes_test = unpack("n*", inet_pton($ip)); |
155 | 155 | |
156 | - for ($i = 1; $i <= ceil($preflen / 16); $i++) { |
|
157 | - $left = $preflen - 16 * ($i-1); |
|
156 | + for ($i = 1; $i <= ceil($preflen/16); $i++) { |
|
157 | + $left = $preflen - 16*($i - 1); |
|
158 | 158 | if ($left > 16) { |
159 | 159 | $left = 16; |
160 | 160 | } |
@@ -1,24 +1,24 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * The network class for IPv4 and IPv6 handling |
|
4 | - * |
|
5 | - * PHP Version 5.3 |
|
6 | - * |
|
7 | - * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | - * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | - * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | - * |
|
11 | - * @category phpMyFAQ |
|
12 | - * @package PMF_Network |
|
13 | - * @author Thorsten Rinne <[email protected]> |
|
14 | - * @author Matteo Scaramuccia <[email protected]> |
|
15 | - * @author Kenneth Shaw <[email protected]> |
|
16 | - * @author David Soria Parra <[email protected]> |
|
17 | - * @copyright 2011-2016 phpMyFAQ Team |
|
18 | - * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
19 | - * @link http://www.phpmyfaq.de |
|
20 | - * @since 2011-02-04 |
|
21 | - */ |
|
3 | + * The network class for IPv4 and IPv6 handling |
|
4 | + * |
|
5 | + * PHP Version 5.3 |
|
6 | + * |
|
7 | + * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | + * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | + * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | + * |
|
11 | + * @category phpMyFAQ |
|
12 | + * @package PMF_Network |
|
13 | + * @author Thorsten Rinne <[email protected]> |
|
14 | + * @author Matteo Scaramuccia <[email protected]> |
|
15 | + * @author Kenneth Shaw <[email protected]> |
|
16 | + * @author David Soria Parra <[email protected]> |
|
17 | + * @copyright 2011-2016 phpMyFAQ Team |
|
18 | + * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
19 | + * @link http://www.phpmyfaq.de |
|
20 | + * @since 2011-02-04 |
|
21 | + */ |
|
22 | 22 | |
23 | 23 | if (!defined('IS_VALID_PHPMYFAQ')) { |
24 | 24 | exit(); |
@@ -34,51 +34,51 @@ |
||
34 | 34 | */ |
35 | 35 | class PMF_Cache_Varnish extends PMF_Cache_Service |
36 | 36 | { |
37 | - protected $instance = NULL; |
|
37 | + protected $instance = NULL; |
|
38 | 38 | |
39 | - /** |
|
40 | - * Constructor. |
|
41 | - * |
|
42 | - * @param array $config Cache configuration |
|
43 | - * |
|
44 | - * @return void |
|
45 | - */ |
|
46 | - public function __construct(array $config) |
|
47 | - { |
|
48 | - $this->instance = new VarnishAdmin($config); |
|
39 | + /** |
|
40 | + * Constructor. |
|
41 | + * |
|
42 | + * @param array $config Cache configuration |
|
43 | + * |
|
44 | + * @return void |
|
45 | + */ |
|
46 | + public function __construct(array $config) |
|
47 | + { |
|
48 | + $this->instance = new VarnishAdmin($config); |
|
49 | 49 | |
50 | - try { |
|
51 | - if(!$this->instance->connect()) { |
|
52 | - throw new VarnishException("Connection failed\n"); |
|
53 | - } |
|
54 | - } catch (VarnishException $e) { |
|
55 | - echo $e->getMessage(); |
|
56 | - } |
|
50 | + try { |
|
51 | + if(!$this->instance->connect()) { |
|
52 | + throw new VarnishException("Connection failed\n"); |
|
53 | + } |
|
54 | + } catch (VarnishException $e) { |
|
55 | + echo $e->getMessage(); |
|
56 | + } |
|
57 | 57 | |
58 | - try { |
|
59 | - if(!$this->instance->auth()) { |
|
60 | - throw new VarnishException("Auth failed\n"); |
|
61 | - } |
|
62 | - } catch (VarnishException $e) { |
|
63 | - echo $e->getMessage(); |
|
64 | - } |
|
65 | - } |
|
58 | + try { |
|
59 | + if(!$this->instance->auth()) { |
|
60 | + throw new VarnishException("Auth failed\n"); |
|
61 | + } |
|
62 | + } catch (VarnishException $e) { |
|
63 | + echo $e->getMessage(); |
|
64 | + } |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * Clear all cached article related items. |
|
69 | - * |
|
70 | - * @param intereg $id Article id |
|
71 | - * |
|
72 | - * @return void |
|
73 | - */ |
|
74 | - public function clearArticle($id) |
|
75 | - { |
|
76 | - $this->clearAll(); |
|
77 | - } |
|
67 | + /** |
|
68 | + * Clear all cached article related items. |
|
69 | + * |
|
70 | + * @param intereg $id Article id |
|
71 | + * |
|
72 | + * @return void |
|
73 | + */ |
|
74 | + public function clearArticle($id) |
|
75 | + { |
|
76 | + $this->clearAll(); |
|
77 | + } |
|
78 | 78 | |
79 | - public function clearAll() |
|
80 | - { |
|
81 | - $this->instance->banUrl(".*"); |
|
82 | - } |
|
79 | + public function clearAll() |
|
80 | + { |
|
81 | + $this->instance->banUrl(".*"); |
|
82 | + } |
|
83 | 83 | |
84 | 84 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $this->instance = new VarnishAdmin($config); |
49 | 49 | |
50 | 50 | try { |
51 | - if(!$this->instance->connect()) { |
|
51 | + if (!$this->instance->connect()) { |
|
52 | 52 | throw new VarnishException("Connection failed\n"); |
53 | 53 | } |
54 | 54 | } catch (VarnishException $e) { |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | try { |
59 | - if(!$this->instance->auth()) { |
|
59 | + if (!$this->instance->auth()) { |
|
60 | 60 | throw new VarnishException("Auth failed\n"); |
61 | 61 | } |
62 | 62 | } catch (VarnishException $e) { |
@@ -3,18 +3,18 @@ |
||
3 | 3 | class PMF_Cache_Dummy extends PMF_Cache_Service |
4 | 4 | { |
5 | 5 | |
6 | - public function __construct(array $config) |
|
7 | - { |
|
8 | - // pass |
|
9 | - } |
|
6 | + public function __construct(array $config) |
|
7 | + { |
|
8 | + // pass |
|
9 | + } |
|
10 | 10 | |
11 | - public function clearArticle($id) |
|
12 | - { |
|
13 | - // pass |
|
14 | - } |
|
11 | + public function clearArticle($id) |
|
12 | + { |
|
13 | + // pass |
|
14 | + } |
|
15 | 15 | |
16 | - public function clearAll() |
|
17 | - { |
|
18 | - // pass |
|
19 | - } |
|
16 | + public function clearAll() |
|
17 | + { |
|
18 | + // pass |
|
19 | + } |
|
20 | 20 | } |
@@ -117,15 +117,15 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function copy($source, $dest) |
119 | 119 | { |
120 | - if (! is_readable($source)) { |
|
120 | + if (!is_readable($source)) { |
|
121 | 121 | throw new PMF_Exception('/config/constants.php is not readable.'); |
122 | 122 | } |
123 | 123 | |
124 | - if (! is_writable(dirname($dest))) { |
|
124 | + if (!is_writable(dirname($dest))) { |
|
125 | 125 | throw new PMF_Exception(sprintf('%s is not writeable.', $dest)); |
126 | 126 | } |
127 | 127 | |
128 | - if (! copy($source, $dest)) { |
|
128 | + if (!copy($source, $dest)) { |
|
129 | 129 | $error = error_get_last(); |
130 | 130 | throw new PMF_Exception($error['message']); |
131 | 131 | } |
@@ -149,19 +149,19 @@ discard block |
||
149 | 149 | |
150 | 150 | $directoryName = substr($source, strrpos($source, '/') + 1); |
151 | 151 | |
152 | - $this->mkdir($dest . '/' . $directoryName, 0750, true); |
|
152 | + $this->mkdir($dest.'/'.$directoryName, 0750, true); |
|
153 | 153 | |
154 | 154 | while ($file = readdir($directoryHandle)) |
155 | 155 | { |
156 | 156 | if ('.' != $file && '..' != $file) { |
157 | 157 | |
158 | - if (! is_dir($source . '/' . $file)) { |
|
158 | + if (!is_dir($source.'/'.$file)) { |
|
159 | 159 | $this->copy( |
160 | - $source . '/' . $file, |
|
161 | - $dest . '/' . $directoryName . '/' . $file |
|
160 | + $source.'/'.$file, |
|
161 | + $dest.'/'.$directoryName.'/'.$file |
|
162 | 162 | ); |
163 | - } else { |
|
164 | - $this->recursiveCopy($source . '/' . $file, $dest . '/' . $directoryName); |
|
163 | + } else { |
|
164 | + $this->recursiveCopy($source.'/'.$file, $dest.'/'.$directoryName); |
|
165 | 165 | } |
166 | 166 | } |
167 | 167 | } |
@@ -160,7 +160,7 @@ |
||
160 | 160 | $source . '/' . $file, |
161 | 161 | $dest . '/' . $directoryName . '/' . $file |
162 | 162 | ); |
163 | - } else { |
|
163 | + } else { |
|
164 | 164 | $this->recursiveCopy($source . '/' . $file, $dest . '/' . $directoryName); |
165 | 165 | } |
166 | 166 | } |
@@ -1,21 +1,21 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Class for filesystem operations |
|
4 | - * |
|
5 | - * PHP Version 5.3 |
|
6 | - * |
|
7 | - * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | - * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | - * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | - * |
|
11 | - * @category phpMyFAQ |
|
12 | - * @package PMF_Filesystem |
|
13 | - * @author Thorsten Rinne <[email protected]> |
|
14 | - * @copyright 2012-2016 phpMyFAQ Team |
|
15 | - * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
16 | - * @link http://www.phpmyfaq.de |
|
17 | - * @since 2012-04-02 |
|
18 | - */ |
|
3 | + * Class for filesystem operations |
|
4 | + * |
|
5 | + * PHP Version 5.3 |
|
6 | + * |
|
7 | + * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | + * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | + * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | + * |
|
11 | + * @category phpMyFAQ |
|
12 | + * @package PMF_Filesystem |
|
13 | + * @author Thorsten Rinne <[email protected]> |
|
14 | + * @copyright 2012-2016 phpMyFAQ Team |
|
15 | + * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
16 | + * @link http://www.phpmyfaq.de |
|
17 | + * @since 2012-04-02 |
|
18 | + */ |
|
19 | 19 | |
20 | 20 | if (!defined('IS_VALID_PHPMYFAQ')) { |
21 | 21 | exit(); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $this->headers = array(); |
241 | 241 | $this->message = ''; |
242 | 242 | $this->messageAlt = ''; |
243 | - $this->messageId = '<'.$_SERVER['REQUEST_TIME'] . '.'. md5(microtime()) . '@' . self::getServerName() . '>'; |
|
243 | + $this->messageId = '<'.$_SERVER['REQUEST_TIME'].'.'.md5(microtime()).'@'.self::getServerName().'>'; |
|
244 | 244 | $this->priority = 3; // 3 -> Normal |
245 | 245 | $this->subject = ''; |
246 | 246 | |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | $this->_bcc = array(); |
250 | 250 | $this->_cc = array(); |
251 | 251 | $this->_from = array(); |
252 | - $this->_mailer = 'phpMyFAQ on PHP/' . PHP_VERSION; |
|
252 | + $this->_mailer = 'phpMyFAQ on PHP/'.PHP_VERSION; |
|
253 | 253 | $this->_notifyTo = array(); |
254 | 254 | $this->_replyTo = array(); |
255 | 255 | $this->_returnPath = array(); |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | $this->_to = array(); |
258 | 258 | |
259 | 259 | // Set phpMyFAQ related data |
260 | - $this->_mailer = 'phpMyFAQ/' . $this->_config->get('main.currentVersion'); |
|
260 | + $this->_mailer = 'phpMyFAQ/'.$this->_config->get('main.currentVersion'); |
|
261 | 261 | $this->setFrom($this->_config->get('main.administrationMail')); |
262 | 262 | } |
263 | 263 | |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | // Sanity check |
279 | 279 | if (!self::validateEmail($address)) { |
280 | 280 | trigger_error( |
281 | - "<strong>Mail Class</strong>: " . $address . " is not a valid e-mail address!", |
|
281 | + "<strong>Mail Class</strong>: ".$address." is not a valid e-mail address!", |
|
282 | 282 | E_USER_ERROR |
283 | 283 | ); |
284 | 284 | return false; |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | // Don't allow duplicated addresses |
288 | 288 | if (array_key_exists($address, $target)) { |
289 | 289 | trigger_error( |
290 | - "<strong>Mail Class</strong>: " . $address . " has been already added in '$targetAlias'!", |
|
290 | + "<strong>Mail Class</strong>: ".$address." has been already added in '$targetAlias'!", |
|
291 | 291 | E_USER_WARNING |
292 | 292 | ); |
293 | 293 | return false; |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | |
305 | 305 | // Wrap the displayed name in quotes (to fix problems with commas etc), |
306 | 306 | // and escape any existing quotes |
307 | - $name = '"' . str_replace('"', '\"', $name) . '"'; |
|
307 | + $name = '"'.str_replace('"', '\"', $name).'"'; |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | // Add the e-mail address into the target array |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | |
433 | 433 | // Disposition-Notification-To, RFC 3798 |
434 | 434 | $notifyTos = array(); |
435 | - foreach($this->_notifyTo as $address => $name) { |
|
435 | + foreach ($this->_notifyTo as $address => $name) { |
|
436 | 436 | $notifyTos[] = (empty($name) ? '' : $name.' ').'<'.$address.'>'; |
437 | 437 | } |
438 | 438 | $notifyTo = implode(',', $notifyTos); |
@@ -442,17 +442,17 @@ discard block |
||
442 | 442 | |
443 | 443 | // From |
444 | 444 | foreach ($this->_from as $address => $name) { |
445 | - $this->headers['From'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>'; |
|
445 | + $this->headers['From'] = (empty($name) ? '' : $name.' ').'<'.$address.'>'; |
|
446 | 446 | } |
447 | 447 | |
448 | 448 | // CC |
449 | 449 | foreach ($this->_cc as $address => $name) { |
450 | - $this->headers['CC'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>'; |
|
450 | + $this->headers['CC'] = (empty($name) ? '' : $name.' ').'<'.$address.'>'; |
|
451 | 451 | } |
452 | 452 | |
453 | 453 | // BCC |
454 | 454 | foreach ($this->_bcc as $address => $name) { |
455 | - $this->headers['BCC'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>'; |
|
455 | + $this->headers['BCC'] = (empty($name) ? '' : $name.' ').'<'.$address.'>'; |
|
456 | 456 | } |
457 | 457 | |
458 | 458 | // Message-Id |
@@ -463,21 +463,21 @@ discard block |
||
463 | 463 | |
464 | 464 | // Reply-To |
465 | 465 | $this->headers['Reply-To'] = $this->headers['From']; |
466 | - foreach($this->_replyTo as $address => $name) { |
|
466 | + foreach ($this->_replyTo as $address => $name) { |
|
467 | 467 | $this->headers['Reply-To'] = (empty($name) ? '' : $name.' ').'<'.$address.'>'; |
468 | 468 | } |
469 | 469 | |
470 | 470 | // Return-Path |
471 | - foreach($this->_from as $address => $name) { |
|
471 | + foreach ($this->_from as $address => $name) { |
|
472 | 472 | $this->headers['Return-Path'] = '<'.$address.'>'; |
473 | 473 | } |
474 | - foreach($this->_returnPath as $address => $name) { |
|
474 | + foreach ($this->_returnPath as $address => $name) { |
|
475 | 475 | $this->headers['Return-Path'] = '<'.$address.'>'; |
476 | 476 | } |
477 | 477 | |
478 | 478 | // Sender |
479 | 479 | $this->headers['Sender'] = $this->headers['From']; |
480 | - foreach($this->_sender as $address => $name) { |
|
480 | + foreach ($this->_sender as $address => $name) { |
|
481 | 481 | $this->headers['Sender'] = (empty($name) ? '' : $name.' ').'<'.$address.'>'; |
482 | 482 | } |
483 | 483 | |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | */ |
622 | 622 | public static function createBoundary() |
623 | 623 | { |
624 | - return '-----' .md5(microtime()); |
|
624 | + return '-----'.md5(microtime()); |
|
625 | 625 | } |
626 | 626 | |
627 | 627 | /** |
@@ -637,9 +637,9 @@ discard block |
||
637 | 637 | // Assure that anything among CRLF, CR will be replaced with just LF |
638 | 638 | $text = str_replace( |
639 | 639 | array( |
640 | - "\r\n",// CRLF |
|
640 | + "\r\n", // CRLF |
|
641 | 641 | "\r", // CR |
642 | - "\n",// LF |
|
642 | + "\n", // LF |
|
643 | 643 | ), |
644 | 644 | "\n", // LF |
645 | 645 | $text |
@@ -764,7 +764,7 @@ discard block |
||
764 | 764 | |
765 | 765 | // Prepare the recipients |
766 | 766 | $to = array(); |
767 | - foreach($this->_to as $address => $name) { |
|
767 | + foreach ($this->_to as $address => $name) { |
|
768 | 768 | $to[] = (empty($name) ? '' : $name.' ').'<'.$address.'>'; |
769 | 769 | } |
770 | 770 | $recipients = implode(',', $to); |
@@ -780,7 +780,7 @@ discard block |
||
780 | 780 | $this->_createBody(); |
781 | 781 | |
782 | 782 | // Send the email adopting to the given MUA |
783 | - $mua = self::getMUA($this->agent); |
|
783 | + $mua = self::getMUA($this->agent); |
|
784 | 784 | switch ($this->agent) { |
785 | 785 | case 'built-in': |
786 | 786 | $sent = $mua->send($recipients, $this->headers, $this->body); |
@@ -926,7 +926,7 @@ discard block |
||
926 | 926 | return false; |
927 | 927 | } |
928 | 928 | |
929 | - $unsafe = array ("\r", "\n"); |
|
929 | + $unsafe = array("\r", "\n"); |
|
930 | 930 | if ($address !== str_replace($unsafe, '', $address)) { |
931 | 931 | return false; |
932 | 932 | } |
@@ -980,7 +980,7 @@ discard block |
||
980 | 980 | public function safeEmail($email) |
981 | 981 | { |
982 | 982 | if ($this->_config->get('spam.enableSafeEmail')) { |
983 | - return str_replace ( array ('@', '.' ), array ('_AT_', '_DOT_' ), $email ); |
|
983 | + return str_replace(array('@', '.'), array('_AT_', '_DOT_'), $email); |
|
984 | 984 | } else { |
985 | 985 | return $email; |
986 | 986 | } |
@@ -932,7 +932,7 @@ |
||
932 | 932 | } |
933 | 933 | |
934 | 934 | if (false === filter_var($address, FILTER_VALIDATE_EMAIL)) { |
935 | - return false; |
|
935 | + return false; |
|
936 | 936 | } |
937 | 937 | |
938 | 938 | return true; |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | public function __construct(PMF_Configuration $config) |
75 | 75 | { |
76 | 76 | $this->_config = $config; |
77 | - $this->_table = PMF_Db::getTablePrefix() . 'faqsearches'; |
|
77 | + $this->_table = PMF_Db::getTablePrefix().'faqsearches'; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | */ |
109 | 109 | public function search($searchterm, $allLanguages = true) |
110 | 110 | { |
111 | - $fdTable = PMF_Db::getTablePrefix() . 'faqdata AS fd'; |
|
112 | - $fcrTable = PMF_Db::getTablePrefix() . 'faqcategoryrelations'; |
|
111 | + $fdTable = PMF_Db::getTablePrefix().'faqdata AS fd'; |
|
112 | + $fcrTable = PMF_Db::getTablePrefix().'faqcategoryrelations'; |
|
113 | 113 | $condition = array('fd.active' => "'yes'"); |
114 | 114 | $search = PMF_Search_Factory::create($this->_config, array('database' => PMF_Db::getType())); |
115 | 115 | |
@@ -117,18 +117,18 @@ discard block |
||
117 | 117 | if ($this->getCategory() instanceof PMF_Category) { |
118 | 118 | $children = $this->getCategory()->getChildNodes($this->getCategoryId()); |
119 | 119 | $selectedCategory = array( |
120 | - $fcrTable . '.category_id' => array_merge((array)$this->getCategoryId(), $children) |
|
120 | + $fcrTable.'.category_id' => array_merge((array)$this->getCategoryId(), $children) |
|
121 | 121 | ); |
122 | 122 | } else { |
123 | 123 | $selectedCategory = array( |
124 | - $fcrTable . '.category_id' => $this->getCategoryId() |
|
124 | + $fcrTable.'.category_id' => $this->getCategoryId() |
|
125 | 125 | ); |
126 | 126 | } |
127 | 127 | $condition = array_merge($selectedCategory, $condition); |
128 | 128 | } |
129 | 129 | |
130 | 130 | if ((!$allLanguages) && (!is_numeric($searchterm))) { |
131 | - $selectedLanguage = array('fd.lang' => "'" . $this->_config->getLanguage()->getLanguage() . "'"); |
|
131 | + $selectedLanguage = array('fd.lang' => "'".$this->_config->getLanguage()->getLanguage()."'"); |
|
132 | 132 | $condition = array_merge($selectedLanguage, $condition); |
133 | 133 | } |
134 | 134 | |
@@ -137,13 +137,13 @@ discard block |
||
137 | 137 | 'fd.id AS id', |
138 | 138 | 'fd.lang AS lang', |
139 | 139 | 'fd.solution_id AS solution_id', |
140 | - $fcrTable . '.category_id AS category_id', |
|
140 | + $fcrTable.'.category_id AS category_id', |
|
141 | 141 | 'fd.thema AS question', |
142 | 142 | 'fd.content AS answer')) |
143 | 143 | ->setJoinedTable($fcrTable) |
144 | 144 | ->setJoinedColumns(array( |
145 | - 'fd.id = ' . $fcrTable . '.record_id', |
|
146 | - 'fd.lang = ' . $fcrTable . '.record_lang' |
|
145 | + 'fd.id = '.$fcrTable.'.record_id', |
|
146 | + 'fd.lang = '.$fcrTable.'.record_lang' |
|
147 | 147 | )) |
148 | 148 | ->setConditions($condition); |
149 | 149 |
@@ -1,23 +1,23 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * The phpMyFAQ Search class |
|
4 | - * |
|
5 | - * PHP Version 5.3 |
|
6 | - * |
|
7 | - * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | - * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | - * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | - * |
|
11 | - * @category phpMyFAQ |
|
12 | - * @package Search |
|
13 | - * @author Thorsten Rinne <[email protected]> |
|
14 | - * @author Matteo Scaramuccia <[email protected]> |
|
15 | - * @author Adrianna Musiol <[email protected]> |
|
16 | - * @copyright 2008-2016 phpMyFAQ Team |
|
17 | - * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
18 | - * @link http://www.phpmyfaq.de |
|
19 | - * @since 2008-01-26 |
|
20 | - */ |
|
3 | + * The phpMyFAQ Search class |
|
4 | + * |
|
5 | + * PHP Version 5.3 |
|
6 | + * |
|
7 | + * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | + * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | + * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | + * |
|
11 | + * @category phpMyFAQ |
|
12 | + * @package Search |
|
13 | + * @author Thorsten Rinne <[email protected]> |
|
14 | + * @author Matteo Scaramuccia <[email protected]> |
|
15 | + * @author Adrianna Musiol <[email protected]> |
|
16 | + * @copyright 2008-2016 phpMyFAQ Team |
|
17 | + * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
18 | + * @link http://www.phpmyfaq.de |
|
19 | + * @since 2008-01-26 |
|
20 | + */ |
|
21 | 21 | |
22 | 22 | if (!defined('IS_VALID_PHPMYFAQ')) { |
23 | 23 | exit(); |
@@ -156,8 +156,8 @@ discard block |
||
156 | 156 | { |
157 | 157 | $templates = array(); |
158 | 158 | |
159 | - foreach (new DirectoryIterator(PMF_ROOT_DIR . '/assets/template') as $item) { |
|
160 | - if (! $item->isDot() && $item->isDir()) { |
|
159 | + foreach (new DirectoryIterator(PMF_ROOT_DIR.'/assets/template') as $item) { |
|
160 | + if (!$item->isDot() && $item->isDir()) { |
|
161 | 161 | $templates[$item->getBasename()] = (PMF_Template::getTplSetName() == $item->getBasename() ? true : false); |
162 | 162 | } |
163 | 163 | } |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | public function checkDatabase() |
245 | 245 | { |
246 | 246 | foreach ($this->_supportedDatabases as $extension => $database) { |
247 | - if (extension_loaded ($extension)) { |
|
247 | + if (extension_loaded($extension)) { |
|
248 | 248 | return true; |
249 | 249 | } |
250 | 250 | } |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | public function checkRequiredExtensions() |
261 | 261 | { |
262 | 262 | foreach ($this->_requiredExtensions as $extension) { |
263 | - if (!extension_loaded ( $extension)) { |
|
263 | + if (!extension_loaded($extension)) { |
|
264 | 264 | $this->_missingExtensions[] = $extension; |
265 | 265 | } |
266 | 266 | } |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function checkphpMyFAQInstallation() |
310 | 310 | { |
311 | - if (is_file(PMF_ROOT_DIR . '/inc/data.php') || is_file(PMF_ROOT_DIR . '/config/database.php')) { |
|
311 | + if (is_file(PMF_ROOT_DIR.'/inc/data.php') || is_file(PMF_ROOT_DIR.'/config/database.php')) { |
|
312 | 312 | return false; |
313 | 313 | } else { |
314 | 314 | return true; |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | foreach ($files as $file) { |
369 | 369 | |
370 | 370 | if ('php' === pathinfo($file->getFilename(), PATHINFO_EXTENSION) && |
371 | - ! preg_match('#/tests/#', $file->getPath()) |
|
371 | + !preg_match('#/tests/#', $file->getPath()) |
|
372 | 372 | ) { |
373 | 373 | $current = str_replace($path, '', $file->getPathname()); |
374 | 374 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | } |
381 | 381 | |
382 | 382 | } catch (UnexpectedValueException $e) { |
383 | - $hashes[$current . ' failed'] = $e->getMessage(); |
|
383 | + $hashes[$current.' failed'] = $e->getMessage(); |
|
384 | 384 | } |
385 | 385 | |
386 | 386 | return json_encode($hashes); |
@@ -410,12 +410,12 @@ discard block |
||
410 | 410 | public function cleanInstallation() |
411 | 411 | { |
412 | 412 | // Remove './config/database.php' file: no need of prompt anything to the user |
413 | - if (file_exists(PMF_ROOT_DIR . '/config/database.php')) { |
|
414 | - @unlink(PMF_ROOT_DIR . '/config/database.php'); |
|
413 | + if (file_exists(PMF_ROOT_DIR.'/config/database.php')) { |
|
414 | + @unlink(PMF_ROOT_DIR.'/config/database.php'); |
|
415 | 415 | } |
416 | 416 | // Remove './config/ldap.php' file: no need of prompt anything to the user |
417 | - if (file_exists(PMF_ROOT_DIR . '/config/ldap.php')) { |
|
418 | - @unlink(PMF_ROOT_DIR . '/config/ldap.php'); |
|
417 | + if (file_exists(PMF_ROOT_DIR.'/config/ldap.php')) { |
|
418 | + @unlink(PMF_ROOT_DIR.'/config/ldap.php'); |
|
419 | 419 | } |
420 | 420 | } |
421 | 421 |
@@ -1,21 +1,21 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Class for checking system requirements |
|
4 | - * |
|
5 | - * PHP Version 5.3 |
|
6 | - * |
|
7 | - * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | - * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | - * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | - * |
|
11 | - * @category phpMyFAQ |
|
12 | - * @package PMF_System |
|
13 | - * @author Thorsten Rinne <[email protected]> |
|
14 | - * @copyright 2010-2016 phpMyFAQ Team |
|
15 | - * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
16 | - * @link http://www.phpmyfaq.de |
|
17 | - * @since 2010-01-13 |
|
18 | - */ |
|
3 | + * Class for checking system requirements |
|
4 | + * |
|
5 | + * PHP Version 5.3 |
|
6 | + * |
|
7 | + * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | + * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | + * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | + * |
|
11 | + * @category phpMyFAQ |
|
12 | + * @package PMF_System |
|
13 | + * @author Thorsten Rinne <[email protected]> |
|
14 | + * @copyright 2010-2016 phpMyFAQ Team |
|
15 | + * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
16 | + * @link http://www.phpmyfaq.de |
|
17 | + * @since 2010-01-13 |
|
18 | + */ |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * PMF_System |
@@ -147,7 +147,7 @@ |
||
147 | 147 | WHERE |
148 | 148 | time < %d", |
149 | 149 | PMF_Db::getTablePrefix(), |
150 | - $_SERVER['REQUEST_TIME'] - 30 * 86400 |
|
150 | + $_SERVER['REQUEST_TIME'] - 30*86400 |
|
151 | 151 | ); |
152 | 152 | |
153 | 153 | if ($this->_config->getDb()->query($query)) { |
@@ -1,21 +1,21 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * The main Logging class |
|
4 | - * |
|
5 | - * PHP Version 5.3 |
|
6 | - * |
|
7 | - * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | - * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | - * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | - * |
|
11 | - * @category phpMyFAQ |
|
12 | - * @package PMF_Logging |
|
13 | - * @author Thorsten Rinne <[email protected]> |
|
14 | - * @copyright 2006-2016 phpMyFAQ Team |
|
15 | - * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
16 | - * @link http://www.phpmyfaq.de |
|
17 | - * @since 2006-08-15 |
|
18 | - */ |
|
3 | + * The main Logging class |
|
4 | + * |
|
5 | + * PHP Version 5.3 |
|
6 | + * |
|
7 | + * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | + * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | + * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | + * |
|
11 | + * @category phpMyFAQ |
|
12 | + * @package PMF_Logging |
|
13 | + * @author Thorsten Rinne <[email protected]> |
|
14 | + * @copyright 2006-2016 phpMyFAQ Team |
|
15 | + * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
16 | + * @link http://www.phpmyfaq.de |
|
17 | + * @since 2006-08-15 |
|
18 | + */ |
|
19 | 19 | |
20 | 20 | if (!defined('IS_VALID_PHPMYFAQ')) { |
21 | 21 | exit(); |
@@ -92,10 +92,10 @@ discard block |
||
92 | 92 | $result = $this->_config->getDb()->query($query); |
93 | 93 | while ($row = $this->_config->getDb()->fetchObject($result)) { |
94 | 94 | $data[$row->id] = array( |
95 | - 'time' => $row->time, |
|
96 | - 'usr' => $row->usr, |
|
97 | - 'text' => $row->text, |
|
98 | - 'ip' => $row->ip |
|
95 | + 'time' => $row->time, |
|
96 | + 'usr' => $row->usr, |
|
97 | + 'text' => $row->text, |
|
98 | + 'ip' => $row->ip |
|
99 | 99 | ); |
100 | 100 | } |
101 | 101 |
@@ -440,7 +440,7 @@ |
||
440 | 440 | $i++; |
441 | 441 | if ($max - $min > 0) { |
442 | 442 | $CSSRelevanceLevel = |
443 | - (int)($CSSRelevanceMinLevel + $CSSRelevanceMaxLevel * ($tag['count'] - $min) / ($max - $min)); |
|
443 | + (int)($CSSRelevanceMinLevel + $CSSRelevanceMaxLevel*($tag['count'] - $min)/($max - $min)); |
|
444 | 444 | } |
445 | 445 | $class = 'relevance'.$CSSRelevanceLevel; |
446 | 446 | $html .= '<span class="'.$class.'">'; |
@@ -1,23 +1,23 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * The main Tags class |
|
4 | - * |
|
5 | - * PHP Version 5.3 |
|
6 | - * |
|
7 | - * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | - * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | - * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | - * |
|
11 | - * @category phpMyFAQ |
|
12 | - * @package PMF_Tags |
|
13 | - * @author Thorsten Rinne <[email protected]> |
|
14 | - * @author Matteo Scaramuccia <[email protected]> |
|
15 | - * @author Georgi Korchev <[email protected]> |
|
16 | - * @copyright 2006-2016 phpMyFAQ Team |
|
17 | - * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
18 | - * @link http://www.phpmyfaq.de |
|
19 | - * @since 2006-08-10 |
|
20 | - */ |
|
3 | + * The main Tags class |
|
4 | + * |
|
5 | + * PHP Version 5.3 |
|
6 | + * |
|
7 | + * This Source Code Form is subject to the terms of the Mozilla Public License, |
|
8 | + * v. 2.0. If a copy of the MPL was not distributed with this file, You can |
|
9 | + * obtain one at http://mozilla.org/MPL/2.0/. |
|
10 | + * |
|
11 | + * @category phpMyFAQ |
|
12 | + * @package PMF_Tags |
|
13 | + * @author Thorsten Rinne <[email protected]> |
|
14 | + * @author Matteo Scaramuccia <[email protected]> |
|
15 | + * @author Georgi Korchev <[email protected]> |
|
16 | + * @copyright 2006-2016 phpMyFAQ Team |
|
17 | + * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
|
18 | + * @link http://www.phpmyfaq.de |
|
19 | + * @since 2006-08-10 |
|
20 | + */ |
|
21 | 21 | |
22 | 22 | if (!defined('IS_VALID_PHPMYFAQ')) { |
23 | 23 | exit(); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | $tagName = trim($tagName); |
211 | 211 | if (PMF_String::strlen($tagName) > 0) { |
212 | 212 | if (!in_array(PMF_String::strtolower($tagName), |
213 | - array_map(array('PMF_String', 'strtolower'), $currentTags))) { |
|
213 | + array_map(array('PMF_String', 'strtolower'), $currentTags))) { |
|
214 | 214 | // Create the new tag |
215 | 215 | $newTagId = $this->_config->getDb()->nextId(PMF_Db::getTablePrefix().'faqtags', 'tagging_id'); |
216 | 216 | $query = sprintf(" |