GEANT / CAT

web/lib/admin/UIElements.php

Spacing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
                         }
                         break;
                     case "boolean":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                         break;
                     default:
                         $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
@@ -191,7 +191,7 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
         if ($details['ca'] == 0 && $details['root'] != 1) {
             return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
         }

web/lib/admin/view/TabbedElementInterface.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @author Zilvinas Vaira
  *
  */
-interface TabbedElementInterface extends PageElementInterface{
+interface TabbedElementInterface extends PageElementInterface {
     
     /**
      * @return boolean

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/view/MessageBox.php

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 '';
         }
     }

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!");
     }

devices/linux/Device_Linux.php

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 . '"