GEANT / CAT

web/lib/admin/domain/SilverbulletInvitation.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     
     /**
      * 
-     * @param $silverbulletUser SilverbulletUser
+     * @param SilverbulletUser|null $silverbulletUser SilverbulletUser
      */
     public function __construct($silverbulletUser) {
         parent::__construct(self::TABLE, self::TYPE_INST);

Braces +2 added lines, -2 removed lines

@@ -160,9 +160,9 @@
         
         if ($this->isRevoked()){
             $link = _('This token has been revoked!');
-        }else if($this->isAbsent()){
+        } else if($this->isAbsent()){
             $link = _('All available activations were used!');
-        }else if ($this->isExpired()) {
+        } else if ($this->isExpired()) {
             $link = _('User did not consume the token and it expired!');
         } else {
             $link .= '/accountstatus/accountstatus.php?token=' . $this->get(self::TOKEN);

Spacing +12 added lines, -12 removed lines

@@ -82,7 +82,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::validate()
      */
-    public function validate(){
+    public function validate() {
         return (
             !empty($this->get(self::PROFILEID)) &&
             !empty($this->get(self::SILVERBULLETUSERID))
@@ -109,7 +109,7 @@ 
      * 
      * @param int $quantity
      */
-    public function setQuantity($quantity){
+    public function setQuantity($quantity) {
         $this->set(self::QUANTITY, $quantity);
     }
 
@@ -117,7 +117,7 @@ 
      *
      * @return string
      */
-    public function getRemainingActivations(){
+    public function getRemainingActivations() {
         return sprintf(_("%s of %s"), count($this->certificates), $this->get(self::QUANTITY));
     }
     
@@ -125,12 +125,12 @@ 
      * 
      * @return boolean
      */
-    public function isRevoked(){
+    public function isRevoked() {
         $quantity = $this->get(self::QUANTITY);
         return $quantity <= 0;
     }
     
-    public function isAbsent(){
+    public function isAbsent() {
         $quantity = $this->get(self::QUANTITY);
         return count($this->certificates) >= $quantity;
     }
@@ -162,7 +162,7 @@ 
             }
             $link .= $_SERVER['SERVER_NAME'];
             $relPath = dirname(dirname($_SERVER['SCRIPT_NAME']));
-            if ($relPath[strlen($relPath) -1] == '/') {
+            if ($relPath[strlen($relPath) - 1] == '/') {
                 $relPath = substr($relPath, 0, strlen($relPath) - 1);
             }
             $link = $link . $relPath;
@@ -170,11 +170,11 @@ 
             $link = $host;
         }
         
-        if ($this->isRevoked()){
+        if ($this->isRevoked()) {
             $link = _('This token has been revoked!');
-        }else if($this->isAbsent()){
+        } else if ($this->isAbsent()) {
             $link = _('All available activations were used!');
-        }else if ($this->isExpired()) {
+        } else if ($this->isExpired()) {
             $link = _('User did not consume the token and it expired!');
         } else {
             $link .= '/accountstatus/accountstatus.php?token=' . $this->get(self::TOKEN);
@@ -234,7 +234,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate[]
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
     
@@ -243,7 +243,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentEntity::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = parent::load($searchAttribute);
         $this->certificates = SilverbulletCertificate::getList(null, new Attribute(SilverbulletCertificate::SILVERBULLETINVITATIONID, $this->getIdentifier(), Attribute::TYPE_INTEGER));
         return $state;
@@ -276,7 +276,7 @@ 
             $attrValue = $searchAttribute->value;
             $query = sprintf("SELECT * FROM `%s` WHERE `%s`=? AND `%s`=? ORDER BY `%s` DESC", self::TABLE, self::SILVERBULLETUSERID, $searchAttribute->key, self::EXPIRY);
             $result = $databaseHandle->exec($query, $userType . $attrType, $userValue, $attrValue);
-        } else if($silverbulletUser != null) {
+        } else if ($silverbulletUser != null) {
             $userId = $silverbulletUser->getAttribute(self::ID);
             $userType = $userId->getType();
             $userValue = $userId->value;

tests/unit/web/lib/admin/domain/SilverBulletUserTest.php

Spacing +8 added lines, -8 removed lines

@@ -5,7 +5,7 @@ 
 use web\lib\admin\domain\Attribute;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-class SilverbulletUserTest extends PHPUnit_Framework_TestCase{
+class SilverbulletUserTest extends PHPUnit_Framework_TestCase {
     
     private $username = 'testusername';
     
@@ -26,7 +26,7 @@ 
         $this->newUser->setExpiry('now');
     }
     
-    public function testNewUser(){
+    public function testNewUser() {
         $this->newUser->save();
         $this->assertNotEmpty($this->newUser->getIdentifier());
         
@@ -50,7 +50,7 @@ 
         $list = SilverbulletUser::getList($this->profileId);
         $found = false;
         foreach ($list as $user) {
-            if($user->getIdentifier() == $this->newUser->getIdentifier()){
+            if ($user->getIdentifier() == $this->newUser->getIdentifier()) {
                 $found = true;
                 break;
             }
@@ -61,12 +61,12 @@ 
         $this->assertTrue($result);
     }
     
-    public function testInactiveUser(){
+    public function testInactiveUser() {
         $this->newUser->save();
         $this->assertFalse($this->newUser->hasCertificates());
     }
     
-    public function testActiveUser(){
+    public function testActiveUser() {
         $this->newUser->save();
         $invitation = new SilverbulletInvitation($this->newUser);
         $invitation->setQuantity(2);
@@ -83,10 +83,10 @@ 
         $this->assertEquals(2, count($certificates));
     }
     
-    public function testSetDeactivated(){
+    public function testSetDeactivated() {
         $serial = '29837498273948';
         $cn = 'testCommonName';
-        $expiry = date('Y-m-d',strtotime("tomorrow"));
+        $expiry = date('Y-m-d', strtotime("tomorrow"));
         
         //Testing new user deactivation
         $this->newUser->save();
@@ -130,7 +130,7 @@ 
         $this->assertEquals(SilverbulletUser::ACTIVE, $existingUser->get(SilverbulletUser::DEACTIVATION_STATUS));
     }
     
-    protected function tearDown(){
+    protected function tearDown() {
         $this->newUser->delete();
         $this->profile->delete();
     }

tests/unit/web/lib/admin/domain/SilverbulletControllerTest.php

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 use web\lib\admin\http\SilverbulletContext;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-if ( !isset( $_SESSION ) ) $_SESSION = array();
+if ( !isset( $_SESSION ) ) {
+    $_SESSION = array();
+}
 
 class MockInstitutionPageBuilder extends InstitutionPageBuilder{
     

Spacing +12 added lines, -12 removed lines

@@ -15,24 +15,24 @@ 
 use web\lib\admin\http\SilverbulletContext;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-if ( !isset( $_SESSION ) ) $_SESSION = array();
+if (!isset($_SESSION)) $_SESSION = array();
 
-class MockInstitutionPageBuilder extends InstitutionPageBuilder{
+class MockInstitutionPageBuilder extends InstitutionPageBuilder {
     
     private $profile;
     
-    public function __construct($profile){
+    public function __construct($profile) {
         parent::__construct(new DefaultHtmlPage("Test Page"));
         $this->profile = $profile; 
     }
     
-    public function getProfile(){
+    public function getProfile() {
         return $this->profile;
     }
     
 }
 
-class SilverbulletControllerTest extends PHPUnit_Framework_TestCase{
+class SilverbulletControllerTest extends PHPUnit_Framework_TestCase {
     
     private $username = 'testusername';
     
@@ -44,7 +44,7 @@ 
     
     private $factory;
     
-    protected function setUp(){
+    protected function setUp() {
         $this->databaseHandle = \core\DBConnection::handle('INST');
         
         $this->profile = new MockProfileSilverbullet($this->databaseHandle);
@@ -64,7 +64,7 @@ 
         $usersAfter = count(SilverbulletUser::getList($this->profile->identifier));
         $this->assertFalse($usersAfter > $usersBefore);
         
-        $_POST[AddUserCommand::PARAM_EXPIRY] = date('Y-m-d',strtotime("tomorrow"));
+        $_POST[AddUserCommand::PARAM_EXPIRY] = date('Y-m-d', strtotime("tomorrow"));
         $this->factory->parseRequest();
 
         // Is not going to work since the $_POST variables can't be modified at runtime for filter_input function
@@ -73,10 +73,10 @@ 
         
     }
 
-    private function countActiveUsers($users){
+    private function countActiveUsers($users) {
         $count = 0;
         foreach ($users as $user) {
-            if(!$user->isDeactivated()){
+            if (!$user->isDeactivated()) {
                 $count++;
             }
         }
@@ -154,7 +154,7 @@ 
     public function testRevokeGeneratedCertificate() {
         $serial = '29837498273948';
         $cn = 'testCommonName';
-        $expiry = date('Y-m-d',strtotime("tomorrow"));
+        $expiry = date('Y-m-d', strtotime("tomorrow"));
         
         $this->user->save();
 
@@ -181,9 +181,9 @@ 
         
     }
     
-    protected function tearDown(){
+    protected function tearDown() {
         $this->user->delete();
-        $this->databaseHandle->exec("DELETE FROM `".SilverbulletUser::TABLE."` WHERE `".SilverbulletUser::USERNAME."`='".$this->username."'");
+        $this->databaseHandle->exec("DELETE FROM `" . SilverbulletUser::TABLE . "` WHERE `" . SilverbulletUser::USERNAME . "`='" . $this->username . "'");
         $this->profile->delete();
     }
 }

web/lib/admin/http/AddInvitationCommand.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class AddInvitationCommand extends AbstractInvokerCommand{
+class AddInvitationCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'newinvitation';
 
@@ -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,7 +33,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $userIndex = $this->parseInt($_POST[self::COMMAND]);
         $userIds = $this->parseArray($_POST[SaveUsersCommand::PARAM_ID]);
         $invitationsQuantities = $this->parseArray($_POST[SaveUsersCommand::PARAM_QUANTITY]);
@@ -43,14 +43,14 @@ 
         $user = SilverbulletUser::prepare($userId);
         $user->load();
         
-        if($user->isExpired()){
+        if ($user->isExpired()) {
             $this->storeErrorMessage(sprintf(_("User '%s' has expired. In order to generate credentials please extend the expiry date!"), $user->getUsername()));
-        }else{
+        } else {
             $this->context->createInvitation($user, $this, (int) $invitationsQuantity);
-            if(!is_numeric($invitationsQuantity)){
+            if (!is_numeric($invitationsQuantity)) {
                 $this->storeErrorMessage(sprintf(_("Invitations quantity '%' provided for user '%s' was not numeric. Assumed quantity as '1' !"), $invitationsQuantity, $user->getUsername()));
             }
-            if($user->isDeactivated()){
+            if ($user->isDeactivated()) {
                 $user->setDeactivated(false, $this->context->getProfile());
                 $user->save();
             }

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         
         if($user->isExpired()){
             $this->storeErrorMessage(sprintf(_("User '%s' has expired. In order to generate credentials please extend the expiry date!"), $user->getUsername()));
-        }else{
+        } else{
             $this->context->createInvitation($user, $this, (int) $invitationsQuantity);
             if(!is_numeric($invitationsQuantity)){
                 $this->storeErrorMessage(sprintf(_("Invitations quantity '%' provided for user '%s' was not numeric. Assumed quantity as '1' !"), $invitationsQuantity, $user->getUsername()));

web/skins/classic/basic.php

Spacing +3 added lines, -3 removed lines

@@ -142,7 +142,7 @@ 
     public function listIdPs() {
         $instList = $this->orderIdentityProviders($this->country->identifier);
         $out = '';
-        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst );
+        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst);
         $out .= '<select name="idp" onchange="submit_form(this)">';
         if (!empty($instList)) {
             if (!isset($this->idp)) {
@@ -236,7 +236,7 @@ 
                 }
             }
             $out .= '>' . $disp . '</option>';
-            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
+            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
             $iterator++;
         }
         $out .= '</select>';
@@ -430,7 +430,7 @@ 
         </script>
     </head>
     <body style="">
-        <?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>'; ?>
+        <?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>'; ?>
         <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'>
             <img src="<?php echo $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
             <?php

web/admin/edit_federation.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></h2>
+        <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></h2>
         <table>
             <tr>
                 <td><?php echo _("Country:"); ?></td>
@@ -57,7 +57,7 @@ 
               <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>";
     ?>
     <fieldset class="option_container">
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></strong></legend>
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></strong></legend>
         <?php
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED");
         echo $optionDisplay->prefilledOptionTable("fed");

web/lib/admin/GeoWidget.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function insertInHead($inst_country, $inst_name) {
         $cat = new \core\CAT();
-        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
+        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;

web/admin/edit_idp_result.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
     foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
-        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
+        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
     }
 }
 

web/user/tou.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 /* 
 */
 
-        $Tou =  [
+        $Tou = [
     'title' => _("Terms of Use"),
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
 Identity Providers by making available customised and securely configured eduroam installers.</p>
@@ -49,7 +49,7 @@ 
     they are from the same user group. You are not allowed to share them to an unlimited
     audience (e.g. on a publicly accessible web server).</li>
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
-your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li>
+your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li>
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
 </ul>