GEANT / CAT

web/lib/admin/domain/SilverbulletUser.php

Braces +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
         if($tokenExpiry > $this->defaultUserExpiry){
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else{
             $this->clear();
         }
     }
@@ -124,9 +124,9 @@ 
         $days = $this->getAcknowledgeDays();
         if($days <= $max * 0.2 && $days > $max * 0.1){
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        } elseif ($days <= $max * 0.1){
             return self::LEVEL_RED;
-        }else{
+        } else{
             return self::LEVEL_GREEN;
         }
     }
@@ -212,7 +212,7 @@ 
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else{
             $this->set(self::DEACTIVATION_TIME, '0000-00-00 00:00:00');
         }
     }

Spacing +29 added lines, -29 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletUser extends PersistentEntity{
+class SilverbulletUser extends PersistentEntity {
     
     const LEVEL_GREEN = 0;
     const LEVEL_YELLOW = 1;
@@ -89,14 +89,14 @@ 
      * @param int $profileId
      * @param string $username
      */
-    public function __construct($profileId, $username){
+    public function __construct($profileId, $username) {
         parent::__construct(self::TABLE, self::TYPE_INST);
         $this->setAttributeType(self::PROFILEID, Attribute::TYPE_INTEGER);
         
         $this->set(self::PROFILEID, $profileId);
         $this->set(self::USERNAME, $username);
         //$this->set(self::EXPIRY, 'NOW() + INTERVAL 1 WEEK');
-        $this->defaultUserExpiry = date('Y-m-d H:i:s',strtotime("today"));
+        $this->defaultUserExpiry = date('Y-m-d H:i:s', strtotime("today"));
         //$this->set(self::EXPIRY, $this->defaultUserExpiry);
     }
     
@@ -105,11 +105,11 @@ 
      * 
      * @param string $date Takes any string value that can passed to strtotime() function.
      */
-    public function setExpiry($date){
+    public function setExpiry($date) {
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
-        if($tokenExpiry > $this->defaultUserExpiry){
+        if ($tokenExpiry > $this->defaultUserExpiry) {
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else {
             $this->clear();
         }
     }
@@ -117,8 +117,8 @@ 
     /**
      * 
      */
-    public function makeAcknowledged(){
-        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s',strtotime("now")));
+    public function makeAcknowledged() {
+        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s', strtotime("now")));
     }
     
     /**
@@ -126,14 +126,14 @@ 
      * 
      * @return int One of the following constants LEVEL_GREEN, LEVEL_YELLOW, LEVEL_RED.
      */
-    public function getAcknowledgeLevel(){
+    public function getAcknowledgeLevel() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $days = $this->getAcknowledgeDays();
-        if($days <= $max * 0.2 && $days > $max * 0.1){
+        if ($days <= $max * 0.2 && $days > $max * 0.1) {
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        }elseif ($days <= $max * 0.1) {
             return self::LEVEL_RED;
-        }else{
+        } else {
             return self::LEVEL_GREEN;
         }
     }
@@ -143,7 +143,7 @@ 
      * 
      * @return number Number of days from 0 to maximum period.
      */
-    public function getAcknowledgeDays(){
+    public function getAcknowledgeDays() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $lastAcknowledge = strtotime($this->get(self::LAST_ACKNOWLEDGE));
         $now = strtotime('now');
@@ -151,11 +151,11 @@ 
         return $days > 0 ? $days : 0;
     }
     
-    public function getProfileId(){
+    public function getProfileId() {
         return $this->get(self::PROFILEID);
     }
     
-    public function getUsername(){
+    public function getUsername() {
         return $this->get(self::USERNAME);
     }
     
@@ -163,7 +163,7 @@ 
      * 
      * @return boolean
      */
-    public function isExpired(){
+    public function isExpired() {
         $expiryTime = strtotime($this->get(self::EXPIRY));
         $currentTime = time();
         return $currentTime > $expiryTime;
@@ -173,7 +173,7 @@ 
      *
      * @return string
      */
-    public function getExpiry(){
+    public function getExpiry() {
         return date('Y-m-d', strtotime($this->get(self::EXPIRY)));
     }
     
@@ -181,7 +181,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
 
@@ -189,7 +189,7 @@ 
      *
      * @return \web\lib\admin\domain\SilverbulletInvitation
      */
-    public function getInvitations(){
+    public function getInvitations() {
         return $this->invitations;
     }
     
@@ -197,7 +197,7 @@ 
      * 
      * @return boolean
      */
-    public function hasCertificates(){
+    public function hasCertificates() {
         return count($this->certificates) > 0;
     }
     
@@ -205,10 +205,10 @@ 
      *
      * @return boolean
      */
-    public function hasActiveCertificates(){
+    public function hasActiveCertificates() {
         $count = 0;
         foreach ($this->certificates as $certificate) {
-            if(!$certificate->isExpired() && !$certificate->isRevoked()){
+            if (!$certificate->isExpired() && !$certificate->isRevoked()) {
                 $count++;
             }
         }
@@ -220,14 +220,14 @@ 
      * 
      * @param boolean $isDeactivated
      */
-    public function setDeactivated($isDeactivated, $profile){
+    public function setDeactivated($isDeactivated, $profile) {
         $this->set(self::DEACTIVATION_STATUS, $isDeactivated ? self::INACTIVE : self::ACTIVE);
-        if($isDeactivated){
+        if ($isDeactivated) {
             $this->set(self::DEACTIVATION_TIME, date('Y-m-d H:i:s', strtotime("now")));
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else {
             $this->set(self::DEACTIVATION_TIME, '0000-00-00 00:00:00');
         }
     }
@@ -236,7 +236,7 @@ 
      * 
      * @return boolean
      */
-    public function isDeactivated(){
+    public function isDeactivated() {
         return $this->get(self::DEACTIVATION_STATUS) == self::INACTIVE;
     }
     
@@ -245,7 +245,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = parent::load();
         $this->certificates = SilverbulletCertificate::getList($this, $searchAttribute);
         $this->invitations = SilverbulletInvitation::getList($this);
@@ -257,7 +257,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::delete()
      */
-    public function delete(){
+    public function delete() {
         $state = parent::delete();
         foreach ($this->certificates as $certificate) {
             $certificate->delete();
@@ -273,7 +273,7 @@ 
      * @param integer $userId
      * @return \web\lib\admin\domain\SilverbulletUser
      */
-    public static function prepare($userId){
+    public static function prepare($userId) {
         $instance = new SilverbulletUser(null, '');
         $instance->set(self::ID, $userId);
         return $instance;

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

Doc Comments +11 added lines, -4 removed lines

@@ -120,6 +120,9 @@ 
         return $find[0];
     }
 
+    /**
+     * @param string $input
+     */
     public function tooltip($input) {
         $descriptions = [];
         if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
@@ -256,6 +259,10 @@ 
         return $number . " B";
     }
 
+    /**
+     * @param string $ref
+     * @param boolean $checkpublic
+     */
     public static function getBlobFromDB($ref, $checkpublic) {
         $validator = new \web\lib\common\InputValidation();
         $reference = $validator->databaseReference($ref);
@@ -402,7 +409,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxOkay(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_OK, $text, $caption, $omittabletags);
@@ -414,7 +421,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxRemark(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_REMARK, $text, $caption, $omittabletags);
@@ -426,7 +433,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxWarning(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_WARN, $text, $caption, $omittabletags);
@@ -438,7 +445,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxError(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_ERROR, $text, $caption, $omittabletags);

web/admin/inc/manageAdmins.inc.php

Switch Indentation +8 added lines, -8 removed lines

@@ -97,14 +97,14 @@
         case "SUCCESS":
             $cryptText = "";
             switch ($_GET['transportsecurity']) {
-            case "ENCRYPTED":
-                $cryptText = _("and <b>encrypted</b> to the mail domain");
-                break;
-            case "CLEAR":
-                $cryptText = _("but <b>in clear text</b> to the mail domain");
-                break;
-            default:
-                throw new Exception("Error: unknown encryption status of invitation!?!");
+                case "ENCRYPTED":
+                    $cryptText = _("and <b>encrypted</b> to the mail domain");
+                    break;
+                case "CLEAR":
+                    $cryptText = _("but <b>in clear text</b> to the mail domain");
+                    break;
+                default:
+                    throw new Exception("Error: unknown encryption status of invitation!?!");
             }
             echo $uiElements->boxRemark(sprintf(_("The invitation email was sent successfully %s."), $cryptText), _("The invitation email was sent."));
             break;

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
             $ownermgmt = new \core\UserManagement();
             $ownermgmt->addAdminToIdp($my_inst, $_SESSION['user']);
         } else {
-            echo "Fatal Error: you wanted to take control over an ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", but are not a ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." operator!";
+            echo "Fatal Error: you wanted to take control over an " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", but are not a " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " operator!";
             exit(1);
         }
     }
@@ -122,13 +122,13 @@ 
 
 if ($isFedAdmin) {
     echo "<div class='ca-summary' style='position:relative;'><table>";
-    echo $uiElements->boxRemark(sprintf(_("You are the %s administrator of this %s. You can invite new administrators, who can in turn appoint further administrators on their own."),$uiElements->nomenclature_fed, $uiElements->nomenclature_inst), sprintf(_("%s Administrator"),$uiElements->nomenclature_fed));
+    echo $uiElements->boxRemark(sprintf(_("You are the %s administrator of this %s. You can invite new administrators, who can in turn appoint further administrators on their own."), $uiElements->nomenclature_fed, $uiElements->nomenclature_inst), sprintf(_("%s Administrator"), $uiElements->nomenclature_fed));
     echo "</table></div>";
 }
 
 if (!$isFedAdmin && $is_admin_with_blessing) {
     echo "<div class='ca-summary' style='position:relative;'><table>";
-    echo $uiElements->boxRemark(sprintf(_("You are an administrator of this %s, and were directly appointed by the %s administrator. You can appoint further administrators, but these can't in turn appoint any more administrators."),$uiElements->nomenclature_inst ,$uiElements->nomenclature_fed), _("Directly Appointed IdP Administrator"));
+    echo $uiElements->boxRemark(sprintf(_("You are an administrator of this %s, and were directly appointed by the %s administrator. You can appoint further administrators, but these can't in turn appoint any more administrators."), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed), _("Directly Appointed IdP Administrator"));
     echo "</table></div>";
 }
 ?>
@@ -156,7 +156,7 @@ 
 
         echo "</td>
               <td>
-                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'>
+                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "") . " accept-charset='UTF-8'>
                 <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input>
                 <button type='submit' name='submitbutton' class='delete' value='" . web\lib\admin\FormElements::BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
                 </form>

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/http/AddUsersCommand.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                     $userCount++;
                 }
             }else{
-                 $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
+                    $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
             }
         }
         if($userCount>0){

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

Braces +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                     $this->context->createInvitation($user, $this, $max);
                     $userCount++;
                 }
-            }else{
+            } else{
                  $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
             }
         }

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;