@@ -11,6 +11,9 @@ |
||
| 11 | 11 | $this->setTemplateName('admin.html'); |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | + /** |
|
| 15 | + * @param string $adminGroup |
|
| 16 | + */ |
|
| 14 | 17 | protected function userIsAdmin($adminGroup) |
| 15 | 18 | { |
| 16 | 19 | if($this->user === false || $this->user === null) |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $this->addLink('Home', '..'); |
| 50 | 50 | if($this->user === false || $this->user === null) |
| 51 | 51 | { |
| 52 | - $this->content['body'] = ' |
|
| 52 | + $this->content['body'] = ' |
|
| 53 | 53 | <div id="content"> |
| 54 | 54 | <div class="row"> |
| 55 | 55 | <div class="col-lg-12"> |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | else if($this->isAdmin() === false) |
| 63 | 63 | { |
| 64 | - $this->content['body'] = ' |
|
| 64 | + $this->content['body'] = ' |
|
| 65 | 65 | <div id="content"> |
| 66 | 66 | <div class="row"> |
| 67 | 67 | <div class="col-lg-12"> |
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | </div> |
| 71 | 71 | </div> |
| 72 | 72 | '; |
| 73 | - $this->content['header'] = array(); |
|
| 74 | - $this->content['cards'] = array(); |
|
| 73 | + $this->content['header'] = array(); |
|
| 74 | + $this->content['cards'] = array(); |
|
| 75 | 75 | } |
| 76 | 76 | return parent::getContent(); |
| 77 | 77 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | /** |
| 16 | 16 | * Create the DataTableAPI for the given DataTable info |
| 17 | 17 | * |
| 18 | - * @param string $datSetName The name of the DataSet used in the Settings |
|
| 18 | + * @param string $dataSetName The name of the DataSet used in the Settings |
|
| 19 | 19 | * @param string $dataTableName The name of the table in the DataSet |
| 20 | 20 | * @param string|false $primaryKeyName The table primary key. Must be specified for update/delete capable tables |
| 21 | 21 | */ |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 92 | 92 | $params = $this->manipulateParameters($request, $odata); |
| 93 | 93 | $areas = $dataTable->read($odata->filter, $odata->select, $odata->top, |
| 94 | - $odata->skip, $odata->orderby, $params); |
|
| 94 | + $odata->skip, $odata->orderby, $params); |
|
| 95 | 95 | if($areas === false) |
| 96 | 96 | { |
| 97 | 97 | $areas = array(); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 134 | 134 | $filter = $this->getFilterForPrimaryKey($args['name']); |
| 135 | 135 | $areas = $dataTable->read($filter, $odata->select, $odata->top, |
| 136 | - $odata->skip, $odata->orderby); |
|
| 136 | + $odata->skip, $odata->orderby); |
|
| 137 | 137 | if(empty($areas)) |
| 138 | 138 | { |
| 139 | 139 | return $response->withStatus(404); |
@@ -24,6 +24,9 @@ |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | + /** |
|
| 28 | + * @param string $param |
|
| 29 | + */ |
|
| 27 | 30 | private function getParamFromArrayIfSet($array, $param, $default = null) |
| 28 | 31 | { |
| 29 | 32 | if(isset($array[$param])) |
@@ -78,6 +78,9 @@ discard block |
||
| 78 | 78 | $this->loader->addPath($dir, $namespace); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | + /** |
|
| 82 | + * @param string $name |
|
| 83 | + */ |
|
| 81 | 84 | public function setTemplateName($name) |
| 82 | 85 | { |
| 83 | 86 | $this->templateName = $name; |
@@ -112,7 +115,6 @@ discard block |
||
| 112 | 115 | * Add a JavaScript file from a set of files known to the framework |
| 113 | 116 | * |
| 114 | 117 | * @param string $jsFileID the ID of the JS file |
| 115 | - * @param boolean $async Can the JS file be loaded asynchronously? |
|
| 116 | 118 | */ |
| 117 | 119 | public function addWellKnownJS($jsFileID) |
| 118 | 120 | { |
@@ -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); |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | * @author Chris Wright |
| 7 | 7 | * @version 2.0 |
| 8 | 8 | * @param string $subject The subject string |
| 9 | - * @param bool $dn Treat subject as a DN if TRUE |
|
| 10 | 9 | * @param string|array $ignore Set of characters to leave untouched |
| 11 | 10 | * @return string The escaped string |
| 12 | 11 | */ |
@@ -7,6 +7,9 @@ |
||
| 7 | 7 | { |
| 8 | 8 | protected $types = array('xlsx', 'xls', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/vnd.ms-excel'); |
| 9 | 9 | |
| 10 | + /** |
|
| 11 | + * @param integer $row |
|
| 12 | + */ |
|
| 10 | 13 | protected function setRowFromArray(&$sheat, $row, $array, $count = 0) |
| 11 | 14 | { |
| 12 | 15 | if($count === 0) |
@@ -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); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | if(isset($array[$i])) |
| 22 | 22 | { |
| 23 | - $sheat->setCellValueByColumnAndRow($i+1, $row, $array[$i]); |
|
| 23 | + $sheat->setCellValueByColumnAndRow($i + 1, $row, $array[$i]); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | } |
@@ -35,20 +35,20 @@ |
||
| 35 | 35 | { |
| 36 | 36 | if(isset($this->labeleduri)) |
| 37 | 37 | { |
| 38 | - //Have multiple emails |
|
| 39 | - if($propName === 'mail') |
|
| 40 | - { |
|
| 41 | - return $this->getFieldSingleValue('labeleduri'); |
|
| 42 | - } |
|
| 43 | - if($propName === 'allMail') |
|
| 44 | - { |
|
| 45 | - $tmp = $this->getField('mail'); |
|
| 46 | - if(isset($tmp['count'])) |
|
| 47 | - { |
|
| 48 | - unset($tmp['count']); |
|
| 49 | - } |
|
| 50 | - return $tmp; |
|
| 51 | - } |
|
| 38 | + //Have multiple emails |
|
| 39 | + if($propName === 'mail') |
|
| 40 | + { |
|
| 41 | + return $this->getFieldSingleValue('labeleduri'); |
|
| 42 | + } |
|
| 43 | + if($propName === 'allMail') |
|
| 44 | + { |
|
| 45 | + $tmp = $this->getField('mail'); |
|
| 46 | + if(isset($tmp['count'])) |
|
| 47 | + { |
|
| 48 | + unset($tmp['count']); |
|
| 49 | + } |
|
| 50 | + return $tmp; |
|
| 51 | + } |
|
| 52 | 52 | } |
| 53 | 53 | $tmp = $this->getValueWithDefault($propName); |
| 54 | 54 | if($tmp !== false) |
@@ -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]; |