View GitHub Repository CAT

Schedule Inspection
Subscribe
Passed
Push — master ( 484f87...7b874f )
by Tomasz
04:46 queued 01:00
created
Status
Category
Toggle Patches
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
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">
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
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  include "div_institution.php";
91 
-                   include "div_profiles.php"; ?>
91 
+                    include "div_profiles.php"; ?>
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 
                             include "div_guess_os.php";
108 108 
                         }
109 
-                         include "div_other_installers.php";
109 
+                            include "div_other_installers.php";
110 110 
                     ?>
111 111 
                 </div> <!-- id="devices" -->
112 112 
                 <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
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 
 );
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
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
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
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);
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
11 11 
  * @author Zilvinas Vaira
12 12 
  *
13 13 
  */
14 
-class GetTokenEmailDetails extends AbstractAjaxCommand{
14 
+class GetTokenEmailDetails extends AbstractAjaxCommand {
15 15
16 16 
     const COMMAND = "gettokenemaildetails";
17 17 
     const PARAM_TOKENLINK = "tokenlink";
 
@@ -25,7 +25,7 @@  discard block
 
 block discarded – undo
25 25 
      * @param string $commandToken
26 26 
      * @param DefaultContext $context
27 27 
      */
28 
-    public function __construct($commandToken, $context){
28 
+    public function __construct($commandToken, $context) {
29 29 
         parent::__construct($commandToken, $context);
30 30 
         $this->subject = sprintf(_("Your %s access is ready"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
31 31 
         $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
37 37 
      *
38 38 
      * @return string
39 39 
      */
40 
-    public function getSubject(){
40 
+    public function getSubject() {
41 41 
         return $this->subject;
42 42 
     }
43 43 
     
@@ -46,7 +46,7 @@  discard block
 
 block discarded – undo
46 46 
      * @param string $invitationToken
47 47 
      * @return string
48 48 
      */
49 
-    public function getBody($invitationToken){
49 
+    public function getBody($invitationToken) {
50 50 
         return sprintf($this->body, $invitationToken);
51 51 
     }
52 52 
     
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
      * @see \web\lib\admin\http\AbstractCommand::execute()
57 57 
      */
58 58 
     public function execute() {
59 
-        if(isset($_POST[self::PARAM_TOKENLINK])){
59 
+        if (isset($_POST[self::PARAM_TOKENLINK])) {
60 60
61 61 
             $invitationToken = $this->parseString($_POST[self::PARAM_TOKENLINK]);
62 62
Please login to merge, or discard this patch.
web/lib/admin/view/TermsOfUseBox.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -6,7 +6,7 @@  discard block
 
 block discarded – undo
6 6 
  * @author Zilvinas Vaira
7 7 
  *
8 8 
  */
9 
-class TermsOfUseBox extends AbstractDialogBox{
9 
+class TermsOfUseBox extends AbstractDialogBox {
10 10
11 11 
     private $command = '';
12 12 
     private $parameter = '';
 
@@ -28,28 +28,28 @@  discard block
 
 block discarded – undo
28 28 
      * {@inheritDoc}
29 29 
      * @see \web\lib\admin\view\AbstractDialogBox::renderContent()
30 30 
      */
31 
-    public function renderContent(){
31 
+    public function renderContent() {
32 32 
         ?>
33 33 
         <hr>
34 34 
         <h2>Product Definition</h2>
35 
-        <p><?php echo \core\ProfileSilverbullet::PRODUCTNAME;?> outsources the technical setup of <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] ." ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> functions to the <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'];?> Operations Team. The system includes</p>
35 
+        <p><?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?> outsources the technical setup of <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> functions to the <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']; ?> Operations Team. The system includes</p>
36 36 
             <ul>
37 37 
                 <li>a web-based user management interface where user accounts and access credentials can be created and revoked (there is a limit to the number of active users)</li>
38 38 
                 <li>a technical infrastructure ("CA") which issues and revokes credentials</li>
39 
-                <li>a technical infrastructure ("RADIUS") which verifies access credentials and subsequently grants access to <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'];?></li>
40 
-                <li><span style='color: red;'>TBD: a lookup/notification system which informs you of network abuse complaints by <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'];?> Service Providers that pertain to your users</span></li>
39 
+                <li>a technical infrastructure ("RADIUS") which verifies access credentials and subsequently grants access to <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']; ?></li>
40 
+                <li><span style='color: red;'>TBD: a lookup/notification system which informs you of network abuse complaints by <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']; ?> Service Providers that pertain to your users</span></li>
41 41 
             </ul>
42 42 
         <h2>User Account Liability</h2>
43 
-        <p>As an <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] ." ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> administrator using this system, you are authorized to create user accounts according to your local <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ?> policy. You are fully responsible for the accounts you issue. In particular, you</p>
43 
+        <p>As an <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> administrator using this system, you are authorized to create user accounts according to your local <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ?> policy. You are fully responsible for the accounts you issue. In particular, you</p>
44 44 
         <ul>
45 
-            <li>only issue accounts to members of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, as defined by your local policy.</li>
45 
+            <li>only issue accounts to members of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, as defined by your local policy.</li>
46 46 
             <li>must make sure that all accounts that you issue can be linked by you to actual human end users</li>
47 
-            <li>have to immediately revoke accounts of users when they leave or otherwise stop being a member of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?></li>
47 
+            <li>have to immediately revoke accounts of users when they leave or otherwise stop being a member of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?></li>
48 48 
             <li>will act upon notifications about possible network abuse by your users and will appropriately sanction them</li>
49 49 
         </ul>
50 
-        <p>Failure to comply with these requirements may lead to the deletion of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> (and all the users you create inside) in this system.</p>
50 
+        <p>Failure to comply with these requirements may lead to the deletion of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> (and all the users you create inside) in this system.</p>
51 51 
         <h2>Privacy</h2>
52 
-        <p>With <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, we are not interested in and strive not to collect any personally identifiable information about the end users you create. To that end,</p>
52 
+        <p>With <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, we are not interested in and strive not to collect any personally identifiable information about the end users you create. To that end,</p>
53 53 
         <ul>
54 54 
             <li>the usernames you create in the system are not expected to be human-readable identifiers of actual humans. We encourage you to create usernames like 'hr-user-12' rather than 'Jane Doe, Human Resources Department'. You are the only one who needs to be able to make a link to the human behind the identifiers you create.</li>
55 55 
             <li>the identifiers in the credentials we create are not linked to the usernames you add to the system; they are pseudonyms.</li>
 
@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
      * {@inheritDoc}
65 65 
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
66 66 
      */
67 
-    public function renderControls(){
67 
+    public function renderControls() {
68 68 
         ?>
69 69 
         <div style="position: relative; padding-bottom: 5px;">
70 70 
             <input type="checkbox" name="<?php echo $this->parameter; ?>" value="true"> <label>I have read and agree to the terms.</label>
Please login to merge, or discard this patch.
web/skins/classic/accountstatus/accountstatus.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -34,7 +34,7 @@  discard block
 
 block discarded – undo
34 34 
     <div id="heading">
35 35 
         <?php
36 36 
         print '<img src="' . $skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
37 
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
37 
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
38 38 
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
39 39 
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
40 40 
         echo '<table id="lang_select"><tr><td>';
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
             <table style='float: right; right:30px; padding-top: 10px; border-spacing: 20px; max-width: 340px;'>
57 57 
                 <tr>
58 58 
                     <td><img id='logo1' style='max-width: 150px; max-height:150px;' src='<?php echo $skinObject->findResourceUrl("BASE", "user/API.php"); ?>?action=sendLogo&api_version=2&idp=<?php echo $statusInfo['idp']->identifier; ?>' alt='IdP Logo'/></td>
59 
-                    <td><img id='logo2' style='max-width: 150px; max-height:150px;' src='<?php echo $skinObject->findResourceUrl("BASE", "user/API.php"); ?>?action=sendFedLogo&api_version=2&fed=<?php echo strtoupper($statusInfo['idp']->federation); ?>' alt='<?php echo sprintf(_("%s Logo"),$uiElements->nomenclature_fed);?>'/></td>
59 
+                    <td><img id='logo2' style='max-width: 150px; max-height:150px;' src='<?php echo $skinObject->findResourceUrl("BASE", "user/API.php"); ?>?action=sendFedLogo&api_version=2&fed=<?php echo strtoupper($statusInfo['idp']->federation); ?>' alt='<?php echo sprintf(_("%s Logo"), $uiElements->nomenclature_fed); ?>'/></td>
60 60 
                 </tr>
61 61 
                 <tr>
62 62 
                     <td><?php echo $statusInfo['idp']->name; ?></td>
 
@@ -143,18 +143,18 @@  discard block
 
 block discarded – undo
143 143 
                     case \core\ProfileSilverbullet::SB_TOKENSTATUS_PARTIALLY_REDEEMED:
144 144 
                         echo "<h2>" . sprintf(_("Your invitation token is valid for %d more device activations."), $statusInfo['tokenstatus']['activations_remaining']) . "</h2>";
145 145 
                         if (!$statusInfo["OS"]) {
146 
-                            echo "<p>"._("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
146 
+                            echo "<p>" . _("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
147 147 
                             break;
148 148 
                         }
149 149
150 150 
                         $dev = new \core\DeviceFactory($statusInfo['OS']['device']);
151 151 
                         $dev->device->calculatePreferredEapType([\core\common\EAP::EAPTYPE_SILVERBULLET]);
152 152 
                         if ($dev->device->selectedEap == []) {
153 
-                            echo "<p>".sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
153 
+                            echo "<p>" . sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
154 154 
                             break;
155 155 
                         }
156 156
157 
-                        echo "<p>".sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
157 
+                        echo "<p>" . sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
158 158 
                         echo sprintf(_("The installation program is<br/><span style='font-size: 30px;'>strictly personal</span>, to be used<br/><span style='font-size: 30px;'>only on this device (%s)</span>, and it is<br/><span style='font-size: 30px;'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
159 159 
                         echo "<p style='color:red;'>" . _("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local eduroam administrator.") . "</p>";
160 160 
                         echo "<p>" . _("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.") . "</p>";
Please login to merge, or discard this patch.
web/skins/classic/user/cat_info.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -43,7 +43,7 @@
 
 block discarded – undo
43 43 
         }
44 44 
         break;
45 45 
     case 'about':
46 
-        $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform.<p>Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. An installer prepared for one %s will not work for users of another one, therefore if your %s is not on the list, you cannot use this system. Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG['APPEARANCE']['productname'],$skinObject->nomenclature_inst, $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, CONFIG['APPEARANCE']['productname']);
46 
+        $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform.<p>Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. An installer prepared for one %s will not work for users of another one, therefore if your %s is not on the list, you cannot use this system. Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG['APPEARANCE']['productname'], $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, CONFIG['APPEARANCE']['productname']);
47 47 
         $out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), CONFIG['APPEARANCE']['productname']) . "</p>";
48 48 
         $out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
49 49 
         $eapDisplayNames = new web\lib\common\PrettyPrint();
Please login to merge, or discard this patch.
web/skins/classic/index.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -60,11 +60,11 @@  discard block
 
 block discarded – undo
60 60
61 61 
 $deco = new \web\lib\admin\PageDecoration();
62 62 
 ?>
63 
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
63 
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
64 64 
 <!-- JQuery -->
65 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
66 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
67 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
65 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
66 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
67 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
68 68 
 <!-- JQuery -->
69 69 
 <script type="text/javascript">
70 70 
     if (screen.width <= 480) {
 
@@ -106,7 +106,7 @@  discard block
 
 block discarded – undo
106 106 
     <div id="heading">
107 107 
         <?php
108 108 
         print '<img src="' . $Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
109 
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
109 
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
110 110 
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
111 111 
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
112 112 
         echo '<table id="lang_select"><tr><td>';
 
@@ -160,7 +160,7 @@  discard block
 
 block discarded – undo
160 160 
                                             <span id="line1"><?php printf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?></span>
161 161 
                                             <span id="line2"></span>
162 162 
                                             <span id="line3"></span>
163 
-                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"),$Gui->nomenclature_inst) ?></span>
163 
+                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"), $Gui->nomenclature_inst) ?></span>
164 164 
                                             <span id="line5">
165 165 
                                                 <?php
166 166 
                                                 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "") {
Please login to merge, or discard this patch.
web/admin/edit_idp.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86 
         ?>
87 87 
     </h1>
88 88 
     <div class='infobox'>
89 
-        <h2><?php echo sprintf(_("General %s properties"),$uiElements->nomenclature_inst); ?></h2>
89 
+        <h2><?php echo sprintf(_("General %s properties"), $uiElements->nomenclature_inst); ?></h2>
90 90 
         <table>
91 91 
             <tr>
92 92 
                 <td><?php echo _("Country:"); ?></td>
 
@@ -105,7 +105,7 @@  discard block
 
 block discarded – undo
105 105
106 106 
     if ($wizardStyle) {
107 107 
         echo "<p>" .
108 
-        sprintf(_("Hello, newcomer. Your %s is new to us. This wizard will ask you several questions about your IdP, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclature_inst ) . "</p>";
108 
+        sprintf(_("Hello, newcomer. Your %s is new to us. This wizard will ask you several questions about your IdP, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclature_inst) . "</p>";
109 109 
     }
110 110 
     $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, "IdP");
111 111 
     ?>
 
@@ -136,7 +136,7 @@  discard block
 
 block discarded – undo
136 136 
             sprintf(_("In this section, you define on which media %s should be configured on user devices."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</p>
137 137 
           <ul>";
138 138 
             echo "<li>";
139 
-            echo "<strong>" . ( count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
139 
+            echo "<strong>" . (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
140 140 
             if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
141 141 
                 $ssidlist = "";
142 142 
                 foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssid) {
 
@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
             echo "</li>";
156 156
157 157 
             echo "<li>";
158 
-            echo "<strong>" . ( count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
158 
+            echo "<strong>" . (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
159 159 
             if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi']) > 0) {
160 160 
                 $consortiumlist = "";
161 161 
                 foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi'] as $oi) {
Please login to merge, or discard this patch.