GEANT / CAT

ansible/ManagedSP/templates/web/lib.inc

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 function cat_socket($obj) {
    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
    $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
+   if ($conn) {
+     socket_write($sock, $obj, strlen($obj));
+     $out = socket_read($sock, 2048);
      return $out;
    }
    return 'FAILURE';

Indentation +8 added lines, -8 removed lines

@@ -2,12 +2,12 @@
 define('SOCKET', '/opt/Socket/CAT_requests/queue');
 
 function cat_socket($obj) {
-   $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
-   $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
-     return $out;
-   }
-   return 'FAILURE';
+    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
+    $conn = socket_connect($sock, SOCKET);
+    if ( $conn ) {
+        socket_write ($sock, $obj, strlen($obj));
+        $out = socket_read ($sock, 2048);
+        return $out;
+    }
+    return 'FAILURE';
 }

web/lib/admin/MapGoogle.php

Spacing +14 added lines, -14 removed lines

@@ -47,7 +47,7 @@ 
     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\Master::APPEARANCE['google_maps_api_key'] . "'></script>
+        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".\config\Master::APPEARANCE['google_maps_api_key']."'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;
@@ -103,19 +103,19 @@ 
          *
          */
         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);
                     }
@@ -128,7 +128,7 @@ 
          */
         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);
@@ -207,7 +207,7 @@ 
         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) {
@@ -227,7 +227,7 @@ 
          * trigger geolocation
          */
         function locateMe() {
-            $('#address').val(\"" . _("locating") . "\");
+            $('#address').val(\"" . _("locating")."\");
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
         }
 
@@ -345,7 +345,7 @@ 
         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);
         }
     }
 
@@ -358,11 +358,11 @@ 
      */
     public static function optionListDisplayCode($coords, $number) {
         // quiesce warnings about unused variable
-        if (strlen(sprintf("%s", $coords)) <0) {
+        if (strlen(sprintf("%s", $coords)) < 0) {
             throw new \Exception("A miracle! A string with negative length!");
         };
         \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 @@ 
      * @return string
      */
     public function bodyTagCode() {
-        return "onload='load(" . ($this->readOnly ? "0" : "1") . ")'";
+        return "onload='load(".($this->readOnly ? "0" : "1").")'";
     }
 
     /**
@@ -383,7 +383,7 @@ 
      */
     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;
     }

web/admin/edit_user.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $uiElements = new web\lib\admin\UIElements();
@@ -37,14 +37,14 @@ 
     </h1>
     <div class='infobox'>
         <h2>
-            <?php $tablecaption = _("Current User Attributes"); echo $tablecaption;?>
+            <?php $tablecaption = _("Current User Attributes"); echo $tablecaption; ?>
         </h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
         </table>

web/admin/edit_user_result.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $loggerInstance = new \core\common\Logging();
 $deco = new \web\lib\admin\PageDecoration();
@@ -29,7 +29,7 @@ 
 
 $user = new \core\User($_SESSION['user']);
 if (!isset($_POST['submitbutton']) || $_POST['submitbutton'] != web\lib\common\FormElements::BUTTON_SAVE) { // what are we supposed to do?
-    echo "<p>" . _("The page was called with insufficient data. Please report this as an error.") . "</p>";
+    echo "<p>"._("The page was called with insufficient data. Please report this as an error.")."</p>";
     echo $deco->footer();
     exit(0);
 }
@@ -46,7 +46,7 @@ 
 if (isset($_POST['option'])) {
     foreach ($_POST['option'] as $opt_id => $optname) {
         if ($optname == "user:fedadmin") {
-            echo "Security violation: user tried to make himself " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " administrator!";
+            echo "Security violation: user tried to make himself ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." administrator!";
             exit(1);
         }
     }
@@ -71,11 +71,11 @@ 
 ?>
 <h1><?php $tablecaption = _("Submitted attributes for this user"); echo $tablecaption; ?></h1>
 <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
                             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Overall Result");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Details");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Overall Result"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Details"); ?></th>
             </tr>
     <?php
     echo $optionParser->processSubmittedFields($user, $_POST, $_FILES);

web/admin/inc/displayQRcode.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $languageInstance = new \core\common\Language();
@@ -38,8 +38,8 @@ 
 $invitationObject = new core\SilverbulletInvitation($validator->token(filter_input(INPUT_POST, 'token')));
 header("Content-Type:text/html;charset=utf-8");
 ?>
-<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1>
-<img alt='<?php echo _("Invitation Token QR Code");?>' style='float:none' src='data:image/png;base64,<?php 
+<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1>
+<img alt='<?php echo _("Invitation Token QR Code"); ?>' style='float:none' src='data:image/png;base64,<?php 
 $size = 10;
 $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
                     'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
@@ -51,5 +51,5 @@ 
 if (empty($rawQr)) {
     throw new Exception("Something went seriously wrong during QR code generation!");
 }
-echo base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, $size));?>'/>
-<p>(<a href='<?php echo $invitationObject->link();?>'><?php echo $invitationObject->link();?>)</a></p>
+echo base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, $size)); ?>'/>
+<p>(<a href='<?php echo $invitationObject->link(); ?>'><?php echo $invitationObject->link(); ?>)</a></p>

web/skins/modern/copyright.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
 <link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
 </head>
 <body>
 <div id="wrap">
@@ -35,7 +35,7 @@ 
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>

web/skins/example/accountstatus.php

Spacing +5 added lines, -5 removed lines

@@ -16,12 +16,12 @@
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */?>
-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
 <pre>
-    <?php print_r($statusInfo);?>
+    <?php print_r($statusInfo); ?>
 </pre>

web/skins/example/index.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@
  */
 ?>
 <h1>Example Skin (main user frontpage)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

web/tou.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
  * @package UserGUI
  * 
  */
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $loggerInstance = new \core\common\Logging();
 $langObject = new \core\common\Language();
 $cat = new \core\CAT();
@@ -51,9 +51,9 @@ 
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
 
-        <div id="motd"><?php print ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
+        <div id="motd"><?php print (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
 
-        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
+        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
         <div id="tou">
             <?php
             require "user/tou.php";
@@ -61,11 +61,11 @@ 
         </div>
         <div>
             <table style='width:100%'>
-                <caption><?php echo "Legalese";?></caption>
+                <caption><?php echo "Legalese"; ?></caption>
                 <tr>
-                    <th class='wai-invisible' scope='col'><?php echo "Copyright";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Attribution";?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Copyright"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Attribution"; ?></th>
                 </tr>
                 <tr>
                     <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
@@ -73,7 +73,7 @@ 
                     </td>
                     <?php
                     if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
-                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['name']) . "</a></td>";
+                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['name'])."</a></td>";
                     }
                     ?>
                     <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>