GEANT / CAT

web/lib/admin/http/SilverbulletAjaxController.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletAjaxController extends AbstractController{
+class SilverbulletAjaxController extends AbstractController {
 
     /**
      * 
@@ -21,7 +21,7 @@ 
      *
      * @param DefaultContext $context Requires default context object.
      */
-    public function __construct($context){
+    public function __construct($context) {
         $this->context = $context;
     }
     
@@ -31,11 +31,11 @@ 
      * @see \web\lib\admin\http\AbstractController::doCreateCommand()
      */
     protected function doCreateCommand($commandToken) {
-        if($commandToken == ValidateEmailAddress::COMMAND){
+        if ($commandToken == ValidateEmailAddress::COMMAND) {
             return new ValidateEmailAddress($commandToken, $this->context);
-        }elseif($commandToken == GetTokenEmailDetails::COMMAND) {
+        }elseif ($commandToken == GetTokenEmailDetails::COMMAND) {
             return new GetTokenEmailDetails($commandToken, $this->context);
-        }else {
+        } else {
             return new DefaultCommand($commandToken);
         }
     }
@@ -45,9 +45,9 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractController::parseRequest()
      */
-    public function parseRequest(){
+    public function parseRequest() {
         $commandToken = '';
-        if(isset($_REQUEST[SilverbulletAjaxController::COMMAND])){
+        if (isset($_REQUEST[SilverbulletAjaxController::COMMAND])) {
             $commandToken = $_REQUEST[SilverbulletAjaxController::COMMAND];
         }
         $currentCommand = $this->createCommand($commandToken);

web/lib/admin/http/UpdateUserCommand.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class UpdateUserCommand extends AbstractInvokerCommand{
+class UpdateUserCommand extends AbstractInvokerCommand {
 
     /**
      * Update command identifier.
@@ -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,7 +39,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]);
         $userExpiries = $this->parseArray($_POST[SaveUsersCommand::PARAM_EXPIRY]);
@@ -51,7 +51,7 @@ 
 
         $user->setExpiry($userExpiry);
         $username = $user->getUsername();
-        if(empty($user->get(SilverbulletUser::EXPIRY))){
+        if (empty($user->get(SilverbulletUser::EXPIRY))) {
             $this->storeErrorMessage(sprintf(_("Expiry date was incorrect for '%s'!"), $username));
         }
         $user->save();

web/lib/admin/http/RevokeCertificateCommand.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class RevokeCertificateCommand extends AbstractInvokerCommand{
+class RevokeCertificateCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'revokecertificate';
 
@@ -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() {
         $profile = $this->context->getProfile();
         $certificateId = $this->parseInt($_POST[self::COMMAND]);
         

web/lib/admin/http/AbstractController.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
      * @param string $commandToken
      * @return AbstractCommand
      */
-    public function createCommand($commandToken){
-        if(!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null){
+    public function createCommand($commandToken) {
+        if (!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null) {
             $this->commands[$commandToken] = $this->doCreateCommand($commandToken);
         }
         return $this->commands[$commandToken];

web/lib/admin/http/DefaultCommand.php

Spacing +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
  * @author Zilvinas Vaira
  *
  */
-class DefaultCommand extends AbstractCommand{
+class DefaultCommand extends AbstractCommand {
 
     /**
      * 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         
     }
 

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();

tests/unit/web/lib/admin/view/InstitutionPageBuilderTest.php

Spacing +12 added lines, -12 removed lines

@@ -3,9 +3,9 @@ 
 use web\lib\admin\view\DefaultHtmlPage;
 use web\lib\admin\view\InstitutionPageBuilder;
 
-class MockValidateInstitutionPageBuilder extends InstitutionPageBuilder{
+class MockValidateInstitutionPageBuilder extends InstitutionPageBuilder {
     
-    protected function validateInstitution(){
+    protected function validateInstitution() {
         $this->institution = $this->valid_IdP($_GET['inst_id'], $_SESSION['user']);
     }
     
@@ -16,34 +16,34 @@ 
      * @throws Exception
      * @return mixed
      */
-    private function valid_IdP($input, $owner){
-        if ($input == 1){
+    private function valid_IdP($input, $owner) {
+        if ($input == 1) {
             return new MockInstitution();
-        }else{
-            throw new Exception('IdP '.$input.' not found in database!');
+        } else {
+            throw new Exception('IdP ' . $input . ' not found in database!');
         }
     }
     
 }
 
-class MockInstitution{
+class MockInstitution {
     public $name = "Test name";
 }
 
-class InstitutionPageBuilderTest extends \PHPUnit_Framework_TestCase{
+class InstitutionPageBuilderTest extends \PHPUnit_Framework_TestCase {
     
     protected function setUp() {
         $_SESSION['user'] = "user";
     }
     
-    public function testConstructorSuccess(){
-        $_GET['inst_id']=1;
+    public function testConstructorSuccess() {
+        $_GET['inst_id'] = 1;
         $builder = new MockValidateInstitutionPageBuilder(new DefaultHtmlPage("Testing Page"));
         $this->assertTrue($builder->isReady());
     }
     
-    public function testConstructorFailure(){
-        $_GET['inst_id']=-1;
+    public function testConstructorFailure() {
+        $_GET['inst_id'] = -1;
         $builder = new MockValidateInstitutionPageBuilder(new DefaultHtmlPage("Testing Page"));
         $this->assertFalse($builder->isReady());
         

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

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);