@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * |
234 | 234 | * @param \stdClass $data The AuthData from the session |
235 | 235 | * |
236 | - * @return null|\Auth\LDAPUser The LDAPUser represented by this data |
|
236 | + * @return LDAPUser The LDAPUser represented by this data |
|
237 | 237 | */ |
238 | 238 | public function getUser($data) |
239 | 239 | { |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | * |
246 | 246 | * @param string $name The Group's name |
247 | 247 | * |
248 | - * @return null|\Auth\LDAPGroup The LDAPGroup represented by the name or null if not found |
|
248 | + * @return null|LDAPGroup The LDAPGroup represented by the name or null if not found |
|
249 | 249 | */ |
250 | 250 | public function getGroupByName($name) |
251 | 251 | { |
@@ -73,7 +73,7 @@ |
||
73 | 73 | /** |
74 | 74 | * Get the data table for Pending Users |
75 | 75 | * |
76 | - * @return boolean|\Data\DataTable The Pending User Data Table |
|
76 | + * @return boolean The Pending User Data Table |
|
77 | 77 | */ |
78 | 78 | private function getPendingUserDataTable() |
79 | 79 | { |
@@ -44,8 +44,16 @@ |
||
44 | 44 | return parent::getSubject(); |
45 | 45 | } |
46 | 46 | |
47 | + /** |
|
48 | + * @return string |
|
49 | + */ |
|
47 | 50 | public abstract function getSubstituteVars(); |
48 | 51 | |
52 | + /** |
|
53 | + * @param boolean $html |
|
54 | + * |
|
55 | + * @return string |
|
56 | + */ |
|
49 | 57 | protected function getRawBodyText($html) |
50 | 58 | { |
51 | 59 | if(isset($this->dbData['body'])) |
@@ -9,7 +9,8 @@ discard block |
||
9 | 9 | * @license http://www.apache.org/licenses/ Apache 2.0 License |
10 | 10 | */ |
11 | 11 | |
12 | -spl_autoload_register(function ($class) { |
|
12 | +spl_autoload_register(function ($class) |
|
13 | +{ |
|
13 | 14 | |
14 | 15 | // project-specific namespace prefix |
15 | 16 | $prefix = 'Flipside\\'; |
@@ -19,7 +20,8 @@ discard block |
||
19 | 20 | |
20 | 21 | // does the class use the namespace prefix? |
21 | 22 | $len = strlen($prefix); |
22 | - if (strncmp($prefix, $class, $len) !== 0) { |
|
23 | + if (strncmp($prefix, $class, $len) !== 0) |
|
24 | + { |
|
23 | 25 | // no, move to the next registered autoloader |
24 | 26 | return; |
25 | 27 | } |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php'; |
34 | 36 | |
35 | 37 | // if the file exists, require it |
36 | - if (file_exists($file)) { |
|
38 | + if (file_exists($file)) |
|
39 | + { |
|
37 | 40 | require $file; |
38 | 41 | } |
39 | 42 | }); |
@@ -72,7 +72,7 @@ |
||
72 | 72 | public function getDataSetData($dataSetName) |
73 | 73 | { |
74 | 74 | if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName])) |
75 | - { |
|
75 | + { |
|
76 | 76 | return false; |
77 | 77 | } |
78 | 78 | return \FlipsideSettings::$dataset[$dataSetName]; |
@@ -140,9 +140,9 @@ |
||
140 | 140 | $case = true; |
141 | 141 | } |
142 | 142 | if($case) |
143 | - { |
|
143 | + { |
|
144 | 144 | if(class_exists('MongoRegex')) |
145 | - { |
|
145 | + { |
|
146 | 146 | return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); |
147 | 147 | } |
148 | 148 | else |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | |
23 | 23 | $twigSettings = array(); |
24 | 24 | if(\file_exists('/var/php_cache/twig')) |
25 | - { |
|
25 | + { |
|
26 | 26 | $twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig'); |
27 | 27 | $twigSettings['cache'] = $twigCache; |
28 | 28 | //$twigSettings = array('cache' => $twigCache, 'debug' => true); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
71 | 71 | |
72 | 72 | if($this->user === false || $this->user === null) |
73 | - { |
|
73 | + { |
|
74 | 74 | if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false) |
75 | 75 | { |
76 | 76 | $this->addLink('Login', $this->loginUrl); |