GEANT / CAT

utils/notify_invitation_expiry.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     $admins = $this_fed->listFederationAdmins();
     $mailtext = "Hello,
 
-invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ." have recently expired:
+invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have recently expired:
 
 ";
     foreach ($listofinstnames as $instname) {
@@ -54,7 +54,7 @@ 
     if ($numberofexistingidps > 0) {
         $mailtext .= "
 
-Additionally, $numberofexistingidps invitations for an existing ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired.
+Additionally, $numberofexistingidps invitations for an existing " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have expired.
         ";
     }
     $mailtext .= "

web/admin/inc/sendinvite.inc.php

Spacing +1 added lines, -2 removed lines

@@ -169,8 +169,7 @@
         _("and enter the invitation token") . "
     $newtoken
 " . ( /* $new_idp_authorized_fedadmin */ FALSE ?
-        wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) :
-        wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
+        wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) : wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
 
 " . wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "
 

web/lib/admin/view/UserCredentialsForm.php

Spacing +23 added lines, -23 removed lines

@@ -26,7 +26,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class UserCredentialsForm implements PageElementInterface{
+class UserCredentialsForm implements PageElementInterface {
     
     const EDITABLEBLOCK_CLASS = 'sb-editable-block';
     const TITLEROW_CLASS = 'sb-title-row';
@@ -118,10 +118,10 @@ 
         
         $this->acknowledgeDays = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $this->acknowledgeText = $acknowledgeText;
-        if($isAcknowledgeEnabled){
+        if ($isAcknowledgeEnabled) {
             $div = new CompositeTag('div');
             $div->addAttribute('style', 'padding-bottom: 20px;');
-            $this->acknowledgeNotice = new Tag ('p');
+            $this->acknowledgeNotice = new Tag('p');
             $div->addTag($this->acknowledgeNotice);
             $checkbox = new UnaryTag('input');
             $checkbox->addAttribute('type', 'checkbox');
@@ -132,7 +132,7 @@ 
             $label->addText('I have verified that all configured users are still eligible for eduroam');
             $div->addTag($label);
             $this->decorator->addHtmlElement($div);
-            $this->decorator->addHtmlElement(new Button(_('Save'),'submit', SaveUsersCommand::COMMAND, SaveUsersCommand::COMMAND));
+            $this->decorator->addHtmlElement(new Button(_('Save'), 'submit', SaveUsersCommand::COMMAND, SaveUsersCommand::COMMAND));
         }
         
         $this->addTitleRow();
@@ -141,7 +141,7 @@ 
     /**
      * 
      */
-    private function addTitleRow(){
+    private function addTitleRow() {
         $row = new Row(array(self::USER_COLUMN => _('User'), self::TOKEN_COLUMN => _('Token/Certificate details'), self::EXPIRY_COLUMN => _('User/Token Expiry'), self::ACTION_COLUMN => _('Actions')));
         $row->addAttribute('class', self::TITLEROW_CLASS);
         $this->table->addRow($row);
@@ -151,19 +151,19 @@ 
      * 
      * @param SilverbulletUser $user
      */
-    public function addUserRow($user){
+    public function addUserRow($user) {
         $row = new Row(array(self::USER_COLUMN => $user->getUsername(), self::EXPIRY_COLUMN => new DatePicker(SaveUsersCommand::PARAM_EXPIRY_MULTIPLE, $user->getExpiry())));
         $row->addAttribute('class', self::USERROW_CLASS);
         
         $acknowledgeLevel = $user->getAcknowledgeLevel();
-        if($acknowledgeLevel == SilverbulletUser::LEVEL_YELLOW){
+        if ($acknowledgeLevel == SilverbulletUser::LEVEL_YELLOW) {
             $row->addAttribute('style', 'background-color:#F0EAC0;');
-        }elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){
+        }elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED) {
             $row->addAttribute('style', 'background-color:#F0C0C0;');
         }
         
         $acknowledgeDays = $user->getAcknowledgeDays();
-        if($acknowledgeDays < $this->acknowledgeDays){
+        if ($acknowledgeDays < $this->acknowledgeDays) {
             $this->acknowledgeDays = $acknowledgeDays;
         }
         
@@ -183,7 +183,7 @@ 
         $action = new CompositeTag('div');
         $action->addAttribute('class', 'sb-user-buttons');
             $deactivationButton = new Button(_('Deactivate User'), 'submit', DeleteUserCommand::COMMAND, $user->getIdentifier(), 'delete');
-            if($user->isDeactivated()){
+            if ($user->isDeactivated()) {
                 $deactivationButton->addAttribute('disabled', 'disabled'); 
             }
         $action->addTag($deactivationButton);
@@ -206,8 +206,8 @@ 
      * 
      * @param SilverbulletCertificate $certificate
      */
-    public function addCertificateRow($certificate){
-        if($certificate->isGenerated()){
+    public function addCertificateRow($certificate) {
+        if ($certificate->isGenerated()) {
 
             //Create certificate box
             $certificateBox = new CompositeTag('div');
@@ -221,15 +221,15 @@ 
 
             //Create button container div
             $buttonContainer = new Tag('div');
-            if($certificate->isRevoked()){
+            if ($certificate->isRevoked()) {
                 $certificateBox->addAttribute('style', 'background-color:#F0C0C0;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("REVOKED"));
-            }elseif ($certificate->isExpired()){
+            }elseif ($certificate->isExpired()) {
                 $certificateBox->addAttribute('style', 'background-color:lightgrey;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("EXPIRED"));
-            }else{
+            } else {
                 $buttonContainer->addAttribute('style', 'text-align:right;padding-top: 5px;');
                 $buttonContainer->addText(new Button(_('Revoke'), 'submit', RevokeCertificateCommand::COMMAND, $certificate->getIdentifier(), 'delete'));
             }
@@ -243,7 +243,7 @@ 
      *
      * @param SilverbulletInvitation $invitation
      */
-    public function addInvitationRow($invitation){
+    public function addInvitationRow($invitation) {
         $expiryColumn = _("Expiry Date: ") . $invitation->getExpiry();
         $expiryColumn .= "<br>";
         $expiryColumn .= _("Activations: ") . $invitation->getRemainingActivations();
@@ -251,13 +251,13 @@ 
         $row->addAttribute('class', self::CERTIFICATEROW_CLASS);
         $index = $this->table->size();
         $this->table->addRow($row);
-        if(!$invitation->isExpired() && !$invitation->isRevoked() && !$invitation->isAbsent()){
+        if (!$invitation->isExpired() && !$invitation->isRevoked() && !$invitation->isAbsent()) {
             $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Copy to Clipboard'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-copy'));
-            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Compose mail...'), 'button', '', '', self::INVITATION_TOKEN_CLASS. '-compose'));
-            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Send in SMS...'), 'button', '', '', self::INVITATION_TOKEN_CLASS. '-sms'));
-            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Generate QR code...'), 'button', '', '', self::INVITATION_TOKEN_CLASS. '-qrcode'));
+            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Compose mail...'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-compose'));
+            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Send in SMS...'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-sms'));
+            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Generate QR code...'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-qrcode'));
         }
-        if(!$invitation->isRevoked()){
+        if (!$invitation->isRevoked()) {
             $this->table->addToCell($index, self::ACTION_COLUMN, new Button(_('Revoke'), 'submit', RevokeInvitationCommand::COMMAND, $invitation->getIdentifier(), 'delete'));
         }
     }
@@ -268,11 +268,11 @@ 
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
     public function render() {
-        if($this->acknowledgeNotice!=null){
+        if ($this->acknowledgeNotice != null) {
             $this->acknowledgeNotice->addText(sprintf($this->acknowledgeText, $this->acknowledgeDays));
         }
         ?>
-        <div class="<?php echo self::EDITABLEBLOCK_CLASS;?>">
+        <div class="<?php echo self::EDITABLEBLOCK_CLASS; ?>">
             <?php $this->decorator->render(); ?>
         </div>
         <?php

config/config-master-template.php

Spacing +20 added lines, -20 removed lines

@@ -130,7 +130,7 @@ 
 
      * @var array
      */
-    'MAILSETTINGS' => [ // we always use Submission
+    'MAILSETTINGS' => [// we always use Submission
         'host' => 'submission.capable.mta',
         'user'=> 'mailuser',
         'pass' => 'mailpass',
@@ -146,25 +146,25 @@ 
      * @var array
      */
     'LANGUAGES' => [
-      'bg' => ['display' => 'Български',   'locale' => 'bg_BG.utf8',    'latin_based' => FALSE],
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
-      'cs' => ['display' => 'Čeština',     'locale' => 'cs_CZ.utf8',    'latin_based' => TRUE],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
-      'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
-      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
-      'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
-      'fr' => ['display' => 'Français',    'locale' => 'fr_FR.utf8',    'latin_based' => TRUE],
-      'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
-      'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
-      'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
-      'lt' => ['display' => 'lietuvių',    'locale' => 'lt_LT.utf8',    'latin_based' => TRUE],
-      'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
-      'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
-      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
-      'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',   'latin_based' => TRUE],
-      'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
-      'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
-      'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
+      'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE],
+      'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE],
+      'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE],
+      'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE],
+      'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE],
+      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE],
+      'es' => ['display' => 'Español', 'locale' => 'es_ES.utf8', 'latin_based' => TRUE],
+      'fr' => ['display' => 'Français', 'locale' => 'fr_FR.utf8', 'latin_based' => TRUE],
+      'gl' => ['display' => 'Galego', 'locale' => 'gl_ES.utf8', 'latin_based' => TRUE],
+      'hr' => ['display' => 'Hrvatski', 'locale' => 'hr_HR.utf8', 'latin_based' => TRUE],
+      'it' => ['display' => 'Italiano', 'locale' => 'it_IT.utf8', 'latin_based' => TRUE],
+      'lt' => ['display' => 'lietuvių', 'locale' => 'lt_LT.utf8', 'latin_based' => TRUE],
+      'nb' => ['display' => 'Norsk', 'locale' => 'nb_NO.utf8', 'latin_based' => TRUE],
+      'pl' => ['display' => 'Polski', 'locale' => 'pl_PL.utf8', 'latin_based' => TRUE],
+      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8', 'latin_based' => TRUE],
+      'sr' => ['display' => 'Srpski', 'locale' => 'sr_RS@latin', 'latin_based' => TRUE],
+      'fi' => ['display' => 'Suomi', 'locale' => 'fi_FI.utf8', 'latin_based' => TRUE],
+      'hu' => ['display' => 'Magyar', 'locale' => 'hu_HU.utf8', 'latin_based' => TRUE],
+      'pt' => ['display' => 'Português', 'locale' => 'pt_PT.utf8', 'latin_based' => TRUE],
 
 // For the following languages, partial translations exist in Transifex, but
 // they are not complete enough for display. Their Transifex content is not

core/common/Entity.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function __construct() {
         $this->loggerInstance = new Logging();
-        $this->loggerInstance->debug(3, "--- BEGIN constructing class ". get_class($this)." .\n");
+        $this->loggerInstance->debug(3, "--- BEGIN constructing class " . get_class($this) . " .\n");
         $this->languageInstance = new Language();
     }
 
@@ -71,7 +71,7 @@ 
      * Logs the end of lifetime of the entity to the debug log on level 5.
      */
     public function __destruct() {
-        (new Logging())->debug(5,"--- KILL Destructing class ". get_class($this)." .\n");
+        (new Logging())->debug(5, "--- KILL Destructing class " . get_class($this) . " .\n");
     }
     
     /**

web/admin/edit_user_result.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 
 $i = 0;
 foreach ($salvageFedPrivs as $oneFed) {
-    $_POST['option']["S123456789".$i] = "user:fedadmin#string##";
-    $_POST['value']["S123456789".$i."-0"] = $oneFed;
+    $_POST['option']["S123456789" . $i] = "user:fedadmin#string##";
+    $_POST['value']["S123456789" . $i . "-0"] = $oneFed;
     $i++;
 }
 ?>

web/index.php

Spacing +1 added lines, -1 removed lines

@@ -26,4 +26,4 @@
 $Gui->defaultPagePrelude();
 
 // and now, serve actual data
-include("skins/".$Gui->skinObject->skin."/index.php");
+include("skins/" . $Gui->skinObject->skin . "/index.php");

core/common/Logging.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 namespace core\common;
 use \Exception;
 
-require_once(dirname(dirname(__DIR__))."/config/_config.php");
+require_once(dirname(dirname(__DIR__)) . "/config/_config.php");
 
 class Logging {
 
@@ -86,7 +86,7 @@ 
                 echo " ($category) ";
                 echo " " . $user . ": ";
                 if (is_string($message)) {
-                    echo $message ."\n";
+                    echo $message . "\n";
                 } else {
                     echo var_export($message);
                 }

web/lib/admin/PageDecoration.php

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
         }
         $retval .= "</select>";
 
@@ -77,7 +77,7 @@ 
         $retval .= "</form>
                 </div><!--langselection-->";
 
-        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/")))."/resources/images/consortium_logo.png";        
+        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/"))) . "/resources/images/consortium_logo.png";        
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -119,7 +119,7 @@ 
         switch ($area) {
             case "ADMIN-IDP":
                 $cap1 = CONFIG['APPEARANCE']['productname_long'];
-                $cap2 = sprintf(_("Administrator Interface - Identity Provider"),$this->ui->nomenclature_inst);
+                $cap2 = sprintf(_("Administrator Interface - Identity Provider"), $this->ui->nomenclature_inst);
                 $advancedControls = TRUE;
                 break;
             case "ADMIN-IDP-USERS":
@@ -139,7 +139,7 @@ 
                 break;
             case "FEDERATION":
                 $cap1 = CONFIG['APPEARANCE']['productname_long'];
-                $cap2 = sprintf(_("Administrator Interface - %s Management"),$this->ui->nomenclature_fed);
+                $cap2 = sprintf(_("Administrator Interface - %s Management"), $this->ui->nomenclature_fed);
                 $advancedControls = TRUE;
                 break;
             case "USER":
@@ -168,7 +168,7 @@ 
         // content from here on will SCROLL instead of being fixed at the top
         $retval .= "<div class='pagecontent'>"; // closes in footer again
         $retval .= "<div class='trick'>"; // closes in footer again
-        $retval .= "<div id='secondrow' style='border-bottom:5px solid ".CONFIG['APPEARANCE']['colour1']."; min-height:100px;'>
+        $retval .= "<div id='secondrow' style='border-bottom:5px solid " . CONFIG['APPEARANCE']['colour1'] . "; min-height:100px;'>
             <div id='secondarycaptions' style='display:inline-block; float:left'>
                 <h2>$cap2</h2>
             </div><!--secondarycaptions-->";
@@ -213,7 +213,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
 
-        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition )."/resources/css/cat.css.php";
+        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/css/cat.css.php";
         
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
         $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
@@ -241,7 +241,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
         
-        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition)."/resources/images";
+        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/images";
 
         return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>