@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | function get_primary_key() |
16 | 16 | { |
17 | 17 | $res = $this->dataset->raw_query("SHOW INDEX FROM $this->tablename WHERE Key_name='PRIMARY'"); |
18 | - if($res === false) |
|
18 | + if ($res === false) |
|
19 | 19 | { |
20 | 20 | return false; |
21 | 21 | } |
@@ -25,17 +25,17 @@ discard block |
||
25 | 25 | function prefetch_all($key = false) |
26 | 26 | { |
27 | 27 | $array = $this->read(false, false); |
28 | - if($key === false) |
|
28 | + if ($key === false) |
|
29 | 29 | { |
30 | 30 | $key = $this->get_primary_key(); |
31 | 31 | } |
32 | 32 | $count = count($array); |
33 | 33 | $this->data = array(); |
34 | - for($i = 0; $i < $count; $i++) |
|
34 | + for ($i = 0; $i < $count; $i++) |
|
35 | 35 | { |
36 | - if(isset($this->data[$array[$i][$key]])) |
|
36 | + if (isset($this->data[$array[$i][$key]])) |
|
37 | 37 | { |
38 | - if(isset($this->data[$array[$i][$key]][0])) |
|
38 | + if (isset($this->data[$array[$i][$key]][0])) |
|
39 | 39 | { |
40 | 40 | array_push($this->data[$array[$i][$key]], $array[$i]); |
41 | 41 | } |
@@ -51,19 +51,19 @@ discard block |
||
51 | 51 | } |
52 | 52 | } |
53 | 53 | |
54 | - function count($filter=false) |
|
54 | + function count($filter = false) |
|
55 | 55 | { |
56 | - if($this->data !== null) |
|
56 | + if ($this->data !== null) |
|
57 | 57 | { |
58 | 58 | return parent::count($filter); |
59 | 59 | } |
60 | 60 | $where = false; |
61 | - if($filter !== false) |
|
61 | + if ($filter !== false) |
|
62 | 62 | { |
63 | 63 | $where = $filter->to_sql_string(); |
64 | 64 | } |
65 | 65 | $ret = $this->dataset->read($this->tablename, $where, 'COUNT(*)'); |
66 | - if($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)'])) |
|
66 | + if ($ret === false || !isset($ret[0]) || !isset($ret[0]['COUNT(*)'])) |
|
67 | 67 | { |
68 | 68 | return false; |
69 | 69 | } |
@@ -73,18 +73,18 @@ discard block |
||
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
76 | - function search($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false) |
|
76 | + function search($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) |
|
77 | 77 | { |
78 | - if($this->data !== null) |
|
78 | + if ($this->data !== null) |
|
79 | 79 | { |
80 | 80 | return parent::search($filter, $select); |
81 | 81 | } |
82 | 82 | $where = false; |
83 | - if($filter !== false) |
|
83 | + if ($filter !== false) |
|
84 | 84 | { |
85 | 85 | $where = $filter->to_sql_string(); |
86 | 86 | } |
87 | - if($select !== false && is_array($select)) |
|
87 | + if ($select !== false && is_array($select)) |
|
88 | 88 | { |
89 | 89 | $select = implode(',', $select); |
90 | 90 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | function delete($filter) |
106 | 106 | { |
107 | 107 | $where = false; |
108 | - if($filter !== false) |
|
108 | + if ($filter !== false) |
|
109 | 109 | { |
110 | 110 | $where = $filter->to_sql_string(); |
111 | 111 | } |
@@ -7,9 +7,9 @@ discard block |
||
7 | 7 | public $var2; |
8 | 8 | public $op; |
9 | 9 | |
10 | - function __construct($string=false) |
|
10 | + function __construct($string = false) |
|
11 | 11 | { |
12 | - if($string !== false) $this->process_filter_string($string); |
|
12 | + if ($string !== false) $this->process_filter_string($string); |
|
13 | 13 | } |
14 | 14 | |
15 | 15 | static function str_startswith($haystack, $needle) |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | protected function process_filter_string($string) |
21 | 21 | { |
22 | - if(self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || |
|
22 | + if (self::str_startswith($string, 'substringof') || self::str_startswith($string, 'contains') || |
|
23 | 23 | self::str_startswith($string, 'indexof')) |
24 | 24 | { |
25 | 25 | $this->op = strtok($string, '('); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $field = strtok($string, ' '); |
31 | 31 | $op = strtok(' '); |
32 | 32 | $rest = strtok("\0"); |
33 | - switch($op) |
|
33 | + switch ($op) |
|
34 | 34 | { |
35 | 35 | case 'ne': |
36 | 36 | $op = '!='; |
@@ -59,11 +59,11 @@ discard block |
||
59 | 59 | function to_sql_string() |
60 | 60 | { |
61 | 61 | $str = ''; |
62 | - switch($this->op) |
|
62 | + switch ($this->op) |
|
63 | 63 | { |
64 | 64 | case 'substringof': |
65 | 65 | case 'contains': |
66 | - $str = $this->var1.' LIKE \'%'.trim($this->var2,"'").'%\''; |
|
66 | + $str = $this->var1.' LIKE \'%'.trim($this->var2, "'").'%\''; |
|
67 | 67 | break; |
68 | 68 | default: |
69 | 69 | $str = $this->var1.$this->op.$this->var2; |
@@ -75,17 +75,17 @@ discard block |
||
75 | 75 | function to_ldap_string() |
76 | 76 | { |
77 | 77 | $str = '('; |
78 | - switch($this->op) |
|
78 | + switch ($this->op) |
|
79 | 79 | { |
80 | 80 | case 'substringof': |
81 | 81 | case 'contains': |
82 | - $str.=$this->var1.$this->op.'*'.trim($this->var2,"'").'*'; |
|
82 | + $str .= $this->var1.$this->op.'*'.trim($this->var2, "'").'*'; |
|
83 | 83 | break; |
84 | 84 | case '!=': |
85 | - $str.='!('.$this->var1.'='.$this->var2.')'; |
|
85 | + $str .= '!('.$this->var1.'='.$this->var2.')'; |
|
86 | 86 | break; |
87 | 87 | default: |
88 | - $str.=$this->var1.$this->op.$this->var2; |
|
88 | + $str .= $this->var1.$this->op.$this->var2; |
|
89 | 89 | break; |
90 | 90 | } |
91 | 91 | return $str.')'; |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | function to_mongo_filter() |
95 | 95 | { |
96 | 96 | $this->var2 = trim($this->var2, "'"); |
97 | - if($this->var1 === '_id') |
|
97 | + if ($this->var1 === '_id') |
|
98 | 98 | { |
99 | 99 | $this->var2 = new \MongoId($this->var2); |
100 | 100 | } |
101 | - switch($this->op) |
|
101 | + switch ($this->op) |
|
102 | 102 | { |
103 | 103 | case '!=': |
104 | 104 | return array($this->var1=>array('$ne'=>$this->var2)); |
@@ -117,13 +117,13 @@ discard block |
||
117 | 117 | case 'indexof': |
118 | 118 | $field = $this->var1; |
119 | 119 | $case = false; |
120 | - if(self::str_startswith($this->var1, 'tolower')) |
|
120 | + if (self::str_startswith($this->var1, 'tolower')) |
|
121 | 121 | { |
122 | - $field = substr($this->var1, strpos($this->var1, '(')+1); |
|
122 | + $field = substr($this->var1, strpos($this->var1, '(') + 1); |
|
123 | 123 | $field = substr($field, 0, strpos($field, ')')); |
124 | 124 | $case = true; |
125 | 125 | } |
126 | - if($case) |
|
126 | + if ($case) |
|
127 | 127 | { |
128 | 128 | return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); |
129 | 129 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | |
137 | 137 | function php_compare($value) |
138 | 138 | { |
139 | - switch($this->op) |
|
139 | + switch ($this->op) |
|
140 | 140 | { |
141 | 141 | case '!=': |
142 | 142 | return $value != $this->var2; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * We use the FlipsideSettings class for a list of sites and settings |
17 | 17 | * about CDNs and minified JS/CSS |
18 | 18 | */ |
19 | -if(isset($GLOBALS['FLIPSIDE_SETTINGS_LOC'])) |
|
19 | +if (isset($GLOBALS['FLIPSIDE_SETTINGS_LOC'])) |
|
20 | 20 | { |
21 | 21 | require_once($GLOBALS['FLIPSIDE_SETTINGS_LOC'].'/class.FlipsideSettings.php'); |
22 | 22 | } |
@@ -30,32 +30,32 @@ discard block |
||
30 | 30 | */ |
31 | 31 | require_once('class.WebPage.php'); |
32 | 32 | |
33 | -define('JS_JQUERY', 0); |
|
34 | -define('JS_JQUERY_UI', 1); |
|
35 | -define('JS_BOOTSTRAP', 2); |
|
33 | +define('JS_JQUERY', 0); |
|
34 | +define('JS_JQUERY_UI', 1); |
|
35 | +define('JS_BOOTSTRAP', 2); |
|
36 | 36 | define('JQUERY_VALIDATE', 3); |
37 | -define('JQUERY_TOUCH', 4); |
|
38 | -define('JS_TINYNAV', 5); |
|
37 | +define('JQUERY_TOUCH', 4); |
|
38 | +define('JS_TINYNAV', 5); |
|
39 | 39 | define('JS_BOOTSTRAP_FH', 6); |
40 | 40 | define('JS_BOOTSTRAP_SW', 7); |
41 | -define('JS_DATATABLE', 8); |
|
42 | -define('JS_CHART', 9); |
|
43 | -define('JS_METISMENU', 10); |
|
44 | -define('JS_BOOTBOX', 11); |
|
41 | +define('JS_DATATABLE', 8); |
|
42 | +define('JS_CHART', 9); |
|
43 | +define('JS_METISMENU', 10); |
|
44 | +define('JS_BOOTBOX', 11); |
|
45 | 45 | define('JS_DATATABLE_ODATA', 12); |
46 | -define('JS_CRYPTO_MD5_JS', 13); |
|
47 | -define('JS_JCROP', 14); |
|
48 | -define('JS_TYPEAHEAD', 15); |
|
49 | -define('JS_FLIPSIDE', 20); |
|
50 | -define('JS_LOGIN', 21); |
|
51 | - |
|
52 | -define('CSS_JQUERY_UI', 0); |
|
53 | -define('CSS_BOOTSTRAP', 1); |
|
46 | +define('JS_CRYPTO_MD5_JS', 13); |
|
47 | +define('JS_JCROP', 14); |
|
48 | +define('JS_TYPEAHEAD', 15); |
|
49 | +define('JS_FLIPSIDE', 20); |
|
50 | +define('JS_LOGIN', 21); |
|
51 | + |
|
52 | +define('CSS_JQUERY_UI', 0); |
|
53 | +define('CSS_BOOTSTRAP', 1); |
|
54 | 54 | define('CSS_BOOTSTRAP_FH', 2); |
55 | 55 | define('CSS_BOOTSTRAP_SW', 3); |
56 | -define('CSS_DATATABLE', 4); |
|
57 | -define('CSS_JCROP', 5); |
|
58 | -define('CSS_FONTAWESOME', 6); |
|
56 | +define('CSS_DATATABLE', 4); |
|
57 | +define('CSS_JCROP', 5); |
|
58 | +define('CSS_FONTAWESOME', 6); |
|
59 | 59 | |
60 | 60 | global $jsArray; |
61 | 61 | $jsArray = array( |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | * |
350 | 350 | * @SuppressWarnings("StaticAccess") |
351 | 351 | */ |
352 | - function __construct($title, $header=true) |
|
352 | + function __construct($title, $header = true) |
|
353 | 353 | { |
354 | 354 | parent::__construct($title); |
355 | 355 | $this->setupVars(); |
@@ -361,13 +361,13 @@ discard block |
||
361 | 361 | $this->notifications = array(); |
362 | 362 | $this->loginUrl = 'login.php'; |
363 | 363 | $this->logoutUrl = 'logout.php'; |
364 | - if(isset(FlipsideSettings::$global)) |
|
364 | + if (isset(FlipsideSettings::$global)) |
|
365 | 365 | { |
366 | - if(isset(FlipsideSettings::$global['login_url'])) |
|
366 | + if (isset(FlipsideSettings::$global['login_url'])) |
|
367 | 367 | { |
368 | 368 | $this->loginUrl = FlipsideSettings::$global['login_url']; |
369 | 369 | } |
370 | - if(isset(FlipsideSettings::$global['logout_url'])) |
|
370 | + if (isset(FlipsideSettings::$global['logout_url'])) |
|
371 | 371 | { |
372 | 372 | $this->logoutUrl = FlipsideSettings::$global['logout_url']; |
373 | 373 | } |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | */ |
383 | 383 | protected function getSites() |
384 | 384 | { |
385 | - if(isset(FlipsideSettings::$sites)) |
|
385 | + if (isset(FlipsideSettings::$sites)) |
|
386 | 386 | { |
387 | 387 | return FlipsideSettings::$sites; |
388 | 388 | } |
@@ -398,9 +398,9 @@ discard block |
||
398 | 398 | */ |
399 | 399 | protected function addAllLinks() |
400 | 400 | { |
401 | - if($this->user === false || $this->user === null) |
|
401 | + if ($this->user === false || $this->user === null) |
|
402 | 402 | { |
403 | - if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
|
403 | + if (isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
|
404 | 404 | { |
405 | 405 | $this->addLink('Login', $this->loginUrl); |
406 | 406 | } |
@@ -423,16 +423,16 @@ discard block |
||
423 | 423 | */ |
424 | 424 | private function setupVars() |
425 | 425 | { |
426 | - if($this->minified !== null && $this->cdn !== null) return; |
|
426 | + if ($this->minified !== null && $this->cdn !== null) return; |
|
427 | 427 | $this->minified = 'min'; |
428 | 428 | $this->cdn = 'cdn'; |
429 | - if(isset(FlipsideSettings::$global)) |
|
429 | + if (isset(FlipsideSettings::$global)) |
|
430 | 430 | { |
431 | - if(isset(FlipsideSettings::$global['use_minified']) && !FlipsideSettings::$global['use_minified']) |
|
431 | + if (isset(FlipsideSettings::$global['use_minified']) && !FlipsideSettings::$global['use_minified']) |
|
432 | 432 | { |
433 | 433 | $this->minified = 'no'; |
434 | 434 | } |
435 | - if(isset(FlipsideSettings::$global['use_cdn']) && !FlipsideSettings::$global['use_cdn']) |
|
435 | + if (isset(FlipsideSettings::$global['use_cdn']) && !FlipsideSettings::$global['use_cdn']) |
|
436 | 436 | { |
437 | 437 | $this->cdn = 'no'; |
438 | 438 | } |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | * |
448 | 448 | * @deprecated 2.0.0 Please use addJSByURI() instead |
449 | 449 | */ |
450 | - function add_js_from_src($src, $async=true) |
|
450 | + function add_js_from_src($src, $async = true) |
|
451 | 451 | { |
452 | 452 | $this->addJSByURI($src, $async); |
453 | 453 | } |
@@ -458,10 +458,10 @@ discard block |
||
458 | 458 | * @param string $uri The webpath to the JavaScript file |
459 | 459 | * @param boolean $async Can the JavaScript be loaded asynchronously? |
460 | 460 | */ |
461 | - public function addJSByURI($uri, $async=true) |
|
461 | + public function addJSByURI($uri, $async = true) |
|
462 | 462 | { |
463 | 463 | $attributes = array('src'=>$uri, 'type'=>'text/javascript'); |
464 | - if($async === true) |
|
464 | + if ($async === true) |
|
465 | 465 | { |
466 | 466 | $attributes['async'] = true; |
467 | 467 | } |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | * |
480 | 480 | * @deprecated 2.0.0 Please use addCSSByURI() instead |
481 | 481 | */ |
482 | - function add_css_from_src($src, $import=false) |
|
482 | + function add_css_from_src($src, $import = false) |
|
483 | 483 | { |
484 | 484 | $this->addCSSByURI($src, $import); |
485 | 485 | } |
@@ -490,10 +490,10 @@ discard block |
||
490 | 490 | * @param string $src The webpath to the Cascading Style Sheet file |
491 | 491 | * @param boolean $async Can the CSS be loaded asynchronously? |
492 | 492 | */ |
493 | - public function addCSSByURI($uri, $async=false) |
|
493 | + public function addCSSByURI($uri, $async = false) |
|
494 | 494 | { |
495 | 495 | $attributes = array('rel'=>'stylesheet', 'href'=>$uri, 'type'=>'text/css'); |
496 | - if($async === true && $this->importSupport === true) |
|
496 | + if ($async === true && $this->importSupport === true) |
|
497 | 497 | { |
498 | 498 | $attributes['rel'] = 'import'; |
499 | 499 | } |
@@ -509,12 +509,12 @@ discard block |
||
509 | 509 | * |
510 | 510 | * @deprecated 2.0.0 Please use addWellKnownJS() instead |
511 | 511 | */ |
512 | - function addJS($type, $async=true) |
|
512 | + function addJS($type, $async = true) |
|
513 | 513 | { |
514 | 514 | $this->addWellKnownJS($type, $async); |
515 | 515 | } |
516 | 516 | |
517 | - function add_js($type, $async=true) |
|
517 | + function add_js($type, $async = true) |
|
518 | 518 | { |
519 | 519 | $this->addWellKnownJS($type, $async); |
520 | 520 | } |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | * @param string $jsFileID the ID of the JS file |
526 | 526 | * @param boolean $async Can the JS file be loaded asynchronously? |
527 | 527 | */ |
528 | - public function addWellKnownJS($jsFileID, $async=true) |
|
528 | + public function addWellKnownJS($jsFileID, $async = true) |
|
529 | 529 | { |
530 | 530 | global $jsArray; |
531 | 531 | $this->setupVars(); |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | * |
542 | 542 | * @deprecated 2.0.0 Please use addWellKnownCSS() instead |
543 | 543 | */ |
544 | - function add_css($type, $import=false) |
|
544 | + function add_css($type, $import = false) |
|
545 | 545 | { |
546 | 546 | $this->addWellKnownCSS($type, $import); |
547 | 547 | } |
@@ -552,7 +552,7 @@ discard block |
||
552 | 552 | * @param string $cssFileID the ID of the CSS file |
553 | 553 | * @param boolean $async Can the CSS file be loaded asynchronously? |
554 | 554 | */ |
555 | - public function addWellKnownCSS($cssFileID, $async=true) |
|
555 | + public function addWellKnownCSS($cssFileID, $async = true) |
|
556 | 556 | { |
557 | 557 | global $cssArray; |
558 | 558 | $this->setupVars(); |
@@ -575,16 +575,16 @@ discard block |
||
575 | 575 | $sites = $this->getSites(); |
576 | 576 | $names = array_keys($sites); |
577 | 577 | $ret = ''; |
578 | - foreach($names as $name) |
|
578 | + foreach ($names as $name) |
|
579 | 579 | { |
580 | - $ret.='<li>'.$this->createLink($name, $sites[$name]).'</li>'; |
|
580 | + $ret .= '<li>'.$this->createLink($name, $sites[$name]).'</li>'; |
|
581 | 581 | } |
582 | 582 | return $ret; |
583 | 583 | } |
584 | 584 | |
585 | 585 | protected function getHrefForDropdown(&$link) |
586 | 586 | { |
587 | - if(isset($link['_'])) |
|
587 | + if (isset($link['_'])) |
|
588 | 588 | { |
589 | 589 | $ret = $link['_']; |
590 | 590 | unset($link['_']); |
@@ -597,24 +597,24 @@ discard block |
||
597 | 597 | { |
598 | 598 | $ret = '<li class="dropdown">'; |
599 | 599 | $href = $this->getHrefForDropdown($link); |
600 | - $ret.= '<a href="'.$href.'" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.$name.' <span class="caret"></span></a>'; |
|
601 | - $ret.='<ul class="dropdown-menu">'; |
|
600 | + $ret .= '<a href="'.$href.'" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.$name.' <span class="caret"></span></a>'; |
|
601 | + $ret .= '<ul class="dropdown-menu">'; |
|
602 | 602 | $subNames = array_keys($link); |
603 | - foreach($subNames as $subName) |
|
603 | + foreach ($subNames as $subName) |
|
604 | 604 | { |
605 | - $ret.=$this->getLinkByName($subName, $link); |
|
605 | + $ret .= $this->getLinkByName($subName, $link); |
|
606 | 606 | } |
607 | - $ret.='</ul></li>'; |
|
607 | + $ret .= '</ul></li>'; |
|
608 | 608 | return $ret; |
609 | 609 | } |
610 | 610 | |
611 | 611 | protected function getLinkByName($name, $links) |
612 | 612 | { |
613 | - if(is_array($links[$name])) |
|
613 | + if (is_array($links[$name])) |
|
614 | 614 | { |
615 | 615 | return $this->getDropdown($links[$name], $name); |
616 | 616 | } |
617 | - if($links[$name] === false) |
|
617 | + if ($links[$name] === false) |
|
618 | 618 | { |
619 | 619 | return '<li>'.$name.'</li>'; |
620 | 620 | } |
@@ -625,9 +625,9 @@ discard block |
||
625 | 625 | { |
626 | 626 | $names = array_keys($this->links); |
627 | 627 | $ret = ''; |
628 | - foreach($names as $name) |
|
628 | + foreach ($names as $name) |
|
629 | 629 | { |
630 | - $ret.=$this->getLinkByName($name, $this->links); |
|
630 | + $ret .= $this->getLinkByName($name, $this->links); |
|
631 | 631 | } |
632 | 632 | return $ret; |
633 | 633 | } |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | { |
640 | 640 | $sites = $this->getSiteLinksForHeader(); |
641 | 641 | $links = $this->getLinksMenus(); |
642 | - $header ='<nav class="navbar navbar-default navbar-fixed-top"> |
|
642 | + $header = '<nav class="navbar navbar-default navbar-fixed-top"> |
|
643 | 643 | <div class="container-fluid"> |
644 | 644 | <!-- Brand and toggle get grouped for better mobile display --> |
645 | 645 | <div class="navbar-header"> |
@@ -668,7 +668,7 @@ discard block |
||
668 | 668 | </div> |
669 | 669 | </nav>'; |
670 | 670 | $this->body = $header.$this->body; |
671 | - $this->body_tags.='style="padding-top: 60px;"'; |
|
671 | + $this->body_tags .= 'style="padding-top: 60px;"'; |
|
672 | 672 | } |
673 | 673 | |
674 | 674 | /** Notification that is green for success */ |
@@ -689,7 +689,7 @@ discard block |
||
689 | 689 | * |
690 | 690 | * @deprecated 2.0.0 Use the addNotification function instead |
691 | 691 | */ |
692 | - function add_notification($msg, $sev=self::NOTIFICATION_INFO, $dismissible=1) |
|
692 | + function add_notification($msg, $sev = self::NOTIFICATION_INFO, $dismissible = 1) |
|
693 | 693 | { |
694 | 694 | $notice = array('msg'=>$msg, 'sev'=>$sev, 'dismissible'=>$dismissible); |
695 | 695 | array_push($this->notifications, $notice); |
@@ -704,7 +704,7 @@ discard block |
||
704 | 704 | * |
705 | 705 | * @deprecated 2.0.0 Use the addNotification function instead |
706 | 706 | */ |
707 | - public function addNotification($message, $severity=self::NOTIFICATION_INFO, $dismissible=true) |
|
707 | + public function addNotification($message, $severity = self::NOTIFICATION_INFO, $dismissible = true) |
|
708 | 708 | { |
709 | 709 | array_push($this->notificatons, array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); |
710 | 710 | } |
@@ -715,21 +715,21 @@ discard block |
||
715 | 715 | private function renderNotifications() |
716 | 716 | { |
717 | 717 | $count = count($this->notifications); |
718 | - if($count === 0) |
|
718 | + if ($count === 0) |
|
719 | 719 | { |
720 | 720 | return; |
721 | 721 | } |
722 | - for($i = 0; $i < $count; $i++) |
|
722 | + for ($i = 0; $i < $count; $i++) |
|
723 | 723 | { |
724 | 724 | $class = 'alert '.$this->notifications[$i]['sev']; |
725 | 725 | $button = ''; |
726 | - if($this->notifications[$i]['dismissible']) |
|
726 | + if ($this->notifications[$i]['dismissible']) |
|
727 | 727 | { |
728 | 728 | $class .= ' alert-dismissible'; |
729 | 729 | $button = '<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>'; |
730 | 730 | } |
731 | 731 | $prefix = ''; |
732 | - switch($this->notifications[$i]['sev']) |
|
732 | + switch ($this->notifications[$i]['sev']) |
|
733 | 733 | { |
734 | 734 | case self::NOTIFICATION_INFO: |
735 | 735 | $prefix = '<strong>Notice:</strong> '; |
@@ -742,10 +742,10 @@ discard block |
||
742 | 742 | break; |
743 | 743 | } |
744 | 744 | $style = ''; |
745 | - if($i+1 < count($this->notifications)) |
|
745 | + if ($i + 1 < count($this->notifications)) |
|
746 | 746 | { |
747 | 747 | //Not the last notification, remove the end margin |
748 | - $style='style="margin: 0px;"'; |
|
748 | + $style = 'style="margin: 0px;"'; |
|
749 | 749 | } |
750 | 750 | $this->body = ' |
751 | 751 | <div class="'.$class.'" role="alert" '.$style.'> |
@@ -773,7 +773,7 @@ discard block |
||
773 | 773 | */ |
774 | 774 | private function addAnalyticsBlock() |
775 | 775 | { |
776 | - if($this->analytics === false) |
|
776 | + if ($this->analytics === false) |
|
777 | 777 | { |
778 | 778 | return; |
779 | 779 | } |
@@ -795,12 +795,12 @@ discard block |
||
795 | 795 | * @param boolean $header Draw the header |
796 | 796 | * @param boolean $analytics Include analytics on the page |
797 | 797 | */ |
798 | - public function printPage($header=true) |
|
798 | + public function printPage($header = true) |
|
799 | 799 | { |
800 | 800 | $this->renderNotifications(); |
801 | 801 | $this->addNoScript(); |
802 | 802 | $this->addAnalyticsBlock(); |
803 | - if($this->header || $header) |
|
803 | + if ($this->header || $header) |
|
804 | 804 | { |
805 | 805 | $this->addHeader(); |
806 | 806 | } |
@@ -816,7 +816,7 @@ discard block |
||
816 | 816 | * |
817 | 817 | * @deprecated 1.0.0 Use addLink instead |
818 | 818 | */ |
819 | - function add_link($name, $url=false, $submenu=false) |
|
819 | + function add_link($name, $url = false, $submenu = false) |
|
820 | 820 | { |
821 | 821 | $this->addLink($name, $url, $submenu); |
822 | 822 | } |
@@ -828,9 +828,9 @@ discard block |
||
828 | 828 | * @param false|string $url The URL to link to |
829 | 829 | * @param false|array $subment Any submenu items for the dropdown |
830 | 830 | */ |
831 | - public function addLink($name, $url=false, $submenu=false) |
|
831 | + public function addLink($name, $url = false, $submenu = false) |
|
832 | 832 | { |
833 | - if(is_array($submenu)) |
|
833 | + if (is_array($submenu)) |
|
834 | 834 | { |
835 | 835 | $submenu['_'] = $url; |
836 | 836 | $this->links[$name] = $submenu; |
@@ -852,11 +852,11 @@ discard block |
||
852 | 852 | $authLinks = $auth->getSupplementaryLinks(); |
853 | 853 | $authLinksStr = ''; |
854 | 854 | $count = count($authLinks); |
855 | - for($i = 0; $i < $count; $i++) |
|
855 | + for ($i = 0; $i < $count; $i++) |
|
856 | 856 | { |
857 | 857 | $authLinksStr .= $authLinks[$i]; |
858 | 858 | } |
859 | - if($count > 0) |
|
859 | + if ($count > 0) |
|
860 | 860 | { |
861 | 861 | $authLinksStr = 'Sign in with '.$authLinksStr; |
862 | 862 | } |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | require_once('Autoload.php'); |
3 | -if(!isset($_SESSION) && php_sapi_name() !== 'cli') { session_start(); } |
|
4 | -if(!isset($_SESSION['ip_address']) && isset($_SERVER['REMOTE_ADDR'])) |
|
3 | +if (!isset($_SESSION) && php_sapi_name() !== 'cli') { session_start(); } |
|
4 | +if (!isset($_SESSION['ip_address']) && isset($_SERVER['REMOTE_ADDR'])) |
|
5 | 5 | { |
6 | 6 | $_SESSION['ip_address'] = $_SERVER['REMOTE_ADDR']; |
7 | 7 | } |
8 | -if(!isset($_SESSION['init_time'])) |
|
8 | +if (!isset($_SESSION['init_time'])) |
|
9 | 9 | { |
10 | 10 | $_SESSION['init_time'] = date('c'); |
11 | 11 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | static function getVar($name, $default = false) |
31 | 31 | { |
32 | - if(FlipSession::doesVarExist($name)) |
|
32 | + if (FlipSession::doesVarExist($name)) |
|
33 | 33 | { |
34 | 34 | return $_SESSION[$name]; |
35 | 35 | } |
@@ -56,11 +56,11 @@ discard block |
||
56 | 56 | */ |
57 | 57 | static function isLoggedIn() |
58 | 58 | { |
59 | - if(isset($_SESSION['flipside_user'])) |
|
59 | + if (isset($_SESSION['flipside_user'])) |
|
60 | 60 | { |
61 | 61 | return true; |
62 | 62 | } |
63 | - else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData'])) |
|
63 | + else if (isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData'])) |
|
64 | 64 | { |
65 | 65 | $auth = AuthProvider::getInstance(); |
66 | 66 | return $auth->isLoggedIn($_SESSION['AuthData'], $_SESSION['AuthMethod']); |
@@ -78,15 +78,15 @@ discard block |
||
78 | 78 | */ |
79 | 79 | static function getUser() |
80 | 80 | { |
81 | - if(isset($_SESSION['flipside_user'])) |
|
81 | + if (isset($_SESSION['flipside_user'])) |
|
82 | 82 | { |
83 | 83 | return $_SESSION['flipside_user']; |
84 | 84 | } |
85 | - else if(isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData'])) |
|
85 | + else if (isset($_SESSION['AuthMethod']) && isset($_SESSION['AuthData'])) |
|
86 | 86 | { |
87 | 87 | $auth = AuthProvider::getInstance(); |
88 | 88 | $user = $auth->getUser($_SESSION['AuthData'], $_SESSION['AuthMethod']); |
89 | - if($user !== null) |
|
89 | + if ($user !== null) |
|
90 | 90 | { |
91 | 91 | $_SESSION['flipside_user'] = $user; |
92 | 92 | } |
@@ -115,16 +115,16 @@ discard block |
||
115 | 115 | */ |
116 | 116 | static function getUserEmail() |
117 | 117 | { |
118 | - if(isset($_SESSION['flipside_email'])) |
|
118 | + if (isset($_SESSION['flipside_email'])) |
|
119 | 119 | { |
120 | 120 | return $_SESSION['flipside_email']; |
121 | 121 | } |
122 | 122 | $user = FlipSession::getUser(); |
123 | - if($user === false || $user === null) |
|
123 | + if ($user === false || $user === null) |
|
124 | 124 | { |
125 | 125 | return false; |
126 | 126 | } |
127 | - if(isset($user->mail) && isset($user->mail[0])) |
|
127 | + if (isset($user->mail) && isset($user->mail[0])) |
|
128 | 128 | { |
129 | 129 | $_SESSION['flipside_email'] = $user->mail[0]; |
130 | 130 | return $_SESSION['flipside_email']; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | static function end() |
141 | 141 | { |
142 | - if(isset($_SESSION) && !empty($_SESSION)) |
|
142 | + if (isset($_SESSION) && !empty($_SESSION)) |
|
143 | 143 | { |
144 | 144 | $_SESSION = array(); |
145 | 145 | session_destroy(); |
@@ -151,13 +151,13 @@ discard block |
||
151 | 151 | $res = array(); |
152 | 152 | $offset = 0; |
153 | 153 | $length = strlen($sessionData); |
154 | - while($offset < $length) |
|
154 | + while ($offset < $length) |
|
155 | 155 | { |
156 | 156 | $pos = strpos($sessionData, "|", $offset); |
157 | 157 | $len = $pos - $offset; |
158 | 158 | $name = substr($sessionData, $offset, $len); |
159 | - if($name === false) break; |
|
160 | - $offset += $len+1; |
|
159 | + if ($name === false) break; |
|
160 | + $offset += $len + 1; |
|
161 | 161 | $data = @unserialize(substr($sessionData, $offset)); |
162 | 162 | $res[$name] = $data; |
163 | 163 | $offset += strlen(serialize($data)); |
@@ -170,26 +170,26 @@ discard block |
||
170 | 170 | $res = array(); |
171 | 171 | $sessFiles = scandir(ini_get('session.save_path')); |
172 | 172 | $count = count($sessFiles); |
173 | - for($i = 0; $i < $count; $i++) |
|
173 | + for ($i = 0; $i < $count; $i++) |
|
174 | 174 | { |
175 | - if($sessFiles[$i][0] === '.') |
|
175 | + if ($sessFiles[$i][0] === '.') |
|
176 | 176 | { |
177 | 177 | continue; |
178 | 178 | } |
179 | 179 | $sessionId = substr($sessFiles[$i], 5); |
180 | 180 | $sessionData = file_get_contents(ini_get('session.save_path').'/'.$sessFiles[$i]); |
181 | - if($sessionData === false) |
|
181 | + if ($sessionData === false) |
|
182 | 182 | { |
183 | 183 | array_push($res, array('sid' => $sessionId)); |
184 | 184 | } |
185 | 185 | else |
186 | 186 | { |
187 | 187 | $tmp = FlipSession::unserializePhpSession($sessionData); |
188 | - $tmp['sid' ] = $sessionId; |
|
188 | + $tmp['sid'] = $sessionId; |
|
189 | 189 | array_push($res, $tmp); |
190 | 190 | } |
191 | 191 | } |
192 | - if(count($res) == 0) |
|
192 | + if (count($res) == 0) |
|
193 | 193 | { |
194 | 194 | return false; |
195 | 195 | } |
@@ -10,7 +10,7 @@ |
||
10 | 10 | * @link http://www.php.net/manual/en/class.jsonserializable.php |
11 | 11 | */ |
12 | 12 | |
13 | -if(PHP_VERSION_ID < 50400) |
|
13 | +if (PHP_VERSION_ID < 50400) |
|
14 | 14 | { |
15 | 15 | /** |
16 | 16 | * JsonSerializable interface |
@@ -58,11 +58,11 @@ discard block |
||
58 | 58 | $this->importSupport = false; |
59 | 59 | |
60 | 60 | $browserName = $this->getBrowserName(); |
61 | - if($browserName === 'IE' && $this->getBrowserMajorVer() <= 7) |
|
61 | + if ($browserName === 'IE' && $this->getBrowserMajorVer() <= 7) |
|
62 | 62 | { |
63 | - header( 'Location: /badbrowser.php' ) ; |
|
63 | + header('Location: /badbrowser.php'); |
|
64 | 64 | } |
65 | - else if($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36) |
|
65 | + else if ($browserName === 'Chrome' && $this->getBrowserMajorVer() >= 36) |
|
66 | 66 | { |
67 | 67 | $this->importSupport = true; |
68 | 68 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | protected function getBrowscap() |
79 | 79 | { |
80 | - if(isset($GLOBALS['BROWSCAP_CACHE'])) |
|
80 | + if (isset($GLOBALS['BROWSCAP_CACHE'])) |
|
81 | 81 | { |
82 | 82 | return new Browscap($GLOBALS['BROWSCAP_CACHE']); |
83 | 83 | } |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | */ |
90 | 90 | private function getBrowser() |
91 | 91 | { |
92 | - static $browser;//No accident can arise from depending on an unset variable. |
|
93 | - if(!isset($browser)) |
|
92 | + static $browser; //No accident can arise from depending on an unset variable. |
|
93 | + if (!isset($browser)) |
|
94 | 94 | { |
95 | 95 | $browser = $this->browscap->getBrowser(); |
96 | 96 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | private function getBrowserName() |
104 | 104 | { |
105 | - if(isset($this->browser->Browser)) |
|
105 | + if (isset($this->browser->Browser)) |
|
106 | 106 | { |
107 | 107 | return $this->browser->Browser; |
108 | 108 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | private function getBrowserMajorVer() |
119 | 119 | { |
120 | - if(isset($this->browser->MajorVer)) |
|
120 | + if (isset($this->browser->MajorVer)) |
|
121 | 121 | { |
122 | 122 | return $this->browser->MajorVer; |
123 | 123 | } |
@@ -190,19 +190,19 @@ discard block |
||
190 | 190 | * |
191 | 191 | * @return string The tag as a string |
192 | 192 | */ |
193 | - protected function createOpenTag($tagName, $attribs=array(), $selfClose=false) |
|
193 | + protected function createOpenTag($tagName, $attribs = array(), $selfClose = false) |
|
194 | 194 | { |
195 | 195 | $tag = '<'.$tagName; |
196 | 196 | $attribNames = array_keys($attribs); |
197 | - foreach($attribNames as $attribName) |
|
197 | + foreach ($attribNames as $attribName) |
|
198 | 198 | { |
199 | - $tag.=' '.$attribName; |
|
200 | - if($attribs[$attribName]) |
|
199 | + $tag .= ' '.$attribName; |
|
200 | + if ($attribs[$attribName]) |
|
201 | 201 | { |
202 | - $tag.='="'.$attribs[$attribName].'"'; |
|
202 | + $tag .= '="'.$attribs[$attribName].'"'; |
|
203 | 203 | } |
204 | 204 | } |
205 | - if($selfClose) |
|
205 | + if ($selfClose) |
|
206 | 206 | { |
207 | 207 | return $tag.'/>'; |
208 | 208 | } |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | * |
230 | 230 | * @return string The link |
231 | 231 | */ |
232 | - public function createLink($linkName, $linkTarget='#') |
|
232 | + public function createLink($linkName, $linkTarget = '#') |
|
233 | 233 | { |
234 | 234 | $startTag = $this->createOpenTag('a', array('href'=>$linkTarget)); |
235 | 235 | $endTag = $this->createCloseTag('a'); |
@@ -245,10 +245,10 @@ discard block |
||
245 | 245 | * |
246 | 246 | * @param string $prefix The prefix to append to each line |
247 | 247 | */ |
248 | - protected function printIeCompatability($prefix='') |
|
248 | + protected function printIeCompatability($prefix = '') |
|
249 | 249 | { |
250 | 250 | //IE 8 doesn't support HTML 5. Install the shim... |
251 | - if($this->getBrowserMajorVer() < 9) |
|
251 | + if ($this->getBrowserMajorVer() < 9) |
|
252 | 252 | { |
253 | 253 | echo $prefix.'<script src="js/html5.js"></script>'; |
254 | 254 | echo "\n"; |
@@ -263,16 +263,16 @@ discard block |
||
263 | 263 | * |
264 | 264 | * @param string $prefix The prefix to append to each line |
265 | 265 | */ |
266 | - protected function printHead($prefix='') |
|
266 | + protected function printHead($prefix = '') |
|
267 | 267 | { |
268 | 268 | echo $prefix.'<HEAD>'; |
269 | - if($this->getBrowserName() === 'IE') |
|
269 | + if ($this->getBrowserName() === 'IE') |
|
270 | 270 | { |
271 | 271 | $this->printIeCompatability($prefix.$prefix); |
272 | 272 | } |
273 | 273 | echo $prefix.$prefix.'<TITLE>'.$this->title.'</TITLE>'; |
274 | 274 | echo $prefix.$prefix.'<meta name="viewport" content="width=device-width, initial-scale=1.0">'; |
275 | - foreach($this->headTags as $tag) |
|
275 | + foreach ($this->headTags as $tag) |
|
276 | 276 | { |
277 | 277 | echo $prefix.$prefix.$tag."\n"; |
278 | 278 | } |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | * |
285 | 285 | * @param string $prefix The prefix to append to each line |
286 | 286 | */ |
287 | - protected function printBody($prefix='') |
|
287 | + protected function printBody($prefix = '') |
|
288 | 288 | { |
289 | 289 | echo $prefix.'<BODY '.$this->body_tags.'>'; |
290 | 290 | echo $prefix.$prefix.$this->body."\n"; |
@@ -312,16 +312,16 @@ discard block |
||
312 | 312 | */ |
313 | 313 | public function currentURL() |
314 | 314 | { |
315 | - if(!isset($_SERVER['REQUEST_URI'])) |
|
315 | + if (!isset($_SERVER['REQUEST_URI'])) |
|
316 | 316 | { |
317 | 317 | return ''; |
318 | 318 | } |
319 | 319 | $requestURI = $_SERVER['REQUEST_URI']; |
320 | - if($requestURI[0] === '/') |
|
320 | + if ($requestURI[0] === '/') |
|
321 | 321 | { |
322 | 322 | $requestURI = substr($requestURI, 1); |
323 | 323 | } |
324 | - return 'http'.(isset($_SERVER['HTTPS'])?'s':'').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI; |
|
324 | + return 'http'.(isset($_SERVER['HTTPS']) ? 's' : '').'://'.$_SERVER['HTTP_HOST'].'/'.$requestURI; |
|
325 | 325 | } |
326 | 326 | } |
327 | 327 | /* vim: set tabstop=4 shiftwidth=4 expandtab: */ |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | protected function __construct() |
38 | 38 | { |
39 | 39 | $this->methods = array(); |
40 | - if(isset(FlipsideSettings::$email_providers)) |
|
40 | + if (isset(FlipsideSettings::$email_providers)) |
|
41 | 41 | { |
42 | 42 | $keys = array_keys(FlipsideSettings::$email_providers); |
43 | 43 | $count = count($keys); |
44 | - for($i = 0; $i < $count; $i++) |
|
44 | + for ($i = 0; $i < $count; $i++) |
|
45 | 45 | { |
46 | 46 | $class = $keys[$i]; |
47 | 47 | array_push($this->methods, new $class(FlipsideSettings::$email_providers[$keys[$i]])); |
@@ -59,9 +59,9 @@ discard block |
||
59 | 59 | public function getEmailMethod($methodName) |
60 | 60 | { |
61 | 61 | $count = count($this->methods); |
62 | - for($i = 0; $i < $count; $i++) |
|
62 | + for ($i = 0; $i < $count; $i++) |
|
63 | 63 | { |
64 | - if(strcasecmp(get_class($this->methods[$i]), $methodName) === 0) |
|
64 | + if (strcasecmp(get_class($this->methods[$i]), $methodName) === 0) |
|
65 | 65 | { |
66 | 66 | return $this->methods[$i]; |
67 | 67 | } |
@@ -79,14 +79,14 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function sendEmail($email, $methodName = false) |
81 | 81 | { |
82 | - if($methodName === false) |
|
82 | + if ($methodName === false) |
|
83 | 83 | { |
84 | 84 | $res = false; |
85 | 85 | $count = count($this->methods); |
86 | - for($i = 0; $i < $count; $i++) |
|
86 | + for ($i = 0; $i < $count; $i++) |
|
87 | 87 | { |
88 | 88 | $res = $this->methods[$i]->sendEmail($email); |
89 | - if($res !== false) |
|
89 | + if ($res !== false) |
|
90 | 90 | { |
91 | 91 | return $res; |
92 | 92 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | public function sendEmail($email) |
29 | 29 | { |
30 | - if($email->hasAttachments()) |
|
30 | + if ($email->hasAttachments()) |
|
31 | 31 | { |
32 | 32 | //Amazeon sendEmail doesn't support attachments. We need to use sendRawEmail |
33 | 33 | $args = array(); |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | { |
6 | 6 | public $server; |
7 | 7 | |
8 | - function __construct($array=false, $server=false) |
|
8 | + function __construct($array = false, $server = false) |
|
9 | 9 | { |
10 | 10 | parent::__construct($array); |
11 | 11 | $this->server = $server; |
@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | $ret = array(); |
17 | 17 | foreach ($this as $key => $value) |
18 | 18 | { |
19 | - if($key === 'server' || $key === 'count') continue; |
|
20 | - if(is_numeric($key)) continue; |
|
21 | - if($key === 'jpegphoto') |
|
19 | + if ($key === 'server' || $key === 'count') continue; |
|
20 | + if (is_numeric($key)) continue; |
|
21 | + if ($key === 'jpegphoto') |
|
22 | 22 | { |
23 | 23 | $ret[$key] = base64_encode($value[0]); |
24 | 24 | continue; |
25 | 25 | } |
26 | - if(is_array($value) && $value['count'] === 1) |
|
26 | + if (is_array($value) && $value['count'] === 1) |
|
27 | 27 | { |
28 | 28 | $ret[$key] = $value[0]; |
29 | 29 | } |