GEANT / CAT

web/lib/admin/view/TabbedPanelsBox.php

Spacing +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class TabbedPanelsBox implements PageElementInterface{
+class TabbedPanelsBox implements PageElementInterface {
 
     /**
      * 
@@ -41,8 +41,8 @@ 
      * @param integer $index
      * @return string
      */
-    private function composeTabId($index){
-        return PageElementInterface::TABS_CLASS.'-'.($index+1);
+    private function composeTabId($index) {
+        return PageElementInterface::TABS_CLASS . '-' . ($index + 1);
     }
     
     /**
@@ -50,15 +50,15 @@ 
      * @param string $title
      * @param TabbedElementInterface $element
      */
-    public function addTabbedPanel($title, $element){
+    public function addTabbedPanel($title, $element) {
         $li = new CompositeTag('li');
         $a = new Tag('a');
-        $a->addAttribute('href', '#'.$this->composeTabId($this->index));
+        $a->addAttribute('href', '#' . $this->composeTabId($this->index));
         $a->addText($title);
         $li->addTag($a);
         $this->titles [$this->index] = $li;
         $this->elements [$this->index] = $element;
-        if($element->isActive()){
+        if ($element->isActive()) {
             $this->active = $this->index;
         }
         $this->index++;
@@ -69,7 +69,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         ?>
         <div id="<?php echo PageElementInterface::TABS_CLASS; ?>" active="<?php echo $this->active; ?>">
             <ul>

web/lib/admin/http/AddUsersCommand.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                     $userCount++;
                 }
             }else{
-                 $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
+                    $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
             }
         }
         if($userCount>0){

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class AddUsersCommand extends AbstractInvokerCommand{
+class AddUsersCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'newusers';
 
@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -33,27 +33,27 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $parser = new CSVParser($_FILES[self::COMMAND], "\n", ',');
-        if(!$parser->isValid()){
+        if (!$parser->isValid()) {
             $this->storeErrorMessage(_('File either is empty or is not CSV file!'));
         }
         $userCount = 0;
         $invitationsCount = 0;
-        while($parser->hasMoreRows()){
+        while ($parser->hasMoreRows()) {
             $row = $parser->nextRow();
-            if(isset($row[0]) && isset($row[1])){
+            if (isset($row[0]) && isset($row[1])) {
                 $user = $this->context->createUser($row[0], $row[1], $this);
                 $max = empty($row[2]) ? 1 : intval($row[2]);
-                if(!empty($user->getIdentifier())){
+                if (!empty($user->getIdentifier())) {
                     $this->context->createInvitation($user, $this, $max);
                     $userCount++;
                 }
-            }else{
+            } else {
                  $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
             }
         }
-        if($userCount>0){
+        if ($userCount > 0) {
             $this->storeInfoMessage(sprintf(_('%s total users were imported and %s invitations created!'), $userCount, $invitationsCount));
         }
     }

Braces +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                     $this->context->createInvitation($user, $this, $max);
                     $userCount++;
                 }
-            }else{
+            } else{
                  $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
             }
         }

web/lib/admin/view/AbstractForm.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-abstract class AbstractForm implements TabbedElementInterface{
+abstract class AbstractForm implements TabbedElementInterface {
     
     /**
      * @var string
@@ -40,7 +40,7 @@ 
      *
      * @return boolean
      */
-    public function isActive(){
+    public function isActive() {
         return $this->messageBox->hasMessages();
     }
 }

web/lib/admin/view/AddNewUserForm.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class AddNewUserForm extends AbstractForm{
+class AddNewUserForm extends AbstractForm {
     
     const ADDNEWUSER_CLASS = 'sb-add-new-user';
     
@@ -28,11 +28,11 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
-    public function render(){
+    public function render() {
         ?>
-        <form method="post" action="<?php echo $this->action;?>" accept-charset="utf-8">
+        <form method="post" action="<?php echo $this->action; ?>" accept-charset="utf-8">
             <div class="<?php echo self::ADDNEWUSER_CLASS; ?>">
-                <?php $this->messageBox->render();?>
+                <?php $this->messageBox->render(); ?>
                 <label for="<?php echo AddUserCommand::PARAM_NAME; ?>"><?php echo $this->description; ?></label>
                 <div style="margin: 5px 0px 10px 0px;">
                     <input type="text" name="<?php echo AddUserCommand::PARAM_NAME; ?>">

core/User.php

Spacing +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
                 }
                 $lookFor .= "$name";
             }
-            $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches);
+            $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches);
             if ($finding === 0 || $finding === FALSE) {
                 return FALSE;
             }
@@ -206,7 +206,7 @@ 
                 case $providerStrings[3]:
                 case $providerStrings[4]:
                 case $providerStrings[5]:
-                    if (!in_array(User::PROVIDER_STRINGS[$matches[1]],$listOfProviders)) {
+                    if (!in_array(User::PROVIDER_STRINGS[$matches[1]], $listOfProviders)) {
                         $listOfProviders[] = User::PROVIDER_STRINGS[$matches[1]];
                     }
                     break;

web/lib/common/InputValidation.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
      */
     public function string($input, $allowWhitespace = FALSE) {
     // always chop out invalid characters, and surrounding whitespace
-    $retvalStep0 =  iconv("UTF-8", "UTF-8//TRANSLIT", $input);
+    $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input);
     if ($retvalStep0 === FALSE) {
         throw new Exception("iconv failure for string sanitisation. With TRANSLIT, this should never happen!");
     }

utils/cleanup.php

Indentation +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         if (isset($Cache[$entry])) {
             continue;
         }
-       \core\common\Entity::rrmdir($downloads . '/' . $entry);
+        \core\common\Entity::rrmdir($downloads . '/' . $entry);
         print "$entry\n";
     }
     closedir($handle);
@@ -56,7 +56,7 @@ 
         if ($ftime < 3600) {
             continue;
         }
-       \core\common\Entity::rrmdir($downloads . '/' . $entry);
+        \core\common\Entity::rrmdir($downloads . '/' . $entry);
         print "$entry\n";
     }
     closedir($handle);

devices/linux/Device_Linux.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             $outString .= "# save user certificate\n";
             $outString .= 'echo "';
             $outString .= base64_encode($this->clientCert["certdata"])
-               . '" | base64 -d ' . " > \$HOME/$this->localDir/user.p12\n";
+                . '" | base64 -d ' . " > \$HOME/$this->localDir/user.p12\n";
         }
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS || $this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
             $outString .= $this->printP12Dialog();

Spacing +3 added lines, -3 removed lines

@@ -184,8 +184,8 @@ 
 # will be the default value prompted to the user
 
     private function printFunctions() {
-        $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0] ) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
-        $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0] ) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
+        $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0]) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
+        $support = (isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0]) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
         $out = '
 my_name=$0
 
@@ -480,7 +480,7 @@ 
 ';
 }
     $cert_prompt = $this->selectedEap == \core\common\EAP::EAPTYPE_TLS ? _("enter the password for the certificate file") : _("enter your import password");
-    $out .=  '   cert=$HOME/' . $this->localDir . '/user.p12
+    $out .= '   cert=$HOME/' . $this->localDir . '/user.p12
 
     PASSWORD=""
     prompt="' . $cert_prompt . '"

devices/redirect_dev/Device_RedirectDev.php

Indentation +7 added lines, -7 removed lines

@@ -11,15 +11,15 @@
 namespace devices\redirect_dev;
 
 class Device_RedirectDev extends \core\DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * @final not to be redefined
+     */
     final public function __construct() {
         parent::__construct();
-      $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+        $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
+        $this->loggerInstance->debug(4,"RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     final public function __construct() {
         parent::__construct();
       $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+      $this->loggerInstance->debug(4, "RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";