GEANT / CAT

Passed

Push — master ( a87660...008126 )

by Tomasz

created 2017-09-15 10:34 UTC

Status

Category

Toggle Patches

web/index.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -26,4 +26,4 @@
		block discarded – undo
26	26	$Gui->defaultPagePrelude();
27	27
28	28	// and now, serve actual data
29		-include("skins/".$Gui->skinObject->skin."/index.php");
	29	+include("skins/" . $Gui->skinObject->skin . "/index.php");

Please login to merge, or discard this patch.

web/diag/action_realmcheck.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
           <head lang='" . $ourlocale . "'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
     // diag area needs its own CSS at some point, but use the user area one for now
-    $cssUrl = $gui->skinObject->findResourceUrl("CSS","cat.css.php");
+    $cssUrl = $gui->skinObject->findResourceUrl("CSS", "cat.css.php");
     echo "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
     echo "<title>" . htmlspecialchars(_("Sanity check for dynamic discovery of realms")) . "</title>";
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
         // checking our own stuff. Enable thorough checks
         $check_thorough = TRUE;
         $check_realm = $checkrealm[0]['value'];
-        $testsuite = new \core\diag\RADIUSTests($check_realm, $my_profile->getRealmCheckOuterUsername(), \core\common\EAP::multiConversion($my_profile->getEapMethodsinOrderOfPreference(1)), $my_profile->getCollapsedAttributes()['eap:server_name'] , $my_profile->getCollapsedAttributes()["eap:ca_file"]);
+        $testsuite = new \core\diag\RADIUSTests($check_realm, $my_profile->getRealmCheckOuterUsername(), \core\common\EAP::multiConversion($my_profile->getEapMethodsinOrderOfPreference(1)), $my_profile->getCollapsedAttributes()['eap:server_name'], $my_profile->getCollapsedAttributes()["eap:ca_file"]);
         $rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
     } else {
         $error_message = _("You asked for a realm check, but we don't know the realm for this profile!") . "</p>";
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
         }
     }
     if ($check_realm) {
-        $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm);
+        $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm);
         $rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
     } else {
         $error_message = _("No valid realm name given, cannot execute any checks!");
@@ -751,13 +751,13 @@  discard block
 block discarded – undo
         }
         
         if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT'] == "LOCAL") {
-            $returnUrl = "../admin/overview_idp.php?inst_id=".$my_inst->identifier;
+            $returnUrl = "../admin/overview_idp.php?inst_id=" . $my_inst->identifier;
         } else {
-            $returnUrl = CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT']."/admin/overview_idp.php?inst_id=".$my_inst->identifier;
+            $returnUrl = CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT'] . "/admin/overview_idp.php?inst_id=" . $my_inst->identifier;
         }
         ?>
-        <form method='post' action='<?php echo $returnUrl;?>' accept-charset='UTF-8'>
-            <button type='submit' name='submitbutton' value='<?php echo web\lib\admin\FormElements::BUTTON_CLOSE; ?>'><?php echo sprintf(_("Return to %s administrator area"),$gui->nomenclature_inst); ?></button>
+        <form method='post' action='<?php echo $returnUrl; ?>' accept-charset='UTF-8'>
+            <button type='submit' name='submitbutton' value='<?php echo web\lib\admin\FormElements::BUTTON_CLOSE; ?>'><?php echo sprintf(_("Return to %s administrator area"), $gui->nomenclature_inst); ?></button>
         </form>
         <script>
 

Please login to merge, or discard this patch.

core/common/Logging.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
                 echo " ($category) ";
                 echo " " . $user . ": ";
                 if (is_string($message)) {
-                    echo $message ."\n";
+                    echo $message . "\n";
                 } else {
                     echo var_export($message);
                 }

Please login to merge, or discard this patch.

web/skins/eduroam2016/accountstatus.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
           <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
           <head lang='" . $ourlocale . "'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-    $cssUrl = $guiObject->skinObject->findResourceUrl("CSS","cat.css.php");
+    $cssUrl = $guiObject->skinObject->findResourceUrl("CSS", "cat.css.php");
 
     echo "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
     echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 
 $Gui->loggerInstance->debug(4, "\n---------------------- index.php START --------------------------\n");
 
-defaultPagePrelude($Gui,CONFIG['APPEARANCE']['productname_long'], FALSE);
+defaultPagePrelude($Gui, CONFIG['APPEARANCE']['productname_long'], FALSE);
 
 ?>
 <script type="text/javascript">ie_version = 0;</script>
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
 <script type="text/javascript">ie_version=10;</script>
 <![endif]-->
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js");?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js");?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js");?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js"); ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js"); ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js"); ?>"></script>
 <!-- JQuery -->
 <script type="text/javascript">
     var recognisedOS = '';
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 ?>
 var lang = "<?php echo($Gui->langObject->getLang()) ?>";
 </script>
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 
 </head>
 <body>
@@ -71,10 +71,10 @@  discard block
 block discarded – undo
     ?>
     <div id="info_overlay"> <!-- device info -->
         <div id="info_window"></div>
-        <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+        <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
     </div>
     <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
     </div>
        <div id="main_body">
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
     <span id="inst_name_span"><?php echo $statusInfo['idp']->name; ?></span>
 </div>
 <div> <!-- IdP logo, if present -->
-    <img id="idp_logo" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","empty.png")?>" alt="IdP Logo"/>
+    <img id="idp_logo" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "empty.png")?>" alt="IdP Logo"/>
 </div>
 <div id="user_info"></div> <!-- this will be filled with the profile contact information -->
 <div id="devices" class="device_list">

Please login to merge, or discard this patch.

web/skins/eduroam2016/Menu.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -20,9 +20,9 @@  discard block
 block discarded – undo
     }
     public function printMenu($menu = NULL,$id=NULL) {
         $menu = $menu ?? $this->menu;
-     if(count($menu) == 0) {
-          return;
-     }
+        if(count($menu) == 0) {
+            return;
+        }
         $out = "\n<ul>\n";
         foreach ($menu as $menuItem) {
             $itemVisibility = $menuItem['visibility'] ?? 'all';
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
                 $out .= $this->printMenu($submenu,$iD);
                 $out .= "</li>\n";
-             }
+                }
         }
        
         $out .= '</ul>';

Please login to merge, or discard this patch.

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -14,13 +14,13 @@  discard block
 block discarded – undo
      * as the title argument or an two element array - the first element of this array will be
      * the title and the second is a style specification applied to the given menu item
      */
-    public function __construct($menuArray,$visibility = 'all') {
+    public function __construct($menuArray, $visibility = 'all') {
         $this->menu = $menuArray;
         $this->visibility = $visibility;
     }
-    public function printMenu($menu = NULL,$id=NULL) {
+    public function printMenu($menu = NULL, $id = NULL) {
         $menu = $menu ?? $this->menu;
-     if(count($menu) == 0) {
+     if (count($menu) == 0) {
           return;
      }
         $out = "\n<ul>\n";
@@ -30,13 +30,13 @@  discard block
 block discarded – undo
                 $iD = $menuItem['id'] ?? $id;
                 $catInfo = NULL;
                 if (!empty($menuItem['catInfo'])) {
-                    $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")';
+                    $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")';
                 }
                 $link = $catInfo ?? $menuItem['link'] ?? '';
-                $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"';
-                $submenu  = $menuItem['submenu'] ?? [];
+                $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"';
+                $submenu = $menuItem['submenu'] ?? [];
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
-                $out .= $this->printMenu($submenu,$iD);
+                $out .= $this->printMenu($submenu, $iD);
                 $out .= "</li>\n";
              }
         }
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
         return($out);
     }
 
-    private function printMenuItem($itemText,$itemLink = '',$itemClass = '') {
-        return "<li><a href='" . $itemLink . "'".$itemClass.'>' . $itemText . "</a>";
+    private function printMenuItem($itemText, $itemLink = '', $itemClass = '') {
+        return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>";
     }
 
     private $menu;

Please login to merge, or discard this patch.

web/skins/eduroam2016/index.php 2 patches

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -18,9 +18,9 @@  discard block
 block discarded – undo
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 include("user/js/cat_js.php");
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->langObject->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
 <script type="text/javascript">
     var lang = "<?php echo($Gui->langObject->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -63,14 +63,14 @@  discard block
 block discarded – undo
     <?php include "div_heading.php"; ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">

Please login to merge, or discard this patch.

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -79,16 +79,16 @@  discard block
 block discarded – undo
          <?php if (empty($_REQUEST['idp'])) { ?>
               <div id="front_page">
                   <?php
-                         echo $divs->div_top_welcome();
-                         echo $divs->div_roller();
-                         echo $divs->div_main_button(); ?>
+                            echo $divs->div_top_welcome();
+                            echo $divs->div_roller();
+                            echo $divs->div_main_button(); ?>
               </div> <!-- id="front_page" -->
          <?php } ?>
             <!-- the user_page div contains all information for a given IdP, i.e. the profile selection (if multiple profiles are defined)
                  and the device selection (including the automatic OS detection ) -->
             <div id="user_page">
             <?php  echo $divs->div_institution();
-                   echo $divs->div_profiles(); ?>
+                    echo $divs->div_profiles(); ?>
                 <div id="user_info"></div> <!-- this will be filled with the profile contact information -->
                 <?php echo $divs->div_user_welcome() ?>
                 <div id="profile_redirect"> <!-- this is shown when the entire profile is redirected -->
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
                         if ($operatingSystem) {
                             echo $divs->div_guess_os($operatingSystem);
                         }
-                         echo $divs->div_otherinstallers();
+                            echo $divs->div_otherinstallers();
                     ?>
                 </div> <!-- id="devices" -->
                 <input type="hidden" name="profile" id="profile_id"/>

Please login to merge, or discard this patch.

web/skins/eduroam2016/div_heading.php 2 patches

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -3,11 +3,11 @@  discard block
 block discarded – undo
 $langsArray = [];
 $selectedLang = $Gui->langObject->getLang();
 foreach (CONFIG['LANGUAGES'] as $lang => $value) {
-     if ($lang == $selectedLang) {
-         $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
-     } else {
-         $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
-     }
+        if ($lang == $selectedLang) {
+            $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
+        } else {
+            $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
+        }
 }
 
 
@@ -15,19 +15,19 @@  discard block
 block discarded – undo
 
 $menu = new Menu([
     ['id'=>'start',
-     'text'=>_("Start page"),
-     'visibility' => 'index'],
+        'text'=>_("Start page"),
+        'visibility' => 'index'],
     ['id'=>'about',
-     'text'=>_("About"),'link'=>'','submenu'=>[
+        'text'=>_("About"),'link'=>'','submenu'=>[
             ['text'=>sprintf(_("About %s"), CONFIG['APPEARANCE']['productname']),
-             'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
+                'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
             ['text'=>sprintf(_("About %s"), CONFIG['CONSORTIUM']['name']),
-             'link'=>CONFIG['CONSORTIUM']['homepage']],
+                'link'=>CONFIG['CONSORTIUM']['homepage']],
         ]],
     ['id'=>'lang',
-     'text'=>_("Language"), 'submenu'=>$langsArray,],
+        'text'=>_("Language"), 'submenu'=>$langsArray,],
     ['id'=>'help',
-     'text'=>_("Help"), 'submenu'=>[
+        'text'=>_("Help"), 'submenu'=>[
             ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed',_("FAQ")], 'visibility'=>'index'],
             ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed',_("FAQ")], 'visibility'=>'index'],
             ['text'=>_("SB help item"),'visibility'=>'xxx'],
@@ -36,16 +36,16 @@  discard block
 block discarded – undo
             ['text'=>_("Contact"), 'catInfo'=>['contact',_("FAQ")]],
         ]],
     ['id'=>'manage',
-     'text'=>_("Manage"),'submenu'=>[
+        'text'=>_("Manage"),'submenu'=>[
             ['text'=>sprintf(_("%s admin access"),CONFIG['CONSORTIUM']['name']),
-             'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
+                'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
             ['text'=>_("Become a CAT developer"),
-             'catInfo'=>['develop',_("Become a CAT developer")]],
+                'catInfo'=>['develop',_("Become a CAT developer")]],
             ['text'=>_("Documentation")],
         ],
-     'visibility' => 'index'],
+        'visibility' => 'index'],
     ['id'=>'tou',
-     'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
+        'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
     ],
     $visibility
 );

Please login to merge, or discard this patch.

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -4,9 +4,9 @@  discard block
 block discarded – undo
 $selectedLang = $Gui->langObject->getLang();
 foreach (CONFIG['LANGUAGES'] as $lang => $value) {
      if ($lang == $selectedLang) {
-         $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
+         $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang'];
      } else {
-         $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
+         $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")'];
      }
 }
 
@@ -18,34 +18,34 @@  discard block
 block discarded – undo
      'text'=>_("Start page"),
      'visibility' => 'index'],
     ['id'=>'about',
-     'text'=>_("About"),'link'=>'','submenu'=>[
+     'text'=>_("About"), 'link'=>'', 'submenu'=>[
             ['text'=>sprintf(_("About %s"), CONFIG['APPEARANCE']['productname']),
-             'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
+             'catInfo'=>['about_cat', sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
             ['text'=>sprintf(_("About %s"), CONFIG['CONSORTIUM']['name']),
              'link'=>CONFIG['CONSORTIUM']['homepage']],
         ]],
     ['id'=>'lang',
-     'text'=>_("Language"), 'submenu'=>$langsArray,],
+     'text'=>_("Language"), 'submenu'=>$langsArray, ],
     ['id'=>'help',
      'text'=>_("Help"), 'submenu'=>[
-            ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed',_("FAQ")], 'visibility'=>'index'],
-            ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed',_("FAQ")], 'visibility'=>'index'],
-            ['text'=>_("SB help item"),'visibility'=>'xxx'],
-            ['text'=>_("What is eduroam"), 'catInfo'=>['what_is_eduroam',_("FAQ")]],
-            ['text'=>_("FAQ"), 'catInfo'=>['faq',_("FAQ")]],
-            ['text'=>_("Contact"), 'catInfo'=>['contact',_("FAQ")]],
+            ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed', _("FAQ")], 'visibility'=>'index'],
+            ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed', _("FAQ")], 'visibility'=>'index'],
+            ['text'=>_("SB help item"), 'visibility'=>'xxx'],
+            ['text'=>_("What is eduroam"), 'catInfo'=>['what_is_eduroam', _("FAQ")]],
+            ['text'=>_("FAQ"), 'catInfo'=>['faq', _("FAQ")]],
+            ['text'=>_("Contact"), 'catInfo'=>['contact', _("FAQ")]],
         ]],
     ['id'=>'manage',
-     'text'=>_("Manage"),'submenu'=>[
-            ['text'=>sprintf(_("%s admin access"),CONFIG['CONSORTIUM']['name']),
-             'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
+     'text'=>_("Manage"), 'submenu'=>[
+            ['text'=>sprintf(_("%s admin access"), CONFIG['CONSORTIUM']['name']),
+             'catInfo'=>['admin', sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
             ['text'=>_("Become a CAT developer"),
-             'catInfo'=>['develop',_("Become a CAT developer")]],
+             'catInfo'=>['develop', _("Become a CAT developer")]],
             ['text'=>_("Documentation")],
         ],
      'visibility' => 'index'],
     ['id'=>'tou',
-     'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
+     'text'=>_("Terms of use"), 'catInfo'=>['tou', 'TOU']],
     ],
     $visibility
 );
@@ -54,11 +54,11 @@  discard block
 block discarded – undo
 <div id="heading">
 <?php
 print '<div id="cat_logo">';
-print '<img id="logo_img" src="'. $Gui->skinObject->findResourceUrl("IMAGES","consortium_logo.png").'" alt="Consortium Logo"/>';
+print '<img id="logo_img" src="' . $Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo"/>';
 print '<span>Configuration Assistant Tool</span>';
 print '</div>';
-print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>
-<img id="hamburger" src="'. $Gui->skinObject->findResourceUrl("IMAGES","icons/menu.png").'" alt="Menu"/>';
+print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>
+<img id="hamburger" src="'. $Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png") . '" alt="Menu"/>';
 print '<div id="menu_top">';
 print $menu->printMenu();
 

Please login to merge, or discard this patch.

devices/xml/Device_XML.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  * @package ModuleWriting
  */
 namespace devices\xml;
-require_once(dirname(__FILE__).'/XML.inc.php');
+require_once(dirname(__FILE__) . '/XML.inc.php');
 
 /**
  * This class implements full functionality of the generic XML device
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
         $objs = [];
         if ($this->langScope === 'global') {
             foreach ($attributeList['langs'] as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $obj = new $className();
                 $obj->setValue($value);
                 $obj->setAttributes(['lang' => $language]);
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
                 $profileNameLangs = $attr['profile:name']['langs'];
             }
             foreach ($instNameLangs as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $displayname = new DisplayName();
                 if (isset($profileNameLangs)) {
                     $langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
             $clientCertificateObject->setValue(base64_encode($this->clientCert["certdata"]));
             $clientCertificateObject->setAttributes(['format' => 'PKCS12', 'encoding' => 'base64']);
             
-            $clientsidecredential->setProperty('ClientCertificate',$clientCertificateObject);
+            $clientsidecredential->setProperty('ClientCertificate', $clientCertificateObject);
         }
         
         $authmethod->setProperty('ClientSideCredential', $clientsidecredential);

Please login to merge, or discard this patch.

web/lib/admin/http/GetTokenEmailDetails.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
  * @author Zilvinas Vaira
  *
  */
-class GetTokenEmailDetails extends AbstractAjaxCommand{
+class GetTokenEmailDetails extends AbstractAjaxCommand {
     
     const COMMAND = "gettokenemaildetails";
     const PARAM_TOKENLINK = "tokenlink";
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
      * @param string $commandToken
      * @param DefaultContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->subject = sprintf(_("Your %s access is ready"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->body = sprintf(_("Hello!\n\nA new %s access credential has been created for you by your network administrator.\n\nPlease follow the following link with the device you want to enable for eduroam to get a custom %s installation program just for you:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
      * 
      * @return string
      */
-    public function getSubject(){
+    public function getSubject() {
         return $this->subject;
     }
     
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
      * @param string $invitationToken
      * @return string
      */
-    public function getBody($invitationToken){
+    public function getBody($invitationToken) {
         return sprintf($this->body, $invitationToken);
     }
     
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
     public function execute() {
-        if(isset($_POST[self::PARAM_TOKENLINK])){
+        if (isset($_POST[self::PARAM_TOKENLINK])) {
             
             $invitationToken = $this->parseString($_POST[self::PARAM_TOKENLINK]);
 

Please login to merge, or discard this patch.