Inspection of "added getUserCerts API call and used it in the mod..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 24687e...3d1824 )

by Tomasz

created 2017-09-27 20:38 UTC

Status

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

@@ -142,7 +142,7 @@  discard block
 block discarded – undo
     public function listIdPs() {
         $instList = $this->orderIdentityProviders($this->country->identifier);
         $out = '';
-        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst );
+        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst);
         $out .= '<select name="idp" onchange="submit_form(this)">';
         if (!empty($instList)) {
             if (!isset($this->idp)) {
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
                 }
             }
             $out .= '>' . $disp . '</option>';
-            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
+            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
             $iterator++;
         }
         $out .= '</select>';
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
         </script>
     </head>
     <body style="">
-        <?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>'; ?>
+        <?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>'; ?>
         <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'>
             <img src="<?php echo $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
             <?php

Please login to merge, or discard this patch.

web/admin/edit_federation.php 1 patch

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

@@ -40,7 +40,7 @@  discard block
 block discarded – undo
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></h2>
+        <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></h2>
         <table>
             <tr>
                 <td><?php echo _("Country:"); ?></td>
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
               <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>";
     ?>
     <fieldset class="option_container">
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></strong></legend>
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></strong></legend>
         <?php
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED");
         echo $optionDisplay->prefilledOptionTable("fed");

Please login to merge, or discard this patch.

devices/apple_mobileconfig/mobileconfigSuperclass.php 1 patch

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

@@ -71,7 +71,7 @@  discard block
 block discarded – undo
       <key>PayloadIdentifier</key>
          <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 
         $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
 
-        $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"),$this->nomenclature_inst);
+        $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"), $this->nomenclature_inst);
         $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
 
         $this->massagedInst = $this->massageName($this->instName);
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
     }
 
     private function expiryBlock() {

Please login to merge, or discard this patch.

web/lib/admin/GeoWidget.php 1 patch

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

@@ -37,7 +37,7 @@
 block discarded – undo
      */
     public function insertInHead($inst_country, $inst_name) {
         $cat = new \core\CAT();
-        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
+        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;

Please login to merge, or discard this patch.

web/admin/edit_silverbullet.php 1 patch

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

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 
 $uiElements = new \web\lib\admin\UIElements();
 
-$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'),$uiElements->nomenclature_inst), '1.3.3');
+$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'), $uiElements->nomenclature_inst), '1.3.3');
 // Load global scripts
 $page->appendScript('js/option_expand.js');
 $page->appendScript('../external/jquery/jquery.js');
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 $builder = new InstitutionPageBuilder($page);
 $builder->buildPagePrelude();
 $builder->buildPageHeader();
-if($builder->isReady()){
+if ($builder->isReady()) {
     // this page may have been called for the first time, when the profile does not
     // actually exist in the DB yet. If so, we will need to create it first.
     if (!isset($_REQUEST['profile_id'])) {
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
         $fed = new \core\Federation($inst->federation);
         $allowSb = $fed->getAttributes("fed:silverbullet");
         if (count($allowSb) == 0) {
-            throw new Exception("We were told to create a new SB profile, but this ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." does not allow SB at all!");
+            throw new Exception("We were told to create a new SB profile, but this " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " does not allow SB at all!");
         }
         // okay, new SB profiles are allowed. Create one.
         $newProfile = $inst->newProfile("SILVERBULLET");
         // and modify the REQUEST_URI to add the new profile ID
-        $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier;
+        $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier;
         $_GET['profile_id'] = $newProfile->identifier;
     }
     
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
     $action = $context->addQuery($_SERVER['SCRIPT_NAME']);
     
     //Info block data preparation
-    $infoBlock = new InfoBlockTable( sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
+    $infoBlock = new InfoBlockTable(sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
     $infoBlock->addRow(array('The assigned realm', $builder->getRealmName()));
     $infoBlock->addRow(array('The total number of active users which are allowed for this profile', $stats[SilverbulletContext::STATS_TOTAL]));
     $infoBlock->addRow(array('The current number of configured active users', $stats[SilverbulletContext::STATS_ACTIVE]));
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
     $builder->addContentElement($infoBlock);
 
     //Edit form data preparation
-    $acknowledgeText = _ ( 'You need to acknowledge that the created accounts are still valid within the next %s days.'
+    $acknowledgeText = _('You need to acknowledge that the created accounts are still valid within the next %s days.'
                 .' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".'
-                .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.' );
+                .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.');
     $editBlock = new UserCredentialsForm($context, $action, sprintf(_('Manage %s users'), $uiElements->nomenclature_inst), $acknowledgeText, count($users) > 0);
     foreach ($users as $user) {
         $editBlock->addUserRow($user);
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
     $builder->addContentElement($tabbedBox);
     
     //Appending terms of use popup
-    if(!$context->isAgreementSigned()){
+    if (!$context->isAgreementSigned()) {
         $termsOfUse = new TermsOfUseBox($action, TermsOfUseCommand::COMMAND, TermsOfUseCommand::AGREEMENT);
         $termsOfUsePopup = new PopupMessageContainer($termsOfUse, PageElementInterface::MESSAGEPOPUP_CLASS, \core\ProfileSilverbullet::PRODUCTNAME . " - " . _('Terms of Use'));
         $termsOfUsePopup->setCloseButtonClass('redirect');
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
     
     //Adding hidden QR code popup template
     $qrCodeImage = new UnaryTag("img");
-    $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS."-image");
+    $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS . "-image");
     $qrCodeImage->addAttribute("alt", _('Invitation QR Code'));
     $qrCodeImage->addAttribute("width", 400);
     $qrCodeImage->addAttribute("height", 400);

Please login to merge, or discard this patch.

web/admin/edit_idp_result.php 1 patch

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

@@ -90,7 +90,7 @@
 block discarded – undo
 
 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
     foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
-        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
+        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
     }
 }
 

Please login to merge, or discard this patch.

web/user/tou.inc.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
 /* 
 */
 
-        $Tou =  [
+        $Tou = [
     'title' => _("Terms of Use"),
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
 Identity Providers by making available customised and securely configured eduroam installers.</p>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
     they are from the same user group. You are not allowed to share them to an unlimited
     audience (e.g. on a publicly accessible web server).</li>
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
-your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li>
+your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li>
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
 </ul>

Please login to merge, or discard this patch.

web/user/tou.php 1 patch

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

@@ -52,7 +52,7 @@
 block discarded – undo
     they are from the same user group. You are not allowed to share them to an unlimited
     audience (e.g. on a publicly accessible web server).</li>
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
-your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, on Welcome Package CDs or USB sticks, etc.</li>
+your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, on Welcome Package CDs or USB sticks, etc.</li>
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
 </ul>

Please login to merge, or discard this patch.

utils/notify_invitation_expiry.php 1 patch

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

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

Please login to merge, or discard this patch.

		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	public function listIdPs() {
143	143	$instList = $this->orderIdentityProviders($this->country->identifier);
144	144	$out = '';
145		- $out .= sprintf(_("Select your %s"), $this->nomenclature_inst );
	145	+ $out .= sprintf(_("Select your %s"), $this->nomenclature_inst);
146	146	$out .= '<select name="idp" onchange="submit_form(this)">';
147	147	if (!empty($instList)) {
148	148	if (!isset($this->idp)) {
		@@ -236,7 +236,7 @@ discard block
		block discarded – undo
236	236	}
237	237	}
238	238	$out .= '>' . $disp . '</option>';
239		- $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
	239	+ $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
240	240	$iterator++;
241	241	}
242	242	$out .= '</select>';
		@@ -430,7 +430,7 @@ discard block
		block discarded – undo
430	430	</script>
431	431	</head>
432	432	<body style="">
433		- <?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>'; ?>
	433	+ <?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>'; ?>
434	434	<form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'>
435	435	<img src="<?php echo $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
436	436	<?php

		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	?>
41	41	</h1>
42	42	<div class='infobox'>
43		- <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></h2>
	43	+ <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></h2>
44	44	<table>
45	45	<tr>
46	46	<td><?php echo _("Country:"); ?></td>
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	<input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>";
58	58	?>
59	59	<fieldset class="option_container">
60		- <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></strong></legend>
	60	+ <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></strong></legend>
61	61	<?php
62	62	$optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED");
63	63	echo $optionDisplay->prefilledOptionTable("fed");

		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	<key>PayloadIdentifier</key>
72	72	<string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
73	73	<key>PayloadOrganization</key>
74		- <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
	74	+ <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
75	75	<key>PayloadType</key>
76	76	<string>Configuration</string>
77	77	<key>PayloadUUID</key>
		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119
120	120	$this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
121	121
122		- $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"),$this->nomenclature_inst);
	122	+ $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"), $this->nomenclature_inst);
123	123	$this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
124	124
125	125	$this->massagedInst = $this->massageName($this->instName);
		@@ -479,7 +479,7 @@ discard block
		block discarded – undo
479	479	<key>PayloadVersion</key>
480	480	<integer>1</integer>
481	481	</dict>",
482		- "UUID" => $payloadUUID,];
	482	+ "UUID" => $payloadUUID, ];
483	483	}
484	484
485	485	private function expiryBlock() {

		@@ -37,7 +37,7 @@
		block discarded – undo
37	37	*/
38	38	public function insertInHead($inst_country, $inst_name) {
39	39	$cat = new \core\CAT();
40		- return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
	40	+ return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
41	41	<script type='text/javascript'>
42	42	// some global variables;
43	43	var center_lat=49.6114885608729;

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38
39	39	$uiElements = new \web\lib\admin\UIElements();
40	40
41		-$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'),$uiElements->nomenclature_inst), '1.3.3');
	41	+$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'), $uiElements->nomenclature_inst), '1.3.3');
42	42	// Load global scripts
43	43	$page->appendScript('js/option_expand.js');
44	44	$page->appendScript('../external/jquery/jquery.js');
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	$builder = new InstitutionPageBuilder($page);
56	56	$builder->buildPagePrelude();
57	57	$builder->buildPageHeader();
58		-if($builder->isReady()){
	58	+if ($builder->isReady()) {
59	59	// this page may have been called for the first time, when the profile does not
60	60	// actually exist in the DB yet. If so, we will need to create it first.
61	61	if (!isset($_REQUEST['profile_id'])) {
		@@ -69,12 +69,12 @@ discard block
		block discarded – undo
69	69	$fed = new \core\Federation($inst->federation);
70	70	$allowSb = $fed->getAttributes("fed:silverbullet");
71	71	if (count($allowSb) == 0) {
72		- throw new Exception("We were told to create a new SB profile, but this ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." does not allow SB at all!");
	72	+ throw new Exception("We were told to create a new SB profile, but this " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " does not allow SB at all!");
73	73	}
74	74	// okay, new SB profiles are allowed. Create one.
75	75	$newProfile = $inst->newProfile("SILVERBULLET");
76	76	// and modify the REQUEST_URI to add the new profile ID
77		- $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier;
	77	+ $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier;
78	78	$_GET['profile_id'] = $newProfile->identifier;
79	79	}
80	80
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87	$action = $context->addQuery($_SERVER['SCRIPT_NAME']);
88	88
89	89	//Info block data preparation
90		- $infoBlock = new InfoBlockTable( sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
	90	+ $infoBlock = new InfoBlockTable(sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
91	91	$infoBlock->addRow(array('The assigned realm', $builder->getRealmName()));
92	92	$infoBlock->addRow(array('The total number of active users which are allowed for this profile', $stats[SilverbulletContext::STATS_TOTAL]));
93	93	$infoBlock->addRow(array('The current number of configured active users', $stats[SilverbulletContext::STATS_ACTIVE]));
		@@ -95,9 +95,9 @@ discard block
		block discarded – undo
95	95	$builder->addContentElement($infoBlock);
96	96
97	97	//Edit form data preparation
98		- $acknowledgeText = _ ( 'You need to acknowledge that the created accounts are still valid within the next %s days.'
	98	+ $acknowledgeText = _('You need to acknowledge that the created accounts are still valid within the next %s days.'
99	99	.' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".'
100		- .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.' );
	100	+ .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.');
101	101	$editBlock = new UserCredentialsForm($context, $action, sprintf(_('Manage %s users'), $uiElements->nomenclature_inst), $acknowledgeText, count($users) > 0);
102	102	foreach ($users as $user) {
103	103	$editBlock->addUserRow($user);
		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	$builder->addContentElement($tabbedBox);
125	125
126	126	//Appending terms of use popup
127		- if(!$context->isAgreementSigned()){
	127	+ if (!$context->isAgreementSigned()) {
128	128	$termsOfUse = new TermsOfUseBox($action, TermsOfUseCommand::COMMAND, TermsOfUseCommand::AGREEMENT);
129	129	$termsOfUsePopup = new PopupMessageContainer($termsOfUse, PageElementInterface::MESSAGEPOPUP_CLASS, \core\ProfileSilverbullet::PRODUCTNAME . " - " . _('Terms of Use'));
130	130	$termsOfUsePopup->setCloseButtonClass('redirect');
		@@ -141,7 +141,7 @@ discard block
		block discarded – undo
141	141
142	142	//Adding hidden QR code popup template
143	143	$qrCodeImage = new UnaryTag("img");
144		- $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS."-image");
	144	+ $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS . "-image");
145	145	$qrCodeImage->addAttribute("alt", _('Invitation QR Code'));
146	146	$qrCodeImage->addAttribute("width", 400);
147	147	$qrCodeImage->addAttribute("height", 400);

		@@ -90,7 +90,7 @@
		block discarded – undo
90	90
91	91	if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
92	92	foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
93		- $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
	93	+ $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
94	94	}
95	95	}
96	96

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	/*
12	12	*/
13	13
14		- $Tou = [
	14	+ $Tou = [
15	15	'title' => _("Terms of Use"),
16	16	'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
17	17	Identity Providers by making available customised and securely configured eduroam installers.</p>
		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	they are from the same user group. You are not allowed to share them to an unlimited
50	50	audience (e.g. on a publicly accessible web server).</li>
51	51	<li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
52		-your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li>
	52	+your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li>
53	53	<li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
54	54	the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
55	55	</ul>

		@@ -52,7 +52,7 @@
		block discarded – undo
52	52	they are from the same user group. You are not allowed to share them to an unlimited
53	53	audience (e.g. on a publicly accessible web server).</li>
54	54	<li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
55		-your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, on Welcome Package CDs or USB sticks, etc.</li>
	55	+your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, on Welcome Package CDs or USB sticks, etc.</li>
56	56	<li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
57	57	the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
58	58	</ul>

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	$admins = $this_fed->listFederationAdmins();
45	45	$mailtext = "Hello,
46	46
47		-invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ." have recently expired:
	47	+invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have recently expired:
48	48
49	49	";
50	50	foreach ($listofinstnames as $instname) {
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	if ($numberofexistingidps > 0) {
55	55	$mailtext .= "
56	56
57		-Additionally, $numberofexistingidps invitations for an existing ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired.
	57	+Additionally, $numberofexistingidps invitations for an existing " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have expired.
58	58	";
59	59	}
60	60	$mailtext .= "

GEANT / CAT

Push — master ( 24687e...3d1824 )

Status

Category

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

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

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

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

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

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

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

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

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