@@ -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,17 +9,17 @@ 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 | // project-specific namespace prefix |
| 15 | 15 | $prefix = 'Flipside\\'; |
| 16 | 16 | |
| 17 | 17 | // base directory for the namespace prefix |
| 18 | - $base_dir = __DIR__ . '/'; |
|
| 18 | + $base_dir = __DIR__.'/'; |
|
| 19 | 19 | |
| 20 | 20 | // does the class use the namespace prefix? |
| 21 | 21 | $len = strlen($prefix); |
| 22 | - if (strncmp($prefix, $class, $len) !== 0) { |
|
| 22 | + if(strncmp($prefix, $class, $len) !== 0) { |
|
| 23 | 23 | // no, move to the next registered autoloader |
| 24 | 24 | return; |
| 25 | 25 | } |
@@ -30,10 +30,10 @@ discard block |
||
| 30 | 30 | // replace the namespace prefix with the base directory, replace namespace |
| 31 | 31 | // separators with directory separators in the relative class name, append |
| 32 | 32 | // with .php |
| 33 | - $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php'; |
|
| 33 | + $file = $base_dir.str_replace('\\', '/', $relative_class).'.php'; |
|
| 34 | 34 | |
| 35 | 35 | // if the file exists, require it |
| 36 | - if (file_exists($file)) { |
|
| 36 | + if(file_exists($file)) { |
|
| 37 | 37 | require $file; |
| 38 | 38 | } |
| 39 | 39 | }); |
@@ -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]; |
@@ -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]; |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | class PHPLog extends LogService |
| 5 | 5 | { |
| 6 | - public function __construct($params=false) |
|
| 6 | + public function __construct($params = false) |
|
| 7 | 7 | { |
| 8 | 8 | parent::__construct($params); |
| 9 | 9 | } |
@@ -140,9 +140,9 @@ discard block |
||
| 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 |
@@ -236,15 +236,15 @@ discard block |
||
| 236 | 236 | { |
| 237 | 237 | case '=': |
| 238 | 238 | return array($this->var1=>$this->var2); |
| 239 | - case 'substringof': |
|
| 240 | - if(class_exists('MongoRegex')) |
|
| 241 | - { |
|
| 242 | - return array($this->var1=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); |
|
| 243 | - } |
|
| 244 | - else |
|
| 245 | - { |
|
| 239 | + case 'substringof': |
|
| 240 | + if(class_exists('MongoRegex')) |
|
| 241 | + { |
|
| 242 | + return array($this->var1=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i'))); |
|
| 243 | + } |
|
| 244 | + else |
|
| 245 | + { |
|
| 246 | 246 | return array($this->var1=>array('$regex'=>new \MongoDB\BSON\Regex($this->var2, 'i'))); |
| 247 | - } |
|
| 247 | + } |
|
| 248 | 248 | case 'indexof': |
| 249 | 249 | return $this->getMongoIndexOfOperator(); |
| 250 | 250 | default: |
@@ -254,15 +254,15 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | public function php_compare($value) |
| 256 | 256 | { |
| 257 | - if(is_array($value)) |
|
| 258 | - { |
|
| 257 | + if(is_array($value)) |
|
| 258 | + { |
|
| 259 | 259 | return $this->php_compare($value[$this->var1]); |
| 260 | - } |
|
| 260 | + } |
|
| 261 | 261 | switch($this->op) |
| 262 | 262 | { |
| 263 | 263 | case '!=': |
| 264 | 264 | return $value != $this->var2; |
| 265 | - case '=': |
|
| 265 | + case '=': |
|
| 266 | 266 | return $value == $this->var2; |
| 267 | 267 | case '<': |
| 268 | 268 | return $value < $this->var2; |
@@ -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,10 +22,10 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | $twigSettings = array(); |
| 24 | 24 | if(\file_exists('/var/php_cache/twig')) |
| 25 | - { |
|
| 26 | - $twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig'); |
|
| 27 | - $twigSettings['cache'] = $twigCache; |
|
| 28 | - //$twigSettings = array('cache' => $twigCache, 'debug' => true); |
|
| 25 | + { |
|
| 26 | + $twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig'); |
|
| 27 | + $twigSettings['cache'] = $twigCache; |
|
| 28 | + //$twigSettings = array('cache' => $twigCache, 'debug' => true); |
|
| 29 | 29 | } |
| 30 | 30 | //$twigSettings['debug'] = true; |
| 31 | 31 | |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | $this->aboutUrl = $this->settings->getGlobalSetting('about_url', $this->wwwUrl.'/about'); |
| 54 | 54 | $this->content['header']['right']['About'] = array( |
| 55 | - 'url' => $this->aboutUrl, |
|
| 56 | - 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 55 | + 'url' => $this->aboutUrl, |
|
| 56 | + 'menu' => $this->settings->getGlobalSetting('about_menu', array( |
|
| 57 | 57 | 'Burning Flipside' => $this->wwwUrl.'/about/event', |
| 58 | 58 | 'AAR, LLC' => $this->wwwUrl.'/organization/aar', |
| 59 | 59 | 'Privacy Policy' => $this->wwwUrl.'/about/privacy' |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $this->content['urls']['loginUrl'] = $this->loginUrl; |
| 70 | 70 | $this->content['urls']['logoutUrl'] = $this->logoutUrl; |
| 71 | 71 | |
| 72 | - if($this->user === false || $this->user === null) |
|
| 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 | { |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | { |
| 204 | 204 | if(!isset($this->content['notifications'])) |
| 205 | 205 | { |
| 206 | - $this->content['notifications'] = array(); |
|
| 206 | + $this->content['notifications'] = array(); |
|
| 207 | 207 | } |
| 208 | 208 | array_push($this->content['notifications'], array('msg'=>$message, 'sev'=>$severity, 'dismissible'=>$dismissible)); |
| 209 | 209 | } |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | { |
| 217 | 217 | if(!isset($this->content['body'])) |
| 218 | 218 | { |
| 219 | - $this->content['body'] = $this->body; |
|
| 219 | + $this->content['body'] = $this->body; |
|
| 220 | 220 | } |
| 221 | 221 | //Add page JS just before rednering so it is after any added by the page explicitly |
| 222 | 222 | // $this->addJS('js/'.basename($_SERVER['SCRIPT_NAME'], '.php').'.js'); |
@@ -4,8 +4,8 @@ discard block |
||
| 4 | 4 | use \Psr\Http\Message\ServerRequestInterface as Request; |
| 5 | 5 | use \Psr\Http\Message\ResponseInterface as Response; |
| 6 | 6 | |
| 7 | -require __DIR__ . '/../vendor/autoload.php'; |
|
| 8 | -require_once(__DIR__ . '/../static.js_css.php'); |
|
| 7 | +require __DIR__.'/../vendor/autoload.php'; |
|
| 8 | +require_once(__DIR__.'/../static.js_css.php'); |
|
| 9 | 9 | |
| 10 | 10 | class WebPage |
| 11 | 11 | { |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | public function __construct($title) |
| 18 | 18 | { |
| 19 | - \Sentry\init(['dsn' => 'https://[email protected]/4283882' ]); |
|
| 19 | + \Sentry\init(['dsn' => 'https://[email protected]/4283882']); |
|
| 20 | 20 | $this->settings = \Flipside\Settings::getInstance(); |
| 21 | 21 | $this->loader = new \Twig_Loader_Filesystem(dirname(__FILE__).'/../templates'); |
| 22 | 22 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $this->content['css'] = array($uri); |
| 113 | 113 | return; |
| 114 | 114 | } |
| 115 | - array_push($this->content['css'],$uri); |
|
| 115 | + array_push($this->content['css'], $uri); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $this->content['js'] = array($uri); |
| 128 | 128 | return; |
| 129 | 129 | } |
| 130 | - array_push($this->content['js'],$uri); |
|
| 130 | + array_push($this->content['js'], $uri); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | { |
| 181 | 181 | $data['menu'] = $submenu; |
| 182 | 182 | } |
| 183 | - $this->content['header']['right'] = array($name => $data)+$this->content['header']['right']; |
|
| 183 | + $this->content['header']['right'] = array($name => $data) + $this->content['header']['right']; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** Notification that is green for success */ |
@@ -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); |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | { |
| 32 | 32 | return null; |
| 33 | 33 | } |
| 34 | - $data = $this->getArray($array); |
|
| 34 | + $data = $this->getArray($array); |
|
| 35 | 35 | $ssheat = new Spreadsheet(); |
| 36 | 36 | $sheat = $ssheat->getActiveSheet(); |
| 37 | 37 | $keys = array_shift($data); |