Inspection of "make "verify realm suffix" the default for new pro..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — release_2_0 ( aff697...948471 )

by Stefan

created 2020-06-18 15:23 UTC

Status

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

@@ -53,10 +53,10 @@
 block discarded – undo
         $ourlocale = $this->langObject->getLang();
         header("Content-Type:text/html;charset=utf-8");
         echo "<!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
-          <head lang='" . $ourlocale . "'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale."'>
+          <head lang='" . $ourlocale."'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        echo "<title>".htmlspecialchars($pagetitle)."</title>";
         echo '<script type="text/javascript">ie_version = 0;</script>
 <!--[if IE]>
 <script type="text/javascript">ie_version=1;</script>

Please login to merge, or discard this patch.

web/lib/admin/PageDecoration.php 1 patch

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

@@ -49,13 +49,13 @@  discard block
 block discarded – undo
         $retval = "<div class='sidebar'><p>";
 
         if ($advancedControls) {
-            $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
+            $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
             ."<br/>
               <br/>
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a> 
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a> 
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
         }
-        $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
+        $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
             </p>
         </div> <!-- sidebar -->";
         \core\common\Entity::outOfThePotatoes();
@@ -79,22 +79,22 @@  discard block
 block discarded – undo
                     <h1>$cap1</h1>
                 </div><!--header_captions-->
                 <div id='langselection' style='padding-top:20px; padding-left:10px;'>
-                    <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "&nbsp;
+                    <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."&nbsp;
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+            $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$value['display']."</option> ";
         }
         $retval .= "</select>";
 
         foreach ($_GET as $var => $value) {
             if ($var != "lang" && $value != "") {
-                $retval .= "<input type='hidden' name='" . htmlspecialchars($var) . "' value='" . htmlspecialchars($value) . "'>";
+                $retval .= "<input type='hidden' name='".htmlspecialchars($var)."' value='".htmlspecialchars($value)."'>";
             }
         }
         $retval .= "</form>
                 </div><!--langselection-->";
-        $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
+        $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
 
         if (isset(CONFIG['APPEARANCE']['MOTD']) && CONFIG['APPEARANCE']['MOTD'] != "") {
             $retval .= "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'>
-              <p class='MOTD'>" . CONFIG['APPEARANCE']['MOTD'] . "</p>
+              <p class='MOTD'>" . CONFIG['APPEARANCE']['MOTD']."</p>
               </div><!--header_MOTD-->";
         }
         $retval .= $this->sidebar($advancedControls);
@@ -213,9 +213,9 @@  discard block
 block discarded – undo
           <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'>
           <head lang='$ourlocale'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
+        $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
-        $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
         return $retval;
     }
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
             // we may need to jump up one dir if we are either in admin/ or accountstatus/
             // (accountstatus courtesy of my good mood. It's userspace not admin space so
             // it shouldn't be using this function any more.)
-            $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
+            $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
             return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
               <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
@@ -251,9 +251,9 @@  discard block
 block discarded – undo
             <table style='width:100%'>
                 <tr>
                     <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
-                        " . $cat->CAT_COPYRIGHT . "</td>";
+                        " . $cat->CAT_COPYRIGHT."</td>";
         if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
-            $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</a></td>";
+            $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</a></td>";
         }
         $retval .= "            <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>";
 

Please login to merge, or discard this patch.

web/lib/admin/Authentication.php 1 patch

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

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 
 use Exception;
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 require_once CONFIG['AUTHENTICATION']['ssp-path-to-autoloader'];
 
 /**
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
         if ($trailerPosition !== FALSE) {
             $base = substr($scriptself, 0, $trailerPosition);
             if ($base !== FALSE) {
-                $url = "//$servername" . $base . "/logout_check.php";
+                $url = "//$servername".$base."/logout_check.php";
             }
         }
 

Please login to merge, or discard this patch.

web/lib/admin/MapNone.php 2 patches

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

@@ -83,7 +83,7 @@
 block discarded – undo
      */
     public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
         if (!$this->readOnly) {
- //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
+    //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
             return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
         }
     }

Please login to merge, or discard this patch.

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
 namespace web\lib\admin;
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * This class provides map display functionality
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
     public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
         if (!$this->readOnly) {
  //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml().$this->htmlPostEdit(TRUE);
         }
     }
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
         // quiesce warnings about unused parameter
         sprintf("%d", $number);
         $pair = json_decode($coords, true);
-        return "<table><tr><td>Latitude</td><td><strong>" . $pair['lat'] . "</strong></td></tr><tr><td>Longitude</td><td><strong>" . $pair['lon'] . "</strong></td></tr></table>";
+        return "<table><tr><td>Latitude</td><td><strong>".$pair['lat']."</strong></td></tr><tr><td>Longitude</td><td><strong>".$pair['lon']."</strong></td></tr></table>";
     }
     
     /**
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

Please login to merge, or discard this patch.

web/lib/admin/MapOpenLayers.php 1 patch

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

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 
 namespace web\lib\admin;
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * This class provides map display functionality
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
         
 // use HTML5 geolocation
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
         }
         
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
                 view.fit(extent, {padding: [10, 0, 10, 0]});
             } else {
                 view.setCenter([0,0]);
-                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)] . "'); // use the federation code to locate the country
+                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]."'); // use the federation code to locate the country
                 map.setView(view);
             }
             view.setMaxZoom(20);
@@ -229,14 +229,14 @@  discard block
 block discarded – undo
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             city = city.replace(/\s*,\s*/g,',+');
             city = city.replace(/ +/,'+');
             $.get(addressService+'?format=json&addressdetails=0&q='+city, '',  function(data) {
                 if (data[0] === undefined) {
-                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
+                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
                     return;
                 }
                 showTmpPointer(data[0].lon, data[0].lat);
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
         if ($this->readOnly) {
             return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
      */
     public static function optionListDisplayCode($coords, $number) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

Please login to merge, or discard this patch.

web/lib/admin/Maintenance.php 1 patch

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

@@ -34,8 +34,8 @@  discard block
 block discarded – undo
      */
     public static function deleteObsoleteTempDirs() {
         $downloadsDirs = [
-            'site_installers' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/installer_cache",
-            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/silverbullet"
+            'site_installers' => dirname(dirname(dirname(dirname(__FILE__))))."/var/installer_cache",
+            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__))))."/var/silverbullet"
         ];
         $tm = time();
         $i = 0;
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
                     if ($entry === '.' || $entry === '..' || $entry === '.gitignore') {
                         continue;
                     }
-                    $ftime = $tm - filemtime($downloads . '/' . $entry);
+                    $ftime = $tm - filemtime($downloads.'/'.$entry);
                     if ($ftime < 3600) {
                         continue;
                     }
                     if (isset($Cache[$entry])) {
                         continue;
                     }
-                    \core\common\Entity::rrmdir($downloads . '/' . $entry);
+                    \core\common\Entity::rrmdir($downloads.'/'.$entry);
                     $i = $i + 1;
                     print "$entry\n";
                 }

Please login to merge, or discard this patch.

web/lib/admin/MapGoogle.php 1 patch

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
 namespace web\lib\admin;
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * This class provides map display functionality
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
     public function htmlHeadCode() {
         $cat = new \core\CAT();
         \core\common\Entity::intoThePotatoes();
-        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
+        $retval = "<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;
@@ -105,19 +105,19 @@  discard block
 block discarded – undo
          *
          */
         function locator_magic() {
-            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName) . "\", 'region':\"" . strtolower($this->fedName) . "\"},
+            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName)."\", 'region':\"".strtolower($this->fedName)."\"},
             function(r,status) {
                 if(status != google.maps.GeocoderStatus.OK) {
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)] . "\");
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]."\");
                 } else {
                     var i;
                     for(i = 0; i < r.length; i++) {
                         Addr = getAddressElements(r[i].address_components);
-                        if(Addr.country == \"" . strtoupper($this->fedName) . "\")
+                        if(Addr.country == \"" . strtoupper($this->fedName)."\")
                         break;
                     }
-                    if(Addr.country != \"" . strtoupper($this->fedName) . "\")
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)] . "\");
+                    if(Addr.country != \"" . strtoupper($this->fedName)."\")
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]."\");
                     else {
                         addMarker(r[i].geometry.location,15,null);
                     }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
          */
         function markerClicked(m) {
             info_window.close();
-            var t = \"" . _("This is location ") . "\"+m.info;
+            var t = \"" . _("This is location ")."\"+m.info;
             info_window.setContent(t);
             info_window.setPosition(m.getPosition());
             info_window.open(map,m);
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
         function getAddressLocation() {
             var city = $('#address').val();
             if(city == '') {
-                alert(\"" . _("nothing entered in the address field") . "\");
+                alert(\"" . _("nothing entered in the address field")."\");
                 return false;
             }
             geocoder.geocode( { 'address': city}, function(results, status) {
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
          * trigger geolocation
          */
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
         }
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
         if ($this->readOnly) {
             return "<div id='map' class='googlemap'></div>";
         } else {
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<div id='map' class='googlemap'></div>" . $this->htmlPostEdit(FALSE);
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<div id='map' class='googlemap'></div>".$this->htmlPostEdit(FALSE);
         }
     }
 
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
         // quiesce warnings about unused variable
         sprintf("%s", $coords);
         \core\common\Entity::intoThePotatoes();
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
      * @return string
      */
     public function bodyTagCode() {
-        return "onload='load(" . ($this->readOnly ? "0" : "1") . ")'";
+        return "onload='load(".($this->readOnly ? "0" : "1").")'";
     }
 
     /**
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
      */
     private function findLocationHtml() {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

Please login to merge, or discard this patch.

web/lib/admin/OptionParser.php 1 patch

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 ?>
 <?php
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * This class parses HTML field input from POST and FILES and extracts valid and authorized options to be set.
@@ -344,14 +344,14 @@  discard block
 block discarded – undo
                     case \core\Options::TYPECODE_TEXT:
                     case \core\Options::TYPECODE_COORDINATES:
                     case \core\Options::TYPECODE_INTEGER:
-                        $varName = "$objId-" . $validators[$optioninfo['type']]['field'];
+                        $varName = "$objId-".$validators[$optioninfo['type']]['field'];
                         if (!empty($listOfEntries[$varName])) {
                             $content = call_user_func_array([$this->validator, $validators[$optioninfo['type']]['function']], array_merge([$listOfEntries[$varName]], $validators[$optioninfo['type']]['extraarg']));
                             break;
                         }
                         continue 2;
                     case \core\Options::TYPECODE_BOOLEAN:
-                        $varName = "$objId-" . \core\Options::TYPECODE_BOOLEAN;
+                        $varName = "$objId-".\core\Options::TYPECODE_BOOLEAN;
                         if (!empty($listOfEntries[$varName])) {
                             $contentValid = $this->validator->boolean($listOfEntries[$varName]);
                             if ($contentValid) {
@@ -364,24 +364,24 @@  discard block
 block discarded – undo
                         }
                         continue 2;
                     case \core\Options::TYPECODE_STRING:
-                        if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) {
+                        if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) {
                             switch ($objValue) {
                                 case "media:consortium_OI":
-                                    $content = $this->validator->consortiumOI($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->consortiumOI($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     if ($content === FALSE) {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 case "media:remove_SSID":
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     if ($content == "eduroam") {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 case "media:force_proxy":
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     $serverAndPort = explode(':', strrev($content), 2);
                                     if (count($serverAndPort) != 2) {
                                         $bad[] = $objValue;
@@ -394,33 +394,33 @@  discard block
 block discarded – undo
                                     }
                                     break;
                                 case "support:url":
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
-                                    if (preg_match("/^http/",$content) != 1) {
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
+                                    if (preg_match("/^http/", $content) != 1) {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 case "support:email":
-                                    $content = $this->validator->email($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->email($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     if ($content === FALSE) {
                                         $bad[] = $objValue;
                                         continue 3;
                                     }
                                     break;
                                 default:
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
                                     break;
                             }
                             break;
                         }
                         continue 2;
                     case \core\Options::TYPECODE_FILE:
-                        if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) { // was already in, by ROWID reference, extract
+                        if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) { // was already in, by ROWID reference, extract
                             // ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
-                            $content = $this->validator->string(urldecode($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]), TRUE);
+                            $content = $this->validator->string(urldecode($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]), TRUE);
                             break;
-                        } else if (isset($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] != "")) { // let's do the download
-                            $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]);
+                        } else if (isset($listOfEntries["$objId-".\core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-".\core\Options::TYPECODE_FILE] != "")) { // let's do the download
+                            $rawContent = \core\common\OutsideComm::downloadFile("file:///".$listOfEntries["$objId-".\core\Options::TYPECODE_FILE]);
 
                             if ($rawContent === FALSE || !$this->checkUploadSanity($objValue, $rawContent)) {
                                 $bad[] = $objValue;
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
                         }
                         continue 2;
                     default:
-                        throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
+                        throw new Exception("Internal Error: Unknown option type ".$objValue."!");
                 }
                 // lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
                 $retval[] = ["$objValue" => ["lang" => $lang, "content" => $content]];

Please login to merge, or discard this patch.

web/lib/admin/AbstractMap.php 1 patch

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
 namespace web\lib\admin;
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 /**
  * This class provides map display functionality
@@ -121,19 +121,19 @@  discard block
 block discarded – undo
     protected function htmlPreEdit($wizardMode, $additional) {
         \core\common\Entity::intoThePotatoes();
         $retval = "<fieldset class='option_container'>
-        <legend><strong>" . _("Location") . "</strong></legend>";
+        <legend><strong>" . _("Location")."</strong></legend>";
 
         if ($wizardMode) {
-            $retval .= "<p>" .
-                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.") .
+            $retval .= "<p>".
+                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.").
                     "</p>
                      <ul>" .
                     _("<li>Drag the marker in the map to your place, or</li>
 <li>enter your street address in the field below for lookup, or</li>
-<li>use the 'Locate Me!' button</li>") .
+<li>use the 'Locate Me!' button</li>").
                     "</ul>
                      <strong>" .
-                    _("We will use the coordinates as indicated by the marker for geolocation.") .
+                    _("We will use the coordinates as indicated by the marker for geolocation.").
                     "</strong>";
         }
         if ($additional) {
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
      */
     protected function htmlPostEdit($allowDirectInput) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>";
+        $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

Please login to merge, or discard this patch.

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	?>
27	27	<?php
28	28
29		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	29	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
30	30
31	31	/**
32	32	* This class parses HTML field input from POST and FILES and extracts valid and authorized options to be set.
		@@ -344,14 +344,14 @@ discard block
		block discarded – undo
344	344	case \core\Options::TYPECODE_TEXT:
345	345	case \core\Options::TYPECODE_COORDINATES:
346	346	case \core\Options::TYPECODE_INTEGER:
347		- $varName = "$objId-" . $validators[$optioninfo['type']]['field'];
	347	+ $varName = "$objId-".$validators[$optioninfo['type']]['field'];
348	348	if (!empty($listOfEntries[$varName])) {
349	349	$content = call_user_func_array([$this->validator, $validators[$optioninfo['type']]['function']], array_merge([$listOfEntries[$varName]], $validators[$optioninfo['type']]['extraarg']));
350	350	break;
351	351	}
352	352	continue 2;
353	353	case \core\Options::TYPECODE_BOOLEAN:
354		- $varName = "$objId-" . \core\Options::TYPECODE_BOOLEAN;
	354	+ $varName = "$objId-".\core\Options::TYPECODE_BOOLEAN;
355	355	if (!empty($listOfEntries[$varName])) {
356	356	$contentValid = $this->validator->boolean($listOfEntries[$varName]);
357	357	if ($contentValid) {
		@@ -364,24 +364,24 @@ discard block
		block discarded – undo
364	364	}
365	365	continue 2;
366	366	case \core\Options::TYPECODE_STRING:
367		- if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) {
	367	+ if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) {
368	368	switch ($objValue) {
369	369	case "media:consortium_OI":
370		- $content = $this->validator->consortiumOI($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
	370	+ $content = $this->validator->consortiumOI($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
371	371	if ($content === FALSE) {
372	372	$bad[] = $objValue;
373	373	continue 3;
374	374	}
375	375	break;
376	376	case "media:remove_SSID":
377		- $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
	377	+ $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
378	378	if ($content == "eduroam") {
379	379	$bad[] = $objValue;
380	380	continue 3;
381	381	}
382	382	break;
383	383	case "media:force_proxy":
384		- $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
	384	+ $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
385	385	$serverAndPort = explode(':', strrev($content), 2);
386	386	if (count($serverAndPort) != 2) {
387	387	$bad[] = $objValue;
		@@ -394,33 +394,33 @@ discard block
		block discarded – undo
394	394	}
395	395	break;
396	396	case "support:url":
397		- $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
398		- if (preg_match("/^http/",$content) != 1) {
	397	+ $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
	398	+ if (preg_match("/^http/", $content) != 1) {
399	399	$bad[] = $objValue;
400	400	continue 3;
401	401	}
402	402	break;
403	403	case "support:email":
404		- $content = $this->validator->email($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
	404	+ $content = $this->validator->email($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
405	405	if ($content === FALSE) {
406	406	$bad[] = $objValue;
407	407	continue 3;
408	408	}
409	409	break;
410	410	default:
411		- $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
	411	+ $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
412	412	break;
413	413	}
414	414	break;
415	415	}
416	416	continue 2;
417	417	case \core\Options::TYPECODE_FILE:
418		- if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) { // was already in, by ROWID reference, extract
	418	+ if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) { // was already in, by ROWID reference, extract
419	419	// ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
420		- $content = $this->validator->string(urldecode($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]), TRUE);
	420	+ $content = $this->validator->string(urldecode($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]), TRUE);
421	421	break;
422		- } else if (isset($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] != "")) { // let's do the download
423		- $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]);
	422	+ } else if (isset($listOfEntries["$objId-".\core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-".\core\Options::TYPECODE_FILE] != "")) { // let's do the download
	423	+ $rawContent = \core\common\OutsideComm::downloadFile("file:///".$listOfEntries["$objId-".\core\Options::TYPECODE_FILE]);
424	424
425	425	if ($rawContent === FALSE \|\| !$this->checkUploadSanity($objValue, $rawContent)) {
426	426	$bad[] = $objValue;
		@@ -431,7 +431,7 @@ discard block
		block discarded – undo
431	431	}
432	432	continue 2;
433	433	default:
434		- throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
	434	+ throw new Exception("Internal Error: Unknown option type ".$objValue."!");
435	435	}
436	436	// lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
437	437	$retval[] = ["$objValue" => ["lang" => $lang, "content" => $content]];

		@@ -53,10 +53,10 @@
		block discarded – undo
53	53	$ourlocale = $this->langObject->getLang();
54	54	header("Content-Type:text/html;charset=utf-8");
55	55	echo "<!DOCTYPE html>
56		- <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
57		- <head lang='" . $ourlocale . "'>
	56	+ <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale."'>
	57	+ <head lang='" . $ourlocale."'>
58	58	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
59		- echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
	59	+ echo "<title>".htmlspecialchars($pagetitle)."</title>";
60	60	echo '<script type="text/javascript">ie_version = 0;</script>
61	61	<!--[if IE]>
62	62	<script type="text/javascript">ie_version=1;</script>

		@@ -49,13 +49,13 @@ discard block
		block discarded – undo
49	49	$retval = "<div class='sidebar'><p>";
50	50
51	51	if ($advancedControls) {
52		- $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
	52	+ $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
53	53	."<br/>
54	54	<br/>
55		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a>
56		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
	55	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a>
	56	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
57	57	}
58		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
	58	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
59	59	</p>
60	60	</div> <!-- sidebar -->";
61	61	\core\common\Entity::outOfThePotatoes();
		@@ -79,22 +79,22 @@ discard block
		block discarded – undo
79	79	<h1>$cap1</h1>
80	80	</div><!--header_captions-->
81	81	<div id='langselection' style='padding-top:20px; padding-left:10px;'>
82		- <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "
	82	+ <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."
83	83	<select id='lang' name='lang' onchange='this.form.submit()'>";
84	84
85	85	foreach (CONFIG['LANGUAGES'] as $lang => $value) {
86		- $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
	86	+ $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$value['display']."</option> ";
87	87	}
88	88	$retval .= "</select>";
89	89
90	90	foreach ($_GET as $var => $value) {
91	91	if ($var != "lang" && $value != "") {
92		- $retval .= "<input type='hidden' name='" . htmlspecialchars($var) . "' value='" . htmlspecialchars($value) . "'>";
	92	+ $retval .= "<input type='hidden' name='".htmlspecialchars($var)."' value='".htmlspecialchars($value)."'>";
93	93	}
94	94	}
95	95	$retval .= "</form>
96	96	</div><!--langselection-->";
97		- $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
	97	+ $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
98	98	$retval .= "<div class='consortium_logo'>
99	99	<img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
100	100	</div> <!-- consortium_logo -->
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187
188	188	if (isset(CONFIG['APPEARANCE']['MOTD']) && CONFIG['APPEARANCE']['MOTD'] != "") {
189	189	$retval .= "<div id='header_MOTD' style='display:inline-block; padding-left:20px;vertical-align:top;'>
190		- <p class='MOTD'>" . CONFIG['APPEARANCE']['MOTD'] . "</p>
	190	+ <p class='MOTD'>" . CONFIG['APPEARANCE']['MOTD']."</p>
191	191	</div><!--header_MOTD-->";
192	192	}
193	193	$retval .= $this->sidebar($advancedControls);
		@@ -213,9 +213,9 @@ discard block
		block discarded – undo
213	213	<html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'>
214	214	<head lang='$ourlocale'>
215	215	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
216		- $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
	216	+ $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
217	217	$retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
218		- $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
	218	+ $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
219	219	return $retval;
220	220	}
221	221
		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	// we may need to jump up one dir if we are either in admin/ or accountstatus/
230	230	// (accountstatus courtesy of my good mood. It's userspace not admin space so
231	231	// it shouldn't be using this function any more.)
232		- $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
	232	+ $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
233	233	return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
234	234	<img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
235	235	<span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";
		@@ -251,9 +251,9 @@ discard block
		block discarded – undo
251	251	<table style='width:100%'>
252	252	<tr>
253	253	<td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
254		- " . $cat->CAT_COPYRIGHT . "</td>";
	254	+ " . $cat->CAT_COPYRIGHT."</td>";
255	255	if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
256		- $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</a></td>";
	256	+ $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</a></td>";
257	257	}
258	258	$retval .= " <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>";
259	259

		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23
24	24	use Exception;
25	25
26		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	26	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
27	27	require_once CONFIG['AUTHENTICATION']['ssp-path-to-autoloader'];
28	28
29	29	/**
		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122	if ($trailerPosition !== FALSE) {
123	123	$base = substr($scriptself, 0, $trailerPosition);
124	124	if ($base !== FALSE) {
125		- $url = "//$servername" . $base . "/logout_check.php";
	125	+ $url = "//$servername".$base."/logout_check.php";
126	126	}
127	127	}
128	128

		@@ -83,7 +83,7 @@
		block discarded – undo
83	83	*/
84	84	public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
85	85	if (!$this->readOnly) {
86		- // return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
	86	+ // return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
87	87	return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
88	88	}
89	89	}

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21
22	22	namespace web\lib\admin;
23	23
24		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	24	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
25	25
26	26	/**
27	27	* This class provides map display functionality
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
85	85	if (!$this->readOnly) {
86	86	// return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
87		- return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
	87	+ return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml().$this->htmlPostEdit(TRUE);
88	88	}
89	89	}
90	90
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	// quiesce warnings about unused parameter
109	109	sprintf("%d", $number);
110	110	$pair = json_decode($coords, true);
111		- return "<table><tr><td>Latitude</td><td><strong>" . $pair['lat'] . "</strong></td></tr><tr><td>Longitude</td><td><strong>" . $pair['lon'] . "</strong></td></tr></table>";
	111	+ return "<table><tr><td>Latitude</td><td><strong>".$pair['lat']."</strong></td></tr><tr><td>Longitude</td><td><strong>".$pair['lon']."</strong></td></tr></table>";
112	112	}
113	113
114	114	/**
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	*/
119	119	private function findLocationHtml() {
120	120	\core\common\Entity::intoThePotatoes();
121		- $retval = "<button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
	121	+ $retval = "<button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
122	122	\core\common\Entity::outOfThePotatoes();
123	123	return $retval;
124	124	}

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22
23	23	namespace web\lib\admin;
24	24
25		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	25	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
26	26
27	27	/**
28	28	* This class provides map display functionality
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85
86	86	// use HTML5 geolocation
87	87	function locateMe() {
88		- $('#address').val(\"" . _("locating") . "\");
	88	+ $('#address').val(\"" . _("locating")."\");
89	89	navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
90	90	}
91	91
		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207	view.fit(extent, {padding: [10, 0, 10, 0]});
208	208	} else {
209	209	view.setCenter([0,0]);
210		- locate_country('" . $cat->knownFederations[strtoupper($this->fedName)] . "'); // use the federation code to locate the country
	210	+ locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]."'); // use the federation code to locate the country
211	211	map.setView(view);
212	212	}
213	213	view.setMaxZoom(20);
		@@ -229,14 +229,14 @@ discard block
		block discarded – undo
229	229	function getAddressLocation() {
230	230	var city = $('#address').val();
231	231	if(city == '') {
232		- alert(\"" . _("nothing entered in the address field") . "\");
	232	+ alert(\"" . _("nothing entered in the address field")."\");
233	233	return false;
234	234	}
235	235	city = city.replace(/\s,\s/g,',+');
236	236	city = city.replace(/ +/,'+');
237	237	$.get(addressService+'?format=json&addressdetails=0&q='+city, '', function(data) {
238	238	if (data[0] === undefined) {
239		- alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
	239	+ alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
240	240	return;
241	241	}
242	242	showTmpPointer(data[0].lon, data[0].lat);
		@@ -287,7 +287,7 @@ discard block
		block discarded – undo
287	287	if ($this->readOnly) {
288	288	return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
289	289	} else {
290		- return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
	290	+ return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
291	291	}
292	292	}
293	293
		@@ -310,7 +310,7 @@ discard block
		block discarded – undo
310	310	*/
311	311	public static function optionListDisplayCode($coords, $number) {
312	312	\core\common\Entity::intoThePotatoes();
313		- $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
	313	+ $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
314	314	\core\common\Entity::outOfThePotatoes();
315	315	return $retval;
316	316	}
		@@ -322,7 +322,7 @@ discard block
		block discarded – undo
322	322	*/
323	323	private function findLocationHtml() {
324	324	\core\common\Entity::intoThePotatoes();
325		- $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
	325	+ $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
326	326	\core\common\Entity::outOfThePotatoes();
327	327	return $retval;
328	328	}

		@@ -34,8 +34,8 @@ discard block
		block discarded – undo
34	34	*/
35	35	public static function deleteObsoleteTempDirs() {
36	36	$downloadsDirs = [
37		- 'site_installers' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/installer_cache",
38		- 'silverbullet' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/silverbullet"
	37	+ 'site_installers' => dirname(dirname(dirname(dirname(__FILE__))))."/var/installer_cache",
	38	+ 'silverbullet' => dirname(dirname(dirname(dirname(__FILE__))))."/var/silverbullet"
39	39	];
40	40	$tm = time();
41	41	$i = 0;
		@@ -54,14 +54,14 @@ discard block
		block discarded – undo
54	54	if ($entry === '.' \|\| $entry === '..' \|\| $entry === '.gitignore') {
55	55	continue;
56	56	}
57		- $ftime = $tm - filemtime($downloads . '/' . $entry);
	57	+ $ftime = $tm - filemtime($downloads.'/'.$entry);
58	58	if ($ftime < 3600) {
59	59	continue;
60	60	}
61	61	if (isset($Cache[$entry])) {
62	62	continue;
63	63	}
64		- \core\common\Entity::rrmdir($downloads . '/' . $entry);
	64	+ \core\common\Entity::rrmdir($downloads.'/'.$entry);
65	65	$i = $i + 1;
66	66	print "$entry\n";
67	67	}

GEANT / CAT

Push — release_2_0 ( aff697...948471 )

Status

Category

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

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

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

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

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

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

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

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

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

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