Passed
Push — master ( 466034...d09326 )
by Tomasz
04:05
created
web/404.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
29 29
     <div id="heading">
30 30
         <?php
31
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
32
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
31
+        print '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
32
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
33 33
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
34 34
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
35 35
         echo '<table id="lang_select"><tr><td>';
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
43 43
         ?>
44 44
     </div> <!-- id="heading" -->
45 45
     <div id="main_body" style='padding:20px;'>
46
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
47
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
46
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
47
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
48 48
         <h2>404</h2>
49
-        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p>
49
+        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang()); ?></p>
50 50
     </div> <!-- id="main_body" -->
51 51
 
52 52
         <?php echo $deco->footer();
Please login to merge, or discard this patch.
web/skins/example/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
  */
10 10
 ?>
11 11
 <h1>Example Skin (main user frontpage)</h1>
12
-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
12
+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
13 13
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
14 14
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
15
-<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
15
+<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
Please login to merge, or discard this patch.
web/skins/classic/user/js/roll.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -128,12 +128,12 @@
 block discarded – undo
128 128
  */
129 129
 ?>
130 130
 
131
-var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-win8-english-h234.png");?>",true);
132
-var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-mac-english-h234.png");?>",true);
133
-var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-android-english-h234.png");?>",false);
134
-var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-iphone-english-h234.png");?>",true);
135
-var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-linux-english-h234.png");?>",false);
136
-var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-chromeos-english-h234.png");?>",false);
131
+var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-win8-english-h234.png"); ?>",true);
132
+var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-mac-english-h234.png"); ?>",true);
133
+var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-android-english-h234.png"); ?>",false);
134
+var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-iphone-english-h234.png"); ?>",true);
135
+var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-linux-english-h234.png"); ?>",false);
136
+var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-chromeos-english-h234.png"); ?>",false);
137 137
 
138 138
 
139 139
 
Please login to merge, or discard this patch.
web/lib/common/InputValidation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@
 block discarded – undo
134 134
      */
135 135
     public function string($input, $allowWhitespace = FALSE) {
136 136
     // always chop out invalid characters, and surrounding whitespace
137
-    $retvalStep0 =  iconv("UTF-8", "UTF-8//TRANSLIT", $input);
137
+    $retvalStep0 = iconv("UTF-8", "UTF-8//TRANSLIT", $input);
138 138
     if ($retvalStep0 === FALSE) {
139 139
         throw new Exception("iconv failure for string sanitisation. With TRANSLIT, this should never happen!");
140 140
     }
Please login to merge, or discard this patch.
web/admin/overview_federation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
                 // deployment status; need to dive into profiles for this
198 198
                 // show happy eyeballs if at least one profile is configured/showtime                    
199 199
                 echo "<td>";
200
-                echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "" ) . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "" );
200
+                echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "") . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "");
201 201
                 echo "</td>";
202 202
                 // name
203 203
                 echo "<td>
Please login to merge, or discard this patch.
devices/redirect_dev/Device_RedirectDev.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     final public function __construct() {
20 20
         parent::__construct();
21 21
       $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
22
-      $this->loggerInstance->debug(4,"RedirectEx called");
22
+      $this->loggerInstance->debug(4, "RedirectEx called");
23 23
     }
24 24
     public function writeDeviceInfo() {
25 25
         $out = "<p>";
Please login to merge, or discard this patch.
core/common/OutsideComm.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -172,9 +172,9 @@
 block discarded – undo
172 172
                 $totalFailures = 0;
173 173
                 foreach ($decoded_response['messages'] as $message) {
174 174
                     if ($message['status'] == 0) {
175
-                        $loggerInstance->debug(2, $message['message-id']. ": Success");
175
+                        $loggerInstance->debug(2, $message['message-id'] . ": Success");
176 176
                     } else {
177
-                        $loggerInstance->debug(2, $message['message-id']. ": Failed (failure code = ".$message['status'].")");
177
+                        $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")");
178 178
                         $totalFailures++;
179 179
                     }
180 180
                 }
Please login to merge, or discard this patch.
devices/apple_mobileconfig/mobileconfigSuperclass.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -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>
@@ -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() {
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
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");
Please login to merge, or discard this patch.