GEANT / CAT

web/lib/admin/http/DeleteUserCommand.php

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class DeleteUserCommand extends AbstractInvokerCommand{
+class DeleteUserCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'deleteuser';
     const PARAM_CONFIRMATION = 'confirmation';
@@ -26,7 +26,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -36,21 +36,21 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $userId = $this->parseInt($_POST[self::COMMAND]);
         $user = SilverbulletUser::prepare($userId);
         $user->load();
-        if(isset($_POST[self::PARAM_CONFIRMATION])){
+        if (isset($_POST[self::PARAM_CONFIRMATION])) {
             $confirmation = $this->parseString($_POST[self::PARAM_CONFIRMATION]);
-            if($confirmation=='true'){
+            if ($confirmation == 'true') {
                 $user->setDeactivated(true, $this->context->getProfile());
                 $user->save();
-            }else{
-                $this->storeInfoMessage("User '".$user->getUsername()."' deactivation has been canceled!");
+            } else {
+                $this->storeInfoMessage("User '" . $user->getUsername() . "' deactivation has been canceled!");
             }
 
             $this->context->redirectAfterSubmit();
-        }else{
+        } else {
             //Append terms of use popup
             $builder = $this->context->getBuilder();
             $dialogTitle = _('Deactivate User');

Braces +2 added lines, -2 removed lines

@@ -45,12 +45,12 @@
             if($confirmation=='true'){
                 $user->setDeactivated(true, $this->context->getProfile());
                 $user->save();
-            }else{
+            } else{
                 $this->storeInfoMessage("User '".$user->getUsername()."' deactivation has been canceled!");
             }
 
             $this->context->redirectAfterSubmit();
-        }else{
+        } else{
             //Append terms of use popup
             $builder = $this->context->getBuilder();
             $dialogTitle = _('Deactivate User');

web/lib/admin/http/AbstractCommand.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
      *
      * @param string $commandToken
      */
-    public function __construct($commandToken){
+    public function __construct($commandToken) {
         $this->commandToken = $commandToken;
     }
     
@@ -30,7 +30,7 @@ 
      * @param string $commandToken
      * @return boolean
      */
-    public function isCommand($commandToken){
+    public function isCommand($commandToken) {
         return ($this->commandToken == $commandToken);
     }
     
@@ -38,7 +38,7 @@ 
      * 
      * @return string
      */
-    public function getCommand(){
+    public function getCommand() {
         return $this->commandToken;
     }
     
@@ -47,7 +47,7 @@ 
      * @param string[] $values
      * @return string[]
      */
-    protected function parseArray($values){
+    protected function parseArray($values) {
         $r = array();
         foreach ($values as $key => $value) {
             $r[$key] = $this->parseString($value);
@@ -60,7 +60,7 @@ 
      * @param string $value
      * @return string
      */
-    protected function parseString($value){
+    protected function parseString($value) {
         return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
     }
     
@@ -69,7 +69,7 @@ 
      * @param string $value
      * @return number
      */
-    protected function parseInt($value){
+    protected function parseInt($value) {
         return intval($this->parseString($value));
     }
     

web/lib/admin/view/PageElementNull.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @author Zilvinas Vaira
  *
  */
-class PageElementNull implements PageElementInterface{
+class PageElementNull implements PageElementInterface {
     
     /**
      * 

web/lib/admin/view/AbstractTextDialogBox.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-abstract class AbstractTextDialogBox extends AbstractDialogBox{
+abstract class AbstractTextDialogBox extends AbstractDialogBox {
     
     /**
      * 
@@ -32,7 +32,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderContent()
      */
-    protected function renderContent(){
+    protected function renderContent() {
         ?><p><?php echo $this->text; ?></p><?php
     }
 

web/lib/admin/view/PageElementGroup.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @author Zilvinas Vaira
  * 
  */
-class PageElementGroup implements PageElementInterface{
+class PageElementGroup implements PageElementInterface {
     
     /**
      * List of contained elements. Default value is empty array.

web/lib/admin/view/FileUploadForm.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class FileUploadForm extends AbstractForm{
+class FileUploadForm extends AbstractForm {
     
     /**
      *
@@ -27,10 +27,10 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         ?>
         <div>
-            <form enctype="multipart/form-data" method="post" action="<?php echo $this->action;?>" accept-charset="utf-8">
+            <form enctype="multipart/form-data" method="post" action="<?php echo $this->action; ?>" accept-charset="utf-8">
                 <div class="<?php echo AddNewUserForm::ADDNEWUSER_CLASS; ?>">
                     <?php $this->messageBox->render(); ?>
                     <p><?php echo $this->description; ?></p>

web/lib/admin/view/AbstractPage.php

Spacing +13 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-abstract class AbstractPage implements PageElementInterface{
+abstract class AbstractPage implements PageElementInterface {
 
     /**
      * Stores reusable null page element.
@@ -35,7 +35,7 @@ 
     /**
      * Instantiates common null element.
      */
-    public function __construct(){
+    public function __construct() {
         $this->nullElement = new PageElementNull();
     }
     
@@ -45,16 +45,16 @@ 
      * @param string $name Section name.
      * @param PageElementInterface $element Page element object.
      */
-    public function append($name, $element){
-        if(isset($this->groups [$name])){
+    public function append($name, $element) {
+        if (isset($this->groups [$name])) {
             $group = $this->groups [$name];
             $group->addElement($element);
-        }else if(isset($this->blocks[$name])){
+        } else if (isset($this->blocks[$name])) {
             $group = new PageElementGroup();
             $group->addElement($this->blocks[$name]);
             $this->blocks[$name] = $this->groups[$name] = $group;
             $group->addElement($element);
-        }else{
+        } else {
             $this->assign($name, $element);
         }
     }
@@ -65,7 +65,7 @@ 
      * @param string $name
      * @param HtmlElementInterface $element
      */
-    public function appendHtmlElement($name, $element){
+    public function appendHtmlElement($name, $element) {
         $this->append($name, new PageElementAdapter($element));
     }
     
@@ -75,9 +75,9 @@ 
      * @param string $name Section name.
      * @param PageElementInterface $element Page element object.
      */
-    public function assign($name, $element){
+    public function assign($name, $element) {
         $this->blocks [$name] = $element;
-        if(isset($this->groups [$name])){
+        if (isset($this->groups [$name])) {
             unset($this->groups[$name]);
         }
     }
@@ -88,7 +88,7 @@ 
      * @param string $name
      * @param HtmlElementInterface $element
      */
-    public function assignHtmlElement($name, $element){
+    public function assignHtmlElement($name, $element) {
         $this->assign($name, new PageElementAdapter($element));
     }
     
@@ -98,10 +98,10 @@ 
      * @param string $name Section name.
      * @return PageElementInterface Page element or group of page elements.
      */
-    public function fetch($name){
-        if(isset($this->blocks[$name])){
+    public function fetch($name) {
+        if (isset($this->blocks[$name])) {
             return $this->blocks[$name];
-        }else{
+        } else {
             return $this->nullElement;
         }
     }

Braces +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@ 
         if(isset($this->groups [$name])){
             $group = $this->groups [$name];
             $group->addElement($element);
-        }else if(isset($this->blocks[$name])){
+        } else if(isset($this->blocks[$name])){
             $group = new PageElementGroup();
             $group->addElement($this->blocks[$name]);
             $this->blocks[$name] = $this->groups[$name] = $group;
             $group->addElement($element);
-        }else{
+        } else{
             $this->assign($name, $element);
         }
     }
@@ -101,7 +101,7 @@ 
     public function fetch($name){
         if(isset($this->blocks[$name])){
             return $this->blocks[$name];
-        }else{
+        } else{
             return $this->nullElement;
         }
     }

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

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class Tag extends UnaryTag{
+class Tag extends UnaryTag {
     
     /**
      *
@@ -14,7 +14,7 @@ 
      */
     protected $text = "";
     
-    public function addText($text){
+    public function addText($text) {
         $this->text .= $text;
     }
     
@@ -22,9 +22,9 @@ 
      * 
      * @return string
      */
-    protected function composeInnerString(){
+    protected function composeInnerString() {
         $innerString = "";
-        if(!empty($this->text)){
+        if (!empty($this->text)) {
             $innerString = $this->text;
         }
         return $innerString;
@@ -35,13 +35,13 @@ 
      * {@inheritDoc}
      * @see UnaryTag::composeTagString()
      */
-    protected function composeTagString($attributeString){
+    protected function composeTagString($attributeString) {
         $tagString = "";
         $innerString = $this->composeInnerString();
-        if(!empty($innerString)){
-            $tagString = "\n".$this->tab."<" . $this->name . $attributeString . ">" . $innerString . "</" . $this->name . ">";
-        }else{
-            $tagString = "\n".$this->tab."<" . $this->name . $attributeString . "></" . $this->name . ">";
+        if (!empty($innerString)) {
+            $tagString = "\n" . $this->tab . "<" . $this->name . $attributeString . ">" . $innerString . "</" . $this->name . ">";
+        } else {
+            $tagString = "\n" . $this->tab . "<" . $this->name . $attributeString . "></" . $this->name . ">";
         }
         return $tagString;
     }

Braces +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $innerString = $this->composeInnerString();
         if(!empty($innerString)){
             $tagString = "\n".$this->tab."<" . $this->name . $attributeString . ">" . $innerString . "</" . $this->name . ">";
-        }else{
+        } else{
             $tagString = "\n".$this->tab."<" . $this->name . $attributeString . "></" . $this->name . ">";
         }
         return $tagString;

web/lib/admin/view/DefaultAjaxPage.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class DefaultAjaxPage extends AbstractPage{
+class DefaultAjaxPage extends AbstractPage {
 
     const SECTION_RESPONSE = 'response';
     
@@ -26,7 +26,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         $response = $this->fetch(self::SECTION_RESPONSE);
         ?><response><?php $response->render(); ?></response><?php 
     }