GEANT / CAT

web/lib/admin/domain/PersistentEntity.php

Braces +12 added lines, -5 removed lines

@@ -151,7 +151,7 @@ 
         if(count($this->row) > 0){
             if(isset($this->row[self::ID])){
                 $result = $this->executeUpdateQuery();
-            }else{
+            } else{
                 $result = $this->executeInsertQuery();
             }
         }
@@ -170,8 +170,12 @@ 
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if($keyString != "(") $keyString .= " ,";
-            if($valueString != "(") $valueString .= " ,";
+            if($keyString != "(") {
+                $keyString .= " ,";
+            }
+            if($valueString != "(") {
+                $valueString .= " ,";
+            }
             $keyString .= "`" . $key . "`";
             $valueString .= "?";
             $types .= $attribute->getType();
@@ -200,8 +204,11 @@ 
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if(!empty($updateString)) $updateString .= " ,";
-            else $updateString .=" SET ";
+            if(!empty($updateString)) {
+                $updateString .= " ,";
+            } else {
+                $updateString .=" SET ";
+            }
             $updateString .= "`" . $key . "`=?";
             $types .= $attribute->getType();
             $arguments [] = $attribute->value;

Spacing +28 added lines, -28 removed lines

@@ -56,7 +56,7 @@ 
      * @param string $table
      * @param string $databaseType
      */
-    public function __construct($table, $databaseType = 'INST'){
+    public function __construct($table, $databaseType = 'INST') {
         $this->table = $table;
         $this->setAttributeType(self::ID, Attribute::TYPE_INTEGER);
         $this->databaseHandle = \core\DBConnection::handle($databaseType);
@@ -67,7 +67,7 @@ 
      * @param string $key
      * @param string $type
      */
-    protected function setAttributeType($key, $type){
+    protected function setAttributeType($key, $type) {
         $this->types[$key] = $type; 
     }
     
@@ -76,7 +76,7 @@ 
      * @param string $key
      * @return string
      */
-    protected function getAttributeType($key){
+    protected function getAttributeType($key) {
         return isset($this->types[$key]) ? $this->types[$key] : Attribute::TYPE_STRING;
     }
     
@@ -86,7 +86,7 @@ 
      * @param string $key
      * @return string
      */
-    public function get($key){
+    public function get($key) {
         return isset($this->row[$key]) ? $this->row[$key]->value : "";
     }
     
@@ -95,7 +95,7 @@ 
      * @param string $key
      * @return NULL|\web\lib\admin\domain\Attribute
      */
-    public function getAttribute($key){
+    public function getAttribute($key) {
         return isset($this->row[$key]) ? $this->row[$key] : new Attribute('', '');
     }
     
@@ -105,7 +105,7 @@ 
      * @param string $key
      * @param mixed $value
      */
-    protected function set($key, $value){
+    protected function set($key, $value) {
         $attribute = new Attribute($key, $value, $this->getAttributeType($key));
         $this->row[$key] = $attribute;
     }
@@ -114,9 +114,9 @@ 
      * 
      * @param array $row
      */
-    public function setRow($row){
+    public function setRow($row) {
         $this->clear();
-        foreach ($row as $key => $value){
+        foreach ($row as $key => $value) {
             $this->set($key, $value);
         }
     }
@@ -124,7 +124,7 @@ 
     /**
      * 
      */
-    public function clear(){
+    public function clear() {
         $this->row = array();
     }
     
@@ -132,7 +132,7 @@ 
      * 
      * @return string
      */
-    public function getIdentifier(){
+    public function getIdentifier() {
         return $this->get(self::ID);
     }
     
@@ -141,12 +141,12 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::save()
      */
-    public function save(){
+    public function save() {
         $result = false;
-        if(count($this->row) > 0){
-            if(isset($this->row[self::ID])){
+        if (count($this->row) > 0) {
+            if (isset($this->row[self::ID])) {
                 $result = $this->executeUpdateQuery();
-            }else{
+            } else {
                 $result = $this->executeInsertQuery();
             }
         }
@@ -157,7 +157,7 @@ 
      * 
      * @return boolean|mixed
      */
-    private function executeInsertQuery(){
+    private function executeInsertQuery() {
         $result = false;
         $query = sprintf("INSERT INTO `%s`", $this->table);
         $keyString = "(";
@@ -165,8 +165,8 @@ 
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if($keyString != "(") $keyString .= " ,";
-            if($valueString != "(") $valueString .= " ,";
+            if ($keyString != "(") $keyString .= " ,";
+            if ($valueString != "(") $valueString .= " ,";
             $keyString .= "`" . $key . "`";
             $valueString .= "?";
             $types .= $attribute->getType();
@@ -174,10 +174,10 @@ 
         }
         $keyString .= ")";
         $valueString .= ")";
-        if($keyString != "()"){
-            $query .= " " .$keyString . " VALUES " . $valueString;
+        if ($keyString != "()") {
+            $query .= " " . $keyString . " VALUES " . $valueString;
             $result = $this->databaseHandle->exec($query, $types, ...$arguments);
-            if($result){
+            if ($result) {
                 $this->set(self::ID, $this->databaseHandle->lastID());
             }
         }
@@ -188,21 +188,21 @@ 
      * 
      * @return boolean|mixed
      */
-    private function executeUpdateQuery(){
+    private function executeUpdateQuery() {
         $result = false;
         $query = sprintf("UPDATE `%s`", $this->table);
         $updateString = "";
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if(!empty($updateString)) $updateString .= " ,";
-            else $updateString .=" SET ";
+            if (!empty($updateString)) $updateString .= " ,";
+            else $updateString .= " SET ";
             $updateString .= "`" . $key . "`=?";
             $types .= $attribute->getType();
             $arguments [] = $attribute->value;
         }
-        if(!empty($updateString)){
-            $query .= " " .$updateString . " WHERE `" .self::ID. "`=?";
+        if (!empty($updateString)) {
+            $query .= " " . $updateString . " WHERE `" . self::ID . "`=?";
             $id = $this->getAttribute(self::ID);
             $types .= $id->getType();
             $arguments [] = $id->value;
@@ -215,12 +215,12 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = false;
         $id = $this->getAttribute(self::ID);
         $query = sprintf("SELECT * FROM `%s` WHERE `%s` =?", $this->table, self::ID);
         $result = $this->databaseHandle->exec($query, $id->getType(), $id->value);
-        if(mysqli_num_rows($result)>0){
+        if (mysqli_num_rows($result) > 0) {
             $this->setRow(mysqli_fetch_assoc($result));
             $state = true;
         }
@@ -232,7 +232,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::delete()
      */
-    public function delete(){
+    public function delete() {
         $id = $this->getAttribute(self::ID);
         $query = sprintf("DELETE FROM `%s` WHERE `%s`=?", $this->table, self::ID);
         return $this->databaseHandle->exec($query, $id->getType(), $id->value);

web/lib/admin/domain/Attribute.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      * 
      * @return string
      */
-    public function getType(){
+    public function getType() {
         return $this->type;
     }
     

web/lib/admin/utils/CSVParser.php

Spacing +8 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
     public function __construct($fileData, $rowDelimiter, $tokenDelimiter) {
         $this->rowDelimiter = $rowDelimiter;
         $this->tokenDelimiter = $tokenDelimiter;
-        if($this->validate($fileData)){
+        if ($this->validate($fileData)) {
             $handle = fopen($fileData['tmp_name'], "r");
             $contents = fread($handle, filesize($fileData['tmp_name']));
             fclose($handle);
@@ -68,13 +68,13 @@ 
      * @param array $fileData Data array from $_FILES['yourfile']
      * @return boolean Is file data valid
      */
-    protected function validate($fileData){
-        if(empty($fileData) || empty($fileData['name']) || empty($fileData['tmp_name']) || $fileData['error']>0){
+    protected function validate($fileData) {
+        if (empty($fileData) || empty($fileData['name']) || empty($fileData['tmp_name']) || $fileData['error'] > 0) {
             $this->state = false;
         }
         
         $extension = pathinfo($fileData['name'], PATHINFO_EXTENSION);
-        if($extension!='csv' && $extension!='CSV'){
+        if ($extension != 'csv' && $extension != 'CSV') {
             $this->state = false;
         }
         return $this->state;
@@ -94,7 +94,7 @@ 
      * 
      * @return boolean
      */
-    public function hasMoreRows(){
+    public function hasMoreRows() {
         return $this->state && isset($this->rows[$this->index]);
     }
     
@@ -103,12 +103,12 @@ 
      * 
      * @return array
      */
-    public function nextRow(){
-        if($this->state && $this->hasMoreRows()){
+    public function nextRow() {
+        if ($this->state && $this->hasMoreRows()) {
             $row = str_getcsv($this->rows[$this->index], $this->tokenDelimiter);
             $this->index++;
             return $row;
-        }else{
+        } else {
             return array();
         }
     }

Braces +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
             $row = str_getcsv($this->rows[$this->index], $this->tokenDelimiter);
             $this->index++;
             return $row;
-        }else{
+        } else{
             return array();
         }
     }

web/lib/admin/storage/SessionStorage.php

Spacing +20 added lines, -20 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SessionStorage implements StorageInterface{
+class SessionStorage implements StorageInterface {
     
     const INDEX = 'silverbullet-storage';
     const WIDE = 'wide';
@@ -41,21 +41,21 @@ 
      * 
      * @param string $package
      */
-    private function __construct($package = ""){
-        if(!isset($_SESSION)){
+    private function __construct($package = "") {
+        if (!isset($_SESSION)) {
             session_start();
         }
-        if(!isset($_SESSION['silverbullet-storage'])){
+        if (!isset($_SESSION['silverbullet-storage'])) {
             $_SESSION[self::INDEX] = array();
             $_SESSION[self::INDEX][self::WIDE] = array();
             $_SESSION[self::INDEX][self::SCOPED] = array();
         }
-        if (!empty($package)){
-            if(!isset($_SESSION[self::INDEX][self::SCOPED][$package])){
+        if (!empty($package)) {
+            if (!isset($_SESSION[self::INDEX][self::SCOPED][$package])) {
                 $_SESSION[self::INDEX][self::SCOPED][$package] = array();
             }
             $this->session = &$_SESSION[self::INDEX][self::SCOPED][$package];
-        }else{
+        } else {
             $this->session = &$_SESSION[self::INDEX][self::WIDE];
         }
         $this->package = $package;
@@ -66,22 +66,22 @@ 
      * @param string $package
      * @return SessionStorage
      */
-    public static function getInstance($package = ""){
+    public static function getInstance($package = "") {
         
-        if(empty($package)){
-            if(empty(self::$instance)){
+        if (empty($package)) {
+            if (empty(self::$instance)) {
                 self::$instance = new self($package);
             }
             return self::$instance;
-        }else{
-            if(!isset(self::$pool[$package])){
+        } else {
+            if (!isset(self::$pool[$package])) {
                 self::$pool[$package] = new self($package);
             } 
             return self::$pool[$package];
         }
     }
     
-    public static function close(){
+    public static function close() {
         session_unset();
         session_destroy();
     }
@@ -91,7 +91,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::put()
      */
-    public function put($identifier, $object){
+    public function put($identifier, $object) {
         $this->session[$identifier] = $object;
     }
     
@@ -100,7 +100,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::add()
      */
-    public function add($identifier, $object){
+    public function add($identifier, $object) {
         $this->session[$identifier][] = $object;
     }
     
@@ -109,10 +109,10 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::get()
      */
-    public function get($identifier){
-        if(isset($this->session[$identifier])){
+    public function get($identifier) {
+        if (isset($this->session[$identifier])) {
             return $this->session[$identifier];
-        }else{
+        } else {
             return array();
         }
     }
@@ -120,7 +120,7 @@ 
     /**
      * 
      */
-    public function getAll(){
+    public function getAll() {
         return $this->session;
     }
     
@@ -129,7 +129,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\storage\StorageInterface::delete()
      */
-    public function delete($identifier){
+    public function delete($identifier) {
         unset($this->session[$identifier]);
     }
     

Braces +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
                 $_SESSION[self::INDEX][self::SCOPED][$package] = array();
             }
             $this->session = &$_SESSION[self::INDEX][self::SCOPED][$package];
-        }else{
+        } else{
             $this->session = &$_SESSION[self::INDEX][self::WIDE];
         }
         $this->package = $package;
@@ -73,7 +73,7 @@ 
                 self::$instance = new self($package);
             }
             return self::$instance;
-        }else{
+        } else{
             if(!isset(self::$pool[$package])){
                 self::$pool[$package] = new self($package);
             } 
@@ -112,7 +112,7 @@ 
     public function get($identifier){
         if(isset($this->session[$identifier])){
             return $this->session[$identifier];
-        }else{
+        } else{
             return array();
         }
     }

web/lib/admin/view/MessageBox.php

Indentation +4 added lines, -4 removed lines

@@ -16,10 +16,10 @@
      */
     private $box;
     
-   /**
-    * 
-    * @param string $class
-    */
+    /**
+     * 
+     * @param string $class
+     */
     public function __construct($class) {
         $this->box = new CompositeTag('div');
         $this->class = $class;

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\MessageReceiverInterface::hasMessages()
      */
-    public function hasMessages(){
+    public function hasMessages() {
         return $this->box->size() > 0;
     }
     
@@ -41,7 +41,7 @@ 
      * {@inheritDoc}
      * @see MessageReceiverInterface::receiveMessage()
      */
-    public function receiveMessage($message){
+    public function receiveMessage($message) {
         $p = new Tag('p');
         $p->addAttribute('class', $message->getClass($this->class));
         $p->addText($message->getText());
@@ -51,7 +51,7 @@ 
     /**
      * 
      */
-    public function render(){
+    public function render() {
         echo $this->__toString();
     }
     
@@ -60,10 +60,10 @@ 
      * {@inheritDoc}
      * @see HtmlElementInterface::__toString()
      */
-    public function __toString(){
-        if($this->hasMessages()){
+    public function __toString() {
+        if ($this->hasMessages()) {
             return $this->box->__toString();
-        }else{
+        } else {
             return '';
         }
     }

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function __toString(){
         if($this->hasMessages()){
             return $this->box->__toString();
-        }else{
+        } else{
             return '';
         }
     }

web/lib/admin/view/html/JSButton.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class JSButton extends Button{
+class JSButton extends Button {
     
     const REVOKE_CREDENTIAL_ACTION = 'revokeCredential';
     const DELETE_USER_ACTION = 'deleteUser';
@@ -16,12 +16,12 @@ 
     
     private $action = "";
     
-    public function __construct($title, $action, $name = '', $value = '', $type = 'button', $class = ''){
+    public function __construct($title, $action, $name = '', $value = '', $type = 'button', $class = '') {
         parent::__construct($title, $type, $name, $value, $class);
         $this->action = $action;
     }
     
     protected function composeNameValueString() {
-        return ' onclick="'.$this->action.'(\''.$this->name.'\',\''.$this->value.'\')"';
+        return ' onclick="' . $this->action . '(\'' . $this->name . '\',\'' . $this->value . '\')"';
     }
 }

web/lib/admin/view/html/Row.php

Braces +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
                 
             }
             return $innerString;
-        }else{
+        } else{
             return parent::composeInnerString();
         }
     }

Spacing +16 added lines, -16 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class Row extends Tag{
+class Row extends Tag {
     
     /**
      * 
@@ -41,7 +41,7 @@ 
      * 
      * @param array $cells
      */
-    public function setCells($cells){
+    public function setCells($cells) {
         foreach ($cells as $key => $cell) {
             $td = new CompositeTag('td');
             $td->addText($cell);
@@ -53,7 +53,7 @@ 
      * 
      * @return number
      */
-    public function size(){
+    public function size() {
         return count($this->cells);
     }
     
@@ -61,7 +61,7 @@ 
      * 
      * @return \web\lib\admin\view\html\CompositeTag[]
      */
-    public function getCells(){
+    public function getCells() {
         return $this->cells;
     }
     
@@ -71,8 +71,8 @@ 
      * @param string $name
      * @param string $value
      */
-    public function addCellAttribute($column, $name, $value){
-        if(isset($this->cells[$column])){
+    public function addCellAttribute($column, $name, $value) {
+        if (isset($this->cells[$column])) {
             $this->cells[$column]->addAttribute($name, $value);
         }
     }
@@ -81,7 +81,7 @@ 
      * 
      * @param array $columns
      */
-    public function setColumns($columns){
+    public function setColumns($columns) {
         $this->columns = $columns;
     }
     
@@ -90,8 +90,8 @@ 
      * @param string $column
      * @param UnaryTag $element
      */
-    public function addToCell($column, $element){
-        if(!isset($this->cells[$column])){
+    public function addToCell($column, $element) {
+        if (!isset($this->cells[$column])) {
             $this->cells[$column] = new CompositeTag('td');
         }
         $this->cells[$column]->addTag($element);
@@ -102,8 +102,8 @@ 
      * @param string $column
      * @return \web\lib\admin\view\html\CompositeTag
      */
-    public function getCell($column){
-        if(!isset($this->cells[$column])){
+    public function getCell($column) {
+        if (!isset($this->cells[$column])) {
             $this->cells[$column] = new CompositeTag('td');
         }
         return $this->cells[$column];
@@ -114,19 +114,19 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\html\Tag::composeInnerString()
      */
-    public function composeInnerString(){
-        if(count($this->columns)>0){
+    public function composeInnerString() {
+        if (count($this->columns) > 0) {
             $innerString = "";
             foreach ($this->columns as $column) {
-                if(!isset($this->cells[$column])){
+                if (!isset($this->cells[$column])) {
                     $this->cells[$column] = new CompositeTag('td');
                 }
-                $this->cells[$column]->setTab("\t".$this->tab);
+                $this->cells[$column]->setTab("\t" . $this->tab);
                 $innerString .= $this->cells[$column];
                 
             }
             return $innerString;
-        }else{
+        } else {
             return parent::composeInnerString();
         }
     }

web/lib/admin/view/html/Button.php

Spacing +2 added lines, -2 removed lines

@@ -6,13 +6,13 @@
  * @author Zilvinas Vaira
  *
  */
-class Button extends Tag{
+class Button extends Tag {
     
     const SUBMIT_TYPE = 'submit';
     const RESET_TYPE = 'reset';
     const BUTTON_TYPE = 'button';
     
-    public function __construct($title, $type = self::SUBMIT_TYPE, $name = '', $value = '', $class = '', $id = ''){
+    public function __construct($title, $type = self::SUBMIT_TYPE, $name = '', $value = '', $class = '', $id = '') {
         parent::__construct('button');
         $this->addAttribute('type', $type);
         $this->addAttribute('name', $name);

web/lib/admin/view/html/CompositeTag.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      * 
      * @return UnaryTag[]
      */
-    public function getTags(){
+    public function getTags() {
         return $this->tags;
     }
     
@@ -29,7 +29,7 @@ 
      * 
      * @return number
      */
-    public function size(){
+    public function size() {
         return count($this->tags);
     }
     
@@ -38,10 +38,10 @@ 
      * {@inheritDoc}
      * @see \lib\html\Tag::composeInnerString()
      */
-    protected function composeInnerString(){
+    protected function composeInnerString() {
         $innerString = "\n\t" . $this->tab . $this->text;
         foreach ($this->tags as $tag) {
-            $tag->setTab("\t".$this->tab);
+            $tag->setTab("\t" . $this->tab);
             $innerString .= $tag;
         }
         return $innerString;