Passed
Push — master ( 3fd9e0...24687e )
by Tomasz
03:50
created
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/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.
web/user/faq.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@  discard block
 block discarded – undo
12 12
 
13 13
 array_push($FAQ, [
14 14
     'title' => sprintf(_("My %s is not listed. Can't I just use any of the other ones?"), $skinObject->nomenclature_inst),
15
-    'text' => sprintf(_("No! The installers contain security settings which are specific to the %s. If you are not from that %s, your computer will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using a different %s installer is <i>guaranteed to not work</i>!"),$skinObject->nomenclature_inst,$skinObject->nomenclature_inst,$skinObject->nomenclature_inst)
15
+    'text' => sprintf(_("No! The installers contain security settings which are specific to the %s. If you are not from that %s, your computer will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using a different %s installer is <i>guaranteed to not work</i>!"), $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, $skinObject->nomenclature_inst)
16 16
 ]);
17 17
 
18 18
 array_push($FAQ, [
19
-    'title' => sprintf(_("What can I do to get my %s listed?"),$skinObject->nomenclature_inst),
19
+    'title' => sprintf(_("What can I do to get my %s listed?"), $skinObject->nomenclature_inst),
20 20
     'text' => sprintf(_("Contact %s administrators at your %s and complain. It will take at most one hour of their time to get things done."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $skinObject->nomenclature_inst)
21 21
 ]);
22 22
 
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
32 32
 
33 33
 if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam") {
34 34
     array_push($FAQ, [
35
-        'title' => sprintf(_("What is this %s thing anyway?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
36
-        'text' => sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> for more details."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
35
+        'title' => sprintf(_("What is this %s thing anyway?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
36
+        'text' => sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> for more details."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
37 37
     ]);
38 38
 }
39 39
 
40 40
 array_push($FAQ, [
41 41
     'title' => sprintf(_("Is it safe to use %s installers?"), CONFIG['APPEARANCE']['productname']),
42
-    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['APPEARANCE']['productname']) . ' ' . ( isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) : ""),
42
+    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['APPEARANCE']['productname']) . ' ' . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) : ""),
43 43
 ]);
44 44
 
45 45
 array_push($FAQ, [
Please login to merge, or discard this patch.
core/UserAPI.php 2 patches
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,6 +125,7 @@  discard block
 block discarded – undo
125 125
      * 
126 126
      * @param string $device
127 127
      * @param AbstractProfile $profile
128
+     * @param string $generatedFor
128 129
      * @return array info about the new installer (mime and link)
129 130
      */
130 131
     private function generateNewInstaller($device, $profile, $generatedFor, $token, $password) {
@@ -459,6 +460,10 @@  discard block
 block discarded – undo
459 460
         readfile($file);
460 461
     }
461 462
 
463
+    /**
464
+     * @param string $destFile
465
+     * @param integer $resize
466
+     */
462 467
     private function processImage($inputImage, $destFile, $width, $height, $resize) {
463 468
         $info = new \finfo();
464 469
         $filetype = $info->buffer($inputImage, FILEINFO_MIME_TYPE);
@@ -485,7 +490,6 @@  discard block
 block discarded – undo
485 490
      * When called for DiscoJuice, first check if file cache exists
486 491
      * If not then generate the file and save it in the cache
487 492
      * @param int $idp IdP identifier
488
-     * @param int $disco flag turning on image generation for DiscoJuice
489 493
      * @param int $width maximum width of the generated image 
490 494
      * @param int $height  maximum height of the generated image
491 495
      * if one of these is 0 then it is treated as no upper bound
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             if (isset($deviceProperties['options']['hidden']) && $deviceProperties['options']['hidden'] && $showHidden == 0) {
177 177
                 continue;
178 178
             }
179
-            $count ++;
179
+            $count++;
180 180
 
181 181
             $deviceProperties['device'] = $device;
182 182
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
     }
564 564
 
565 565
 
566
-    public function sendLogo($identifier, $type, $width = 0, $height = 0){
566
+    public function sendLogo($identifier, $type, $width = 0, $height = 0) {
567 567
         if ($type === "federation") {
568 568
             $logo = $this->getFedLogo($identifier, $width, $height);
569 569
         }
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
             return ['status' => 'error', 'error' => 'Function for GEOIPv1 called, but config says this is not the version to use!'];
582 582
         }
583 583
         //$host = $_SERVER['REMOTE_ADDR'];
584
-        $host = input_filter(INPUT_SERVER,'REMOTE_ADDR',FILTER_VALIDATE_IP);
584
+        $host = input_filter(INPUT_SERVER, 'REMOTE_ADDR', FILTER_VALIDATE_IP);
585 585
         $record = geoip_record_by_name($host);
586 586
         if ($record === FALSE) {
587 587
             return ['status' => 'error', 'error' => 'Problem listing countries'];
@@ -743,12 +743,12 @@  discard block
 block discarded – undo
743 743
                     $this->loggerInstance->debug(4, "Browser_id: $dev_id\n");
744 744
                     return(['device' => $dev_id, 'display' => $device['display'], 'group' => $device['group']]);
745 745
                 } else {
746
-                    $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER,'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
746
+                    $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER, 'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
747 747
                     return(false);
748 748
                 }
749 749
             }
750 750
         }
751
-        $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER,'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
751
+        $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER, 'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
752 752
         return(false);
753 753
     }
754 754
 
Please login to merge, or discard this patch.
web/user/API.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 ];
40 40
 
41 41
 
42
-function getRequest($varName,$filter) {
42
+function getRequest($varName, $filter) {
43 43
     $safeText = ["options"=>["regexp"=>"/^[\w\d]+$/"]];
44 44
     switch ($filter) {
45 45
         case 'safe_text':
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 // make sure this is a known action
59 59
 $actionR = getRequest('action', 'safe_text');
60
-$action = array_search($actionR,LISTOFACTIONS) ? $actionR : FALSE;
60
+$action = array_search($actionR, LISTOFACTIONS) ? $actionR : FALSE;
61 61
 if ($action === FALSE) {
62 62
     exit;
63 63
 }
@@ -65,17 +65,17 @@  discard block
 block discarded – undo
65 65
 $lang = $langR ? $validator->supportedLanguage($langR) : FALSE;
66 66
 $deviceR = getRequest('device', 'safe_text');
67 67
 $device = $deviceR ? $validator->Device($deviceR) : FALSE;
68
-$idpR = getRequest('idp','int');
68
+$idpR = getRequest('idp', 'int');
69 69
 $idp = $idpR ? $validator->IdP($idpR)->identifier : FALSE;
70
-$profileR = getRequest('profile','int');
70
+$profileR = getRequest('profile', 'int');
71 71
 $profile = $profileR ? $validator->Profile($profileR)->identifier : FALSE;
72
-$federationR = getRequest('federation','safe_text');
72
+$federationR = getRequest('federation', 'safe_text');
73 73
 $federation = $federationR ? $validator->Federation($deviceR)->identifier : FALSE;
74
-$disco = getRequest('disco','int');
75
-$width = getRequest('width','int') ?? 0;
76
-$height = getRequest('height','int') ?? 0;
77
-$sort = getRequest('sort','int') ?? 0;
78
-$generatedforR = getRequest('generatedfor','safe_text') ?? 'user';
74
+$disco = getRequest('disco', 'int');
75
+$width = getRequest('width', 'int') ?? 0;
76
+$height = getRequest('height', 'int') ?? 0;
77
+$sort = getRequest('sort', 'int') ?? 0;
78
+$generatedforR = getRequest('generatedfor', 'safe_text') ?? 'user';
79 79
 
80 80
 /*
81 81
 $idp = FALSE;
Please login to merge, or discard this patch.
core/DeviceConfig.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -260,6 +260,9 @@  discard block
 block discarded – undo
260 260
         return _("Sorry, this should not happen - no additional information is available");
261 261
     }
262 262
     
263
+    /**
264
+     * @param string $file
265
+     */
263 266
     private function findSourceFile($file) {
264 267
         if (is_file($this->module_path . '/Files/' . $this->device_id . '/' . $file)) {
265 268
             return $this->module_path . '/Files/' . $this->device_id . '/' . $file;
@@ -540,6 +543,9 @@  discard block
 block discarded – undo
540 543
         'application/pdf' => 'pdf',
541 544
     ];
542 545
 
546
+    /**
547
+     * @param string $type
548
+     */
543 549
     private function saveLogoFile($logos,$type) {
544 550
         $iterator = 0;
545 551
         $returnarray = [];
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
         }
213 213
         if (isset($this->attributes['general:logo_file'])) {
214 214
             $this->loggerInstance->debug(5, "saving IDP logo\n");
215
-            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'],'idp');
215
+            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'], 'idp');
216 216
         }
217 217
         if (isset($this->attributes['fed:logo_file'])) {
218 218
             $this->loggerInstance->debug(5, "saving FED logo\n");
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
540 540
         'application/pdf' => 'pdf',
541 541
     ];
542 542
 
543
-    private function saveLogoFile($logos,$type) {
543
+    private function saveLogoFile($logos, $type) {
544 544
         $iterator = 0;
545 545
         $returnarray = [];
546 546
         foreach ($logos as $blob) {
Please login to merge, or discard this patch.
schema/1_1-1_2-script.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
 
95 95
 while ($oneAttrib = mysqli_fetch_object($idpWideOptionsQuery)) {
96 96
     if (!isset($profiles[$oneAttrib->institution_id])) {
97
-        $idp = new \core\IdP((int)$oneAttrib->institution_id);
97
+        $idp = new \core\IdP((int) $oneAttrib->institution_id);
98 98
         $profiles[$oneAttrib->institution_id] = ['IdP' => $idp, 'Profiles' => $idp->listProfiles()];
99 99
         echo "Debug: IdP " . $idp->identifier . " has profiles ";
100 100
         foreach ($profiles[$oneAttrib->institution_id]['Profiles'] as $oneProfileObject) {
Please login to merge, or discard this patch.