GEANT / CAT

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

web/lib/admin/view/YesNoDialogBox.php

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class YesNoDialogBox extends AbstractTextDialogBox{
+class YesNoDialogBox extends AbstractTextDialogBox {
 
     const NO = 0;
     const YES = 1;
@@ -25,7 +25,7 @@ 
      * @param string $action
      * @param string $text
      */
-    public function __construct($id, $action, $text){
+    public function __construct($id, $action, $text) {
         parent::__construct($action, $text);
         $this->id = $id;
     }
@@ -35,7 +35,7 @@ 
      * @param string $name
      * @param string $value
      */
-    public function setYesControl($name, $value){
+    public function setYesControl($name, $value) {
         $this->controls[self::YES]['name'] = $name;
         $this->controls[self::YES]['value'] = $value;
     }
@@ -45,7 +45,7 @@ 
      * @param string $name
      * @param string $value
      */
-    public function setNoControl($name, $value){
+    public function setNoControl($name, $value) {
         $this->controls[self::NO]['name'] = $name;
         $this->controls[self::NO]['value'] = $value;
     }
@@ -55,12 +55,12 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
      */
-    protected function renderControls(){
+    protected function renderControls() {
         ?>
             <button type="submit" name="<?php echo $this->controls[self::YES]['name']; ?>" value="<?php echo $this->controls[self::YES]['value']; ?>"><?php echo _('Yes'); ?></button>
-        <?php if($this->controls[self::NO]['name'] == ''){ ?>
+        <?php if ($this->controls[self::NO]['name'] == '') { ?>
             <button class="<?php echo $this->id . '-close'; ?>" type="reset"><?php echo _('No'); ?></button>
-        <?php }else{ ?>
+        <?php } else { ?>
             <button type="submit" name="<?php echo $this->controls[self::NO]['name']; ?>" value="<?php echo $this->controls[self::NO]['value']; ?>"><?php echo _('No'); ?></button>
         <?php }
     }

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

web/lib/admin/view/ComposeEmailBox.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
      */
-    protected function renderControls(){
+    protected function renderControls() {
         ?>
         <div style="position: relative; padding-bottom: 10px; width: 450px;">
              <label>Send email using client aplication:</label>

web/lib/admin/http/SendTokenBySms.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SendTokenBySms extends AbstractInvokerCommand{
+class SendTokenBySms extends AbstractInvokerCommand {
     
     const COMMAND = "sendtokenbysms";
     const PARAM_PHONE = "phone";
@@ -38,7 +38,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->detailsCommand = new GetTokenEmailDetails(GetTokenEmailDetails::COMMAND, $context);
         $this->context = $context;
@@ -49,7 +49,7 @@ 
      * @param string $phone
      * @param string $content
      */
-    private function sendSMS($phone, $content){
+    private function sendSMS($phone, $content) {
         $error = "";
         $result = -1;
         try {
@@ -79,7 +79,7 @@ 
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
     public function execute() {
-        if(isset($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) && isset($_POST[SendTokenBySms::PARAM_PHONE])){
+        if (isset($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) && isset($_POST[SendTokenBySms::PARAM_PHONE])) {
             
             $invitationToken = $this->parseString($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]);
             $phone = $this->parseString($_POST[SendTokenBySms::PARAM_PHONE]);

web/lib/admin/view/SendSmsBox.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
      */
-    protected function renderControls(){
+    protected function renderControls() {
         ?>
         <div style="position: relative; padding-bottom: 10px; width: 450px;">
              <label>Enter user phone: +</label>

web/lib/admin/http/RevokeInvitationCommand.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class RevokeInvitationCommand extends AbstractInvokerCommand{
+class RevokeInvitationCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'revokeinvitation';
 
@@ -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() {
         $invitationId = $this->parseInt($_POST[self::COMMAND]);
         
         $invitation = SilverbulletInvitation::prepare($invitationId);

web/lib/admin/http/AddUsersCommand.php

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

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