GEANT / CAT

web/lib/admin/http/TermsOfUseCommand.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class TermsOfUseCommand extends AbstractInvokerCommand{
+class TermsOfUseCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'termsofuse';
     
@@ -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,8 +33,8 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::AGREEMENT])){
+    public function execute() {
+        if (isset($_POST[self::AGREEMENT])) {
             $this->context->signAgreement();
         }
         $this->context->redirectAfterSubmit();

web/lib/admin/http/SaveUsersCommand.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SaveUsersCommand extends AbstractInvokerCommand{
+class SaveUsersCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'saveusers';
 
@@ -29,7 +29,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -39,13 +39,13 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::PARAM_ID]) && isset($_POST[self::PARAM_EXPIRY])){
+    public function execute() {
+        if (isset($_POST[self::PARAM_ID]) && isset($_POST[self::PARAM_EXPIRY])) {
             $userIds = $this->parseArray($_POST[self::PARAM_ID]);
             foreach ($userIds as $key => $userId) {
                 $user = SilverbulletUser::prepare($userId);
                 $user->load();
-                if(isset($_POST[self::PARAM_ACKNOWLEDGE]) && $_POST[self::PARAM_ACKNOWLEDGE]=='true'){
+                if (isset($_POST[self::PARAM_ACKNOWLEDGE]) && $_POST[self::PARAM_ACKNOWLEDGE] == 'true') {
                     $user->makeAcknowledged();
                 }
                 $user->save();

web/lib/admin/http/SilverbulletContext.php

Braces +4 added lines, -4 removed lines

@@ -92,14 +92,14 @@ 
         $user = new SilverbulletUser($this->profile->identifier, $username);
         if(empty($username)){
             $command->storeErrorMessage(_('User name should not be empty!'));
-        }elseif(empty($expiry)){
+        } elseif(empty($expiry)){
             $command->storeErrorMessage(_('No expiry date has been provided!'));
-        }else{
+        } else{
             $user->setExpiry($expiry);
             $user->save();
             if(empty($user->get(SilverbulletUser::EXPIRY))){
                 $command->storeErrorMessage(sprintf(_("Expiry date was incorect for '%s'!"), $username));
-            }elseif(empty($user->getIdentifier())){
+            } elseif(empty($user->getIdentifier())){
                 $command->storeErrorMessage(sprintf(_("Username '%s' already exist!"), $username));
             }
         }
@@ -146,7 +146,7 @@ 
         foreach ($this->users as $user) {
             if($user->hasActiveCertificates()){
                 $count[self::STATS_ACTIVE]++;
-            }else{
+            } else{
                 $count[self::STATS_PASSIVE]++;
             }
         }

Spacing +30 added lines, -30 removed lines

@@ -11,7 +11,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletContext extends DefaultContext  implements MessageDistributor{
+class SilverbulletContext extends DefaultContext  implements MessageDistributor {
     
     const STATS_TOTAL = 'total';
     const STATS_ACTIVE = 'active';
@@ -61,7 +61,7 @@ 
      * 
      * @param SilverbulletController $controller
      */
-    public function setController($controller){
+    public function setController($controller) {
         $this->controller = $controller;
     }
     
@@ -70,7 +70,7 @@ 
      *
      * @return ProfileSilverbullet
      */
-    public function getProfile(){
+    public function getProfile() {
         return $this->profile;
     }
     
@@ -79,7 +79,7 @@ 
      *
      * @return InstitutionPageBuilder
      */
-    public function getBuilder(){
+    public function getBuilder() {
         return $this->builder;
     }
     
@@ -88,7 +88,7 @@ 
      *
      * @return boolean
      */
-    public function isAgreementSigned(){
+    public function isAgreementSigned() {
         $agreement_attributes = $this->profile->getAttributes("hiddenprofile:tou_accepted");
         return count($agreement_attributes) > 0;
     }
@@ -96,8 +96,8 @@ 
     /**
      * Marks agreement as signed inside the database
      */
-    public function signAgreement(){
-        $this->profile->addAttribute("hiddenprofile:tou_accepted",NULL,TRUE);
+    public function signAgreement() {
+        $this->profile->addAttribute("hiddenprofile:tou_accepted", NULL, TRUE);
     }
     
     /**
@@ -108,18 +108,18 @@ 
      * @param AbstractInvokerCommand $command
      * @return SilverbulletUser
      */
-    public function createUser($username, $expiry, $command){
+    public function createUser($username, $expiry, $command) {
         $user = new SilverbulletUser($this->profile->identifier, $username);
-        if(empty($username)){
+        if (empty($username)) {
             $command->storeErrorMessage(_('User name should not be empty!'));
-        }elseif(empty($expiry)){
+        }elseif (empty($expiry)) {
             $command->storeErrorMessage(_('No expiry date has been provided!'));
-        }else{
+        } else {
             $user->setExpiry($expiry);
             $user->save();
-            if(empty($user->get(SilverbulletUser::EXPIRY))){
+            if (empty($user->get(SilverbulletUser::EXPIRY))) {
                 $command->storeErrorMessage(sprintf(_("Expiry date was incorect for '%s'!"), $username));
-            }elseif(empty($user->getIdentifier())){
+            }elseif (empty($user->getIdentifier())) {
                 $command->storeErrorMessage(sprintf(_("Username '%s' already exist!"), $username));
             }
         }
@@ -133,13 +133,13 @@ 
      * @param AbstractInvokerCommand $command
      * @return SilverbulletInvitation
      */
-    public function createInvitation($user, $command, $quantity = 1){
+    public function createInvitation($user, $command, $quantity = 1) {
         $invitation = new SilverbulletInvitation($user);
-        if($quantity > 1){
+        if ($quantity > 1) {
             $invitation->setQuantity($quantity);
         }
         $invitation->save();
-        if(empty($invitation->getIdentifier())){
+        if (empty($invitation->getIdentifier())) {
             $command->storeErrorMessage(_('Could not create invitation!'));
         }
         return $invitation;
@@ -150,7 +150,7 @@ 
      *
      * @return SilverbulletUser
      */
-    public function createUsers(){
+    public function createUsers() {
         $this->users = SilverbulletUser::getList($this->profile->identifier);
         return $this->users;
     }
@@ -160,16 +160,16 @@ 
      *
      * @return array
      */
-    public function getUserStats(){
+    public function getUserStats() {
         $silverbulletMaxUsers = $this->profile->getAttributes("internal:silverbullet_maxusers");
         $count = array();
         $count[self::STATS_TOTAL] = isset($silverbulletMaxUsers[0]['value']) ? $silverbulletMaxUsers[0]['value'] : -1;
         $count[self::STATS_ACTIVE] = 0;
         $count[self::STATS_PASSIVE] = 0;
         foreach ($this->users as $user) {
-            if($user->hasActiveCertificates()){
+            if ($user->hasActiveCertificates()) {
                 $count[self::STATS_ACTIVE]++;
-            }else{
+            } else {
                 $count[self::STATS_PASSIVE]++;
             }
         }
@@ -179,10 +179,10 @@ 
     /**
      * Redirects page to itself in order to prevent acidental form resubmition
      */
-    public function redirectAfterSubmit(){
-        if(isset($_SERVER['REQUEST_URI'])){
+    public function redirectAfterSubmit() {
+        if (isset($_SERVER['REQUEST_URI'])) {
             $location = $this->addQuery($_SERVER['SCRIPT_NAME']);
-            header('Location: ' . $location );
+            header('Location: ' . $location);
             exit;
         }
     }
@@ -193,11 +193,11 @@ 
      * @param string $url
      * @return string
      */
-    public function addQuery($url){
+    public function addQuery($url) {
         $query = '';
         if (is_array($_GET) && count($_GET)) {
-            foreach($_GET as $key => $val) {
-                if(strpos($key , '/') === false){
+            foreach ($_GET as $key => $val) {
+                if (strpos($key, '/') === false) {
                     if (empty($key) || empty($val)) { continue; }
                     $query .= ($query == '') ? '?' : "&";
                     $query .= urlencode($key) . '=' . urlencode($val);
@@ -212,7 +212,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\MessageDistributor::addMessageInvoker()
      */
-    public function addMessageInvoker($commandToken, $invoker){
+    public function addMessageInvoker($commandToken, $invoker) {
         $this->invokers[$commandToken] = $invoker;
     }
     
@@ -221,10 +221,10 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\MessageDistributor::distributeMessages()
      */
-    public function distributeMessages($commandToken, $receiver){
-        if($this->controller != null){
+    public function distributeMessages($commandToken, $receiver) {
+        if ($this->controller != null) {
             $this->controller->createCommand($commandToken);
-            if(isset($this->invokers[$commandToken])){
+            if (isset($this->invokers[$commandToken])) {
                 $this->invokers[$commandToken]->publishMessages($receiver);
             }
         }

web/skins/eduroam2016/user/js/roll.php

Indentation +6 added lines, -7 removed lines

@@ -68,13 +68,12 @@
 
 <?php
 /**
-  * The OS object holds operating system descriptions
-  * @param name is the main title
-  * @param subtitle - the subtitle
-  * @param path - the path to the scriin-dump image
-  * @param signed - if true show information that the module is signed
-    
-*/
+ * The OS object holds operating system descriptions
+ * @param name is the main title
+ * @param subtitle - the subtitle
+ * @param path - the path to the scriin-dump image
+ * @param signed - if true show information that the module is signed
+ */
 ?>
 
 function OS(name, subtitle, path, signed) {

Spacing +6 added lines, -6 removed lines

@@ -129,12 +129,12 @@
  */
 ?>
 
-var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-win8-english-h234.png")?>",true);
-var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-mac-english-h234.png")?>",true);
-var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-android-english-h234.png")?>",false);
-var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-iphone-english-h234.png")?>",true);
-var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-linux-english-h234.png")?>",false);
-var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-chromeos-english-h234.png")?>",false);
+var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-win8-english-h234.png")?>",true);
+var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-mac-english-h234.png")?>",true);
+var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-android-english-h234.png")?>",false);
+var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-iphone-english-h234.png")?>",true);
+var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-linux-english-h234.png")?>",false);
+var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-chromeos-english-h234.png")?>",false);
 
 
 

web/skins/eduroam2016/resources/css/cat-basic.css.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
 }
 
@@ -48,7 +48,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
    border-radius:10px ; 
    border-radius:2vw ; 

web/lib/admin/view/PopupMessageContainer.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class PopupMessageContainer implements PageElementInterface{
+class PopupMessageContainer implements PageElementInterface {
     
     protected $id = '';
     
@@ -36,7 +36,7 @@ 
         $this->pageElement = $pageElement;
         $this->id = $id;
         $this->title = $title;
-        if(!$isVisible){
+        if (!$isVisible) {
             $this->disabledStyle = 'style="display:none;"';
         }
         $this->setCloseButtonClass('close');
@@ -47,7 +47,7 @@ 
      * 
      * @param string $token
      */
-    public function setCloseButtonClass($token){
+    public function setCloseButtonClass($token) {
         $this->closeButtonClass = $this->id . '-' . $token;
     }
     

web/lib/admin/view/AbstractDialogBox.php

Spacing +2 added lines, -2 removed lines

@@ -13,13 +13,13 @@
     
     protected $action = '';
     
-    protected $params = array ();
+    protected $params = array();
     
     /**
      * 
      * @param string $action
      */
-    public function __construct($action){
+    public function __construct($action) {
         $this->action = $action;
     }
     

core/common/OutsideComm.php

Spacing +2 added lines, -2 removed lines

@@ -172,9 +172,9 @@
                 $totalFailures = 0;
                 foreach ($decoded_response['messages'] as $message) {
                     if ($message['status'] == 0) {
-                        $loggerInstance->debug(2, $message['message-id']. ": Success");
+                        $loggerInstance->debug(2, $message['message-id'] . ": Success");
                     } else {
-                        $loggerInstance->debug(2, $message['message-id']. ": Failed (failure code = ".$message['status'].")");
+                        $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")");
                         $totalFailures++;
                     }
                 }

core/diag/Telepath.php

Doc Comments +3 added lines

@@ -120,6 +120,9 @@
         return Telepath::STATUS_GOOD;
     }
 
+    /**
+     * @param string $homeFlr
+     */
     private function checkNROFlow($visitedFlr, $homeFlr) {
         // TODO: this is a stub, need eduroam OT API to query the current server status
         // APIQueryNRODirect($visitedFlr, $homeFlr);