Inspection of "some cleanup" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( e1e902...4d7dc2 )

by Tomasz

created 2017-09-08 06:02 UTC

Status

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

@@ -29,7 +29,7 @@
 block discarded – undo
 echo $deco->pageheader(sprintf(_("%s: %s Customisation (submission completed)"), CONFIG['APPEARANCE']['productname'], $uiElements->nomenclature_fed), "FEDERATION");
 $my_fed = $validator->Federation($_GET['fed_id'], $_SESSION['user']);
 if (isset($_POST['submitbutton'])) {
-    if (( $_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
+    if (($_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
         $fed_name = $my_fed->name;
         echo "<h1>" . sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclature_fed, $fed_name) . "</h1>";
         echo "<table>";

Please login to merge, or discard this patch.

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.

		@@ -29,7 +29,7 @@
		block discarded – undo
29	29	echo $deco->pageheader(sprintf(_("%s: %s Customisation (submission completed)"), CONFIG['APPEARANCE']['productname'], $uiElements->nomenclature_fed), "FEDERATION");
30	30	$my_fed = $validator->Federation($_GET['fed_id'], $_SESSION['user']);
31	31	if (isset($_POST['submitbutton'])) {
32		- if (( $_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
	32	+ if (($_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
33	33	$fed_name = $my_fed->name;
34	34	echo "<h1>" . sprintf(_("Submitted attributes for %s '%s'"), $uiElements->nomenclature_fed, $fed_name) . "</h1>";
35	35	echo "<table>";

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	<head lang='" . $ourlocale . "'>
25	25	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
26	26	// diag area needs its own CSS at some point, but use the user area one for now
27		- $cssUrl = $gui->skinObject->findResourceUrl("CSS","cat.css.php");
	27	+ $cssUrl = $gui->skinObject->findResourceUrl("CSS", "cat.css.php");
28	28	echo "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
29	29	echo "<title>" . htmlspecialchars(_("Sanity check for dynamic discovery of realms")) . "</title>";
30	30
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	// checking our own stuff. Enable thorough checks
48	48	$check_thorough = TRUE;
49	49	$check_realm = $checkrealm[0]['value'];
50		- $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"]);
	50	+ $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"]);
51	51	$rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
52	52	} else {
53	53	$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
65	65	}
66	66	}
67	67	if ($check_realm) {
68		- $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm);
	68	+ $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm);
69	69	$rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
70	70	} else {
71	71	$error_message = _("No valid realm name given, cannot execute any checks!");
		@@ -751,13 +751,13 @@ discard block
		block discarded – undo
751	751	}
752	752
753	753	if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT'] == "LOCAL") {
754		- $returnUrl = "../admin/overview_idp.php?inst_id=".$my_inst->identifier;
	754	+ $returnUrl = "../admin/overview_idp.php?inst_id=" . $my_inst->identifier;
755	755	} else {
756		- $returnUrl = CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT']."/admin/overview_idp.php?inst_id=".$my_inst->identifier;
	756	+ $returnUrl = CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT'] . "/admin/overview_idp.php?inst_id=" . $my_inst->identifier;
757	757	}
758	758	?>
759		- <form method='post' action='<?php echo $returnUrl;?>' accept-charset='UTF-8'>
760		- <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>
	759	+ <form method='post' action='<?php echo $returnUrl; ?>' accept-charset='UTF-8'>
	760	+ <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>
761	761	</form>
762	762	<script>
763	763

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	namespace core\common;
12	12	use \Exception;
13	13
14		-require_once(dirname(dirname(__DIR__))."/config/_config.php");
	14	+require_once(dirname(dirname(__DIR__)) . "/config/_config.php");
15	15
16	16	class Logging {
17	17
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	echo " ($category) ";
87	87	echo " " . $user . ": ";
88	88	if (is_string($message)) {
89		- echo $message ."\n";
	89	+ echo $message . "\n";
90	90	} else {
91	91	echo var_export($message);
92	92	}

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12	<html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
13	13	<head lang='" . $ourlocale . "'>
14	14	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
15		- $cssUrl = $guiObject->skinObject->findResourceUrl("CSS","cat.css.php");
	15	+ $cssUrl = $guiObject->skinObject->findResourceUrl("CSS", "cat.css.php");
16	16
17	17	echo "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
18	18	echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23
24	24	$Gui->loggerInstance->debug(4, "\n---------------------- index.php START --------------------------\n");
25	25
26		-defaultPagePrelude($Gui,CONFIG['APPEARANCE']['productname_long'], FALSE);
	26	+defaultPagePrelude($Gui, CONFIG['APPEARANCE']['productname_long'], FALSE);
27	27
28	28	?>
29	29	<script type="text/javascript">ie_version = 0;</script>
		@@ -43,9 +43,9 @@ discard block
		block discarded – undo
43	43	<script type="text/javascript">ie_version=10;</script>
44	44	<![endif]-->
45	45	<!-- JQuery -->
46		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js");?>"></script>
47		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js");?>"></script>
48		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js");?>"></script>
	46	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js"); ?>"></script>
	47	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js"); ?>"></script>
	48	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js"); ?>"></script>
49	49	<!-- JQuery -->
50	50	<script type="text/javascript">
51	51	var recognisedOS = '';
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	?>
60	60	var lang = "<?php echo($Gui->langObject->getLang()) ?>";
61	61	</script>
62		-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
	62	+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
63	63
64	64	</head>
65	65	<body>
		@@ -71,10 +71,10 @@ discard block
		block discarded – undo
71	71	?>
72	72	<div id="info_overlay"> <!-- device info -->
73	73	<div id="info_window"></div>
74		- <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	74	+ <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
75	75	</div>
76	76	<div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
77		- <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	77	+ <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
78	78	<div id="main_menu_content"></div>
79	79	</div>
80	80	<div id="main_body">
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	<span id="inst_name_span"><?php echo $statusInfo['idp']->name; ?></span>
86	86	</div>
87	87	<div> <!-- IdP logo, if present -->
88		- <img id="idp_logo" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","empty.png")?>" alt="IdP Logo"/>
	88	+ <img id="idp_logo" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "empty.png")?>" alt="IdP Logo"/>
89	89	</div>
90	90	<div id="user_info"></div> <!-- this will be filled with the profile contact information -->
91	91	<div id="devices" class="device_list">

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

		@@ -14,13 +14,13 @@ discard block
		block discarded – undo
14	14	* as the title argument or an two element array - the first element of this array will be
15	15	* the title and the second is a style specification applied to the given menu item
16	16	*/
17		- public function __construct($menuArray,$visibility = 'all') {
	17	+ public function __construct($menuArray, $visibility = 'all') {
18	18	$this->menu = $menuArray;
19	19	$this->visibility = $visibility;
20	20	}
21		- public function printMenu($menu = NULL,$id=NULL) {
	21	+ public function printMenu($menu = NULL, $id = NULL) {
22	22	$menu = $menu ?? $this->menu;
23		- if(count($menu) == 0) {
	23	+ if (count($menu) == 0) {
24	24	return;
25	25	}
26	26	$out = "\n<ul>\n";
		@@ -30,13 +30,13 @@ discard block
		block discarded – undo
30	30	$iD = $menuItem['id'] ?? $id;
31	31	$catInfo = NULL;
32	32	if (!empty($menuItem['catInfo'])) {
33		- $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")';
	33	+ $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")';
34	34	}
35	35	$link = $catInfo ?? $menuItem['link'] ?? '';
36		- $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"';
37		- $submenu = $menuItem['submenu'] ?? [];
	36	+ $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"';
	37	+ $submenu = $menuItem['submenu'] ?? [];
38	38	$out .= $this->printMenuItem($menuItem['text'], $link, $class);
39		- $out .= $this->printMenu($submenu,$iD);
	39	+ $out .= $this->printMenu($submenu, $iD);
40	40	$out .= "</li>\n";
41	41	}
42	42	}
		@@ -45,8 +45,8 @@ discard block
		block discarded – undo
45	45	return($out);
46	46	}
47	47
48		- private function printMenuItem($itemText,$itemLink = '',$itemClass = '') {
49		- return "<li><a href='" . $itemLink . "'".$itemClass.'>' . $itemText . "</a>";
	48	+ private function printMenuItem($itemText, $itemLink = '', $itemClass = '') {
	49	+ return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>";
50	50	}
51	51
52	52	private $menu;

		@@ -18,9 +18,9 @@ discard block
		block discarded – undo
18	18	?>
19	19
20	20	<!-- JQuery -->
21		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
22		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
23		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
	21	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
	22	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
	23	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
24	24	<!-- JQuery -->
25	25
26	26	<script type="text/javascript">
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	include("user/js/cat_js.php");
46	46	?>
47	47	var loading_ico = new Image();
48		- loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
	48	+ loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
49	49	</script>
50	50	<?php $Gui->langObject->setTextDomain("web_user"); ?>
51	51	<!-- DiscoJuice -->
		@@ -53,9 +53,9 @@ discard block
		block discarded – undo
53	53	<script type="text/javascript">
54	54	var lang = "<?php echo($Gui->langObject->getLang()) ?>";
55	55	</script>
56		-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
	56	+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
57	57	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
58		-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
	58	+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
59	59	</head>
60	60	<body>
61	61	<div id="wrap">
		@@ -63,14 +63,14 @@ discard block
		block discarded – undo
63	63	<?php include "div_heading.php"; ?>
64	64	<div id="main_page">
65	65	<div id="loading_ico">
66		- <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
	66	+ <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
67	67	</div>
68	68	<div id="info_overlay"> <!-- device info -->
69	69	<div id="info_window"></div>
70		- <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	70	+ <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
71	71	</div>
72	72	<div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
73		- <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	73	+ <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
74	74	<div id="main_menu_content"></div>
75	75	</div>
76	76	<div id="main_body">

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

		@@ -3,11 +3,11 @@ discard block
		block discarded – undo
3	3	$langsArray = [];
4	4	$selectedLang = $Gui->langObject->getLang();
5	5	foreach (CONFIG['LANGUAGES'] as $lang => $value) {
6		- if ($lang == $selectedLang) {
7		- $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
8		- } else {
9		- $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
10		- }
	6	+ if ($lang == $selectedLang) {
	7	+ $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
	8	+ } else {
	9	+ $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
	10	+ }
11	11	}
12	12
13	13
		@@ -15,19 +15,19 @@ discard block
		block discarded – undo
15	15
16	16	$menu = new Menu([
17	17	['id'=>'start',
18		- 'text'=>_("Start page"),
19		- 'visibility' => 'index'],
	18	+ 'text'=>_("Start page"),
	19	+ 'visibility' => 'index'],
20	20	['id'=>'about',
21		- 'text'=>_("About"),'link'=>'','submenu'=>[
	21	+ 'text'=>_("About"),'link'=>'','submenu'=>[
22	22	['text'=>sprintf(_("About %s"), CONFIG['APPEARANCE']['productname']),
23		- 'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
	23	+ 'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
24	24	['text'=>sprintf(_("About %s"), CONFIG['CONSORTIUM']['name']),
25		- 'link'=>CONFIG['CONSORTIUM']['homepage']],
	25	+ 'link'=>CONFIG['CONSORTIUM']['homepage']],
26	26	]],
27	27	['id'=>'lang',
28		- 'text'=>_("Language"), 'submenu'=>$langsArray,],
	28	+ 'text'=>_("Language"), 'submenu'=>$langsArray,],
29	29	['id'=>'help',
30		- 'text'=>_("Help"), 'submenu'=>[
	30	+ 'text'=>_("Help"), 'submenu'=>[
31	31	['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed',_("FAQ")], 'visibility'=>'index'],
32	32	['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed',_("FAQ")], 'visibility'=>'index'],
33	33	['text'=>_("SB help item"),'visibility'=>'xxx'],
		@@ -36,16 +36,16 @@ discard block
		block discarded – undo
36	36	['text'=>_("Contact"), 'catInfo'=>['contact',_("FAQ")]],
37	37	]],
38	38	['id'=>'manage',
39		- 'text'=>_("Manage"),'submenu'=>[
	39	+ 'text'=>_("Manage"),'submenu'=>[
40	40	['text'=>sprintf(_("%s admin access"),CONFIG['CONSORTIUM']['name']),
41		- 'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
	41	+ 'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
42	42	['text'=>_("Become a CAT developer"),
43		- 'catInfo'=>['develop',_("Become a CAT developer")]],
	43	+ 'catInfo'=>['develop',_("Become a CAT developer")]],
44	44	['text'=>_("Documentation")],
45	45	],
46		- 'visibility' => 'index'],
	46	+ 'visibility' => 'index'],
47	47	['id'=>'tou',
48		- 'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
	48	+ 'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
49	49	],
50	50	$visibility
51	51	);

		@@ -4,9 +4,9 @@ discard block
		block discarded – undo
4	4	$selectedLang = $Gui->langObject->getLang();
5	5	foreach (CONFIG['LANGUAGES'] as $lang => $value) {
6	6	if ($lang == $selectedLang) {
7		- $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
	7	+ $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang'];
8	8	} else {
9		- $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
	9	+ $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")'];
10	10	}
11	11	}
12	12
		@@ -18,34 +18,34 @@ discard block
		block discarded – undo
18	18	'text'=>_("Start page"),
19	19	'visibility' => 'index'],
20	20	['id'=>'about',
21		- 'text'=>_("About"),'link'=>'','submenu'=>[
	21	+ 'text'=>_("About"), 'link'=>'', 'submenu'=>[
22	22	['text'=>sprintf(_("About %s"), CONFIG['APPEARANCE']['productname']),
23		- 'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
	23	+ 'catInfo'=>['about_cat', sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]],
24	24	['text'=>sprintf(_("About %s"), CONFIG['CONSORTIUM']['name']),
25	25	'link'=>CONFIG['CONSORTIUM']['homepage']],
26	26	]],
27	27	['id'=>'lang',
28		- 'text'=>_("Language"), 'submenu'=>$langsArray,],
	28	+ 'text'=>_("Language"), 'submenu'=>$langsArray, ],
29	29	['id'=>'help',
30	30	'text'=>_("Help"), 'submenu'=>[
31		- ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed',_("FAQ")], 'visibility'=>'index'],
32		- ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed',_("FAQ")], 'visibility'=>'index'],
33		- ['text'=>_("SB help item"),'visibility'=>'xxx'],
34		- ['text'=>_("What is eduroam"), 'catInfo'=>['what_is_eduroam',_("FAQ")]],
35		- ['text'=>_("FAQ"), 'catInfo'=>['faq',_("FAQ")]],
36		- ['text'=>_("Contact"), 'catInfo'=>['contact',_("FAQ")]],
	31	+ ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed', _("FAQ")], 'visibility'=>'index'],
	32	+ ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed', _("FAQ")], 'visibility'=>'index'],
	33	+ ['text'=>_("SB help item"), 'visibility'=>'xxx'],
	34	+ ['text'=>_("What is eduroam"), 'catInfo'=>['what_is_eduroam', _("FAQ")]],
	35	+ ['text'=>_("FAQ"), 'catInfo'=>['faq', _("FAQ")]],
	36	+ ['text'=>_("Contact"), 'catInfo'=>['contact', _("FAQ")]],
37	37	]],
38	38	['id'=>'manage',
39		- 'text'=>_("Manage"),'submenu'=>[
40		- ['text'=>sprintf(_("%s admin access"),CONFIG['CONSORTIUM']['name']),
41		- 'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
	39	+ 'text'=>_("Manage"), 'submenu'=>[
	40	+ ['text'=>sprintf(_("%s admin access"), CONFIG['CONSORTIUM']['name']),
	41	+ 'catInfo'=>['admin', sprintf(_("%s admin:<br>manage your IdP"), CONFIG['CONSORTIUM']['name'])]],
42	42	['text'=>_("Become a CAT developer"),
43		- 'catInfo'=>['develop',_("Become a CAT developer")]],
	43	+ 'catInfo'=>['develop', _("Become a CAT developer")]],
44	44	['text'=>_("Documentation")],
45	45	],
46	46	'visibility' => 'index'],
47	47	['id'=>'tou',
48		- 'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']],
	48	+ 'text'=>_("Terms of use"), 'catInfo'=>['tou', 'TOU']],
49	49	],
50	50	$visibility
51	51	);
		@@ -54,11 +54,11 @@ discard block
		block discarded – undo
54	54	<div id="heading">
55	55	<?php
56	56	print '<div id="cat_logo">';
57		-print '<img id="logo_img" src="'. $Gui->skinObject->findResourceUrl("IMAGES","consortium_logo.png").'" alt="Consortium Logo"/>';
	57	+print '<img id="logo_img" src="' . $Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo"/>';
58	58	print '<span>Configuration Assistant Tool</span>';
59	59	print '</div>';
60		-print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>
61		-<img id="hamburger" src="'. $Gui->skinObject->findResourceUrl("IMAGES","icons/menu.png").'" alt="Menu"/>';
	60	+print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>
	61	+<img id="hamburger" src="'. $Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png") . '" alt="Menu"/>';
62	62	print '<div id="menu_top">';
63	63	print $menu->printMenu();
64	64

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	* @package ModuleWriting
20	20	*/
21	21	namespace devices\xml;
22		-require_once(dirname(__FILE__).'/XML.inc.php');
	22	+require_once(dirname(__FILE__) . '/XML.inc.php');
23	23
24	24	/**
25	25	* This class implements full functionality of the generic XML device
		@@ -154,7 +154,7 @@ discard block
		block discarded – undo
154	154	$objs = [];
155	155	if ($this->langScope === 'global') {
156	156	foreach ($attributeList['langs'] as $language => $value) {
157		- $language = ( $language === 'C' ? 'any' : $language );
	157	+ $language = ($language === 'C' ? 'any' : $language);
158	158	$obj = new $className();
159	159	$obj->setValue($value);
160	160	$obj->setAttributes(['lang' => $language]);
		@@ -178,7 +178,7 @@ discard block
		block discarded – undo
178	178	$profileNameLangs = $attr['profile:name']['langs'];
179	179	}
180	180	foreach ($instNameLangs as $language => $value) {
181		- $language = ( $language === 'C' ? 'any' : $language );
	181	+ $language = ($language === 'C' ? 'any' : $language);
182	182	$displayname = new DisplayName();
183	183	if (isset($profileNameLangs)) {
184	184	$langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
		@@ -351,7 +351,7 @@ discard block
		block discarded – undo
351	351	$clientCertificateObject->setValue(base64_encode($this->clientCert["certdata"]));
352	352	$clientCertificateObject->setAttributes(['format' => 'PKCS12', 'encoding' => 'base64']);
353	353
354		- $clientsidecredential->setProperty('ClientCertificate',$clientCertificateObject);
	354	+ $clientsidecredential->setProperty('ClientCertificate', $clientCertificateObject);
355	355	}
356	356
357	357	$authmethod->setProperty('ClientSideCredential', $clientsidecredential);

GEANT / CAT

Push — master ( e1e902...4d7dc2 )

Status

Category

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

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

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

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

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

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

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

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

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

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

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

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