GEANT / CAT

web/skins/eduroam2016/resources/css/cat.css.php

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:"Open Sans", Helvetica, sans-serif;
     font-size:12px;
@@ -33,7 +33,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -187,9 +187,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 div.pagecontent {
@@ -382,7 +382,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -495,7 +495,7 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-left:30px;
 }
 
@@ -549,7 +549,7 @@ 
 }
 
 span.redirect_link {
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
@@ -620,7 +620,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 00px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -670,7 +670,7 @@ 
 //    border-bottom-width:5px;
     border-color: #e7e7e7;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #headingx h1 { 
@@ -689,7 +689,7 @@ 
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 14px;
     font-weight: normal;
 }
@@ -698,7 +698,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -738,7 +738,7 @@ 
 
 #menu_column {
     border-right:solid;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     border-width:5px;
     min-height:400px;
     padding-left: 10px;
@@ -756,11 +756,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -768,7 +768,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

devices/ms/WindowsCommon.php

Spacing +5 added lines, -5 removed lines

@@ -232,7 +232,7 @@ 
             $fcontents .= "\n" . '!define USER_GROUP "' . $this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0]), $this->codePage) . '"
 ';
         }
-        $fcontents .=  '
+        $fcontents .= '
 Caption "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
 !define APPLICATION "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
 !define VERSION "' . \core\CAT::VERSION_MAJOR . '.' . \core\CAT::VERSION_MINOR . '"
@@ -241,8 +241,8 @@ 
 !define LOCALE "' . preg_replace('/\..*$/', '', CONFIG['LANGUAGES'][$this->languageInstance->getLang()]['locale']) . '"
 ;--------------------------------
 !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '"
-!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
-!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
+!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
+!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
     ';
 
 
@@ -256,11 +256,11 @@ 
             $fcontents .= '!define REALM "' . $attr['internal:realm'][0] . '"
 ';
         }
-        if(!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) {
             $fcontents .= '!define HINT_USER_INPUT "' . $attr['internal:hint_userinput_suffix'][0] . '"
 ';
         }
-        if(!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) {
             $fcontents .= '!define VERIFY_USER_REALM_INPUT "' . $attr['internal:verify_userinput_suffix'][0] . '"
 ';
         }

devices/linux/Device_Linux.php

Indentation +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
         
         $out .= 'Config.sb_user_file = """' . $this->mkSbUserFile() . '"""' . "\n";
         if (!empty($this->attributes['internal:realm'][0])) {
-           $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
+            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $out .= "Config.hint_user_input = True\n";

Spacing +10 added lines, -10 removed lines

@@ -33,9 +33,9 @@ 
     public function writeInstaller() {
         $installerPath = $this->installerBasename . ".py";
         $this->copyFile("main.py", $installerPath);
-        $installer = fopen($installerPath,"a");
-        fwrite($installer,$this->writeMessages());
-        fwrite($installer,$this->writeConfigVars());
+        $installer = fopen($installerPath, "a");
+        fwrite($installer, $this->writeMessages());
+        fwrite($installer, $this->writeConfigVars());
         fwrite($installer, "run_installer()\n");
         return($installerPath);
     }
@@ -100,7 +100,7 @@ 
         $out .= 'Messages.p12_title = "' . _("personal certificate file (p12 or pfx)") . "\"\n";
         $out .= 'Messages.save_wpa_conf = "' . _("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.") . "\"\n";
         $out .= 'Messages.save_wpa_confirm = "' . _("Write the file") . "\"\n";
-        $out .= 'Messages.wrongUsernameFormat = "' ._("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
+        $out .= 'Messages.wrongUsernameFormat = "' . _("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
         $out .= 'Messages.wrong_realm = "' . _("Error: your username must be in the form of 'xxx@{}'. Please enter the username in the correct format.") . "\"\n";
         $out .= 'Messages.wrong_realm_suffix = "' . _("Error: your username must be in the form of 'xxx@institutionID' and end with '{}'. Please enter the username in the correct format.") . "\"\n";
     
@@ -129,8 +129,8 @@ 
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();
-        $out .= 'Config.tou = ' . ( $tou ? '"""' . $tou . '"""' : 'None' ) . "\n"; 
-        $out .= 'Config.CA = """' . $this->mkCAfile()  . '"""' . "\n";
+        $out .= 'Config.tou = ' . ($tou ? '"""' . $tou . '"""' : 'None') . "\n"; 
+        $out .= 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n";
         $out .= "Config.anonymous_identity = '" . $this->determineOuterIdString() . "'\n";
         $out .= 'Config.init_info = """' . $this->mkIntro() . '"""' . "\n";
         $out .= 'Config.init_confirmation = "' . $this->mkProfileConfirmation() . "\"\n";
@@ -139,10 +139,10 @@ 
         if (!empty($this->attributes['internal:realm'][0])) {
            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $out .= "Config.hint_user_input = True\n";
         }
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $out .= "Config.verify_user_realm_input = True\n";
         }        
         return $out;
@@ -182,7 +182,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[" . $out . "]";
     }
 
     
@@ -206,7 +206,7 @@ 
         return '[' . implode(', ', $outArray) . ']';
     }
     
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         $out .= "Config.eap_inner = '" . $eapMethod['INNER'] . "'\n";
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') {
             $out .= "Config.use_other_tls_id = True\n";
-        }
-        else {
+        } else {
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();

web/lib/admin/domain/SilverbulletUser.php

Spacing +30 added lines, -30 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,7 +105,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::validate()
      */
-    public function validate(){
+    public function validate() {
         return (
                 !empty($this->get(self::PROFILEID))
         );
@@ -116,11 +116,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();
         }
     }
@@ -128,8 +128,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")));
     }
     
     /**
@@ -137,14 +137,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;
         }
     }
@@ -154,7 +154,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');
@@ -162,11 +162,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);
     }
     
@@ -174,7 +174,7 @@ 
      * 
      * @return boolean
      */
-    public function isExpired(){
+    public function isExpired() {
         $expiryTime = strtotime($this->get(self::EXPIRY));
         $currentTime = time();
         return $currentTime > $expiryTime;
@@ -184,7 +184,7 @@ 
      *
      * @return string
      */
-    public function getExpiry(){
+    public function getExpiry() {
         return date('Y-m-d', strtotime($this->get(self::EXPIRY)));
     }
     
@@ -192,7 +192,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
 
@@ -200,7 +200,7 @@ 
      *
      * @return \web\lib\admin\domain\SilverbulletInvitation
      */
-    public function getInvitations(){
+    public function getInvitations() {
         return $this->invitations;
     }
     
@@ -208,7 +208,7 @@ 
      * 
      * @return boolean
      */
-    public function hasCertificates(){
+    public function hasCertificates() {
         return count($this->certificates) > 0;
     }
     
@@ -216,10 +216,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++;
             }
         }
@@ -231,14 +231,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, '2000-01-01 00:00:00');
         }
     }
@@ -247,7 +247,7 @@ 
      * 
      * @return boolean
      */
-    public function isDeactivated(){
+    public function isDeactivated() {
         return $this->get(self::DEACTIVATION_STATUS) == self::INACTIVE;
     }
     
@@ -256,7 +256,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);
@@ -268,7 +268,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();
@@ -284,7 +284,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;

Braces +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
         if($tokenExpiry > $this->defaultUserExpiry){
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else{
             $this->clear();
         }
     }
@@ -142,9 +142,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;
         }
     }
@@ -238,7 +238,7 @@ 
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else{
             $this->set(self::DEACTIVATION_TIME, '2000-01-01 00:00:00');
         }
     }