GEANT / CAT

web/admin/inc/common.inc.php

Spacing +3 added lines, -3 removed lines

@@ -250,7 +250,7 @@ 
         $filetype = $info->buffer($filename, FILEINFO_MIME_TYPE);
 
         // we only take plain text files in UTF-8!
-        if ( $filetype == "text/plain" && iconv("UTF-8", "UTF-8", $filename) !== FALSE)
+        if ($filetype == "text/plain" && iconv("UTF-8", "UTF-8", $filename) !== FALSE)
             return TRUE;
     }
 
@@ -316,7 +316,7 @@ 
 
     $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
     $details['name'] = preg_replace('/\//', "", $details['name']);
-    $certstatus = ( $details['root'] == 1 ? "R" : "I");
+    $certstatus = ($details['root'] == 1 ? "R" : "I");
     if ($details['ca'] == 0 && $details['root'] != 1)
         return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
     else
@@ -391,7 +391,7 @@ 
                     }
                     break;
                 case "boolean":
-                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                    $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                     break;
                 default:
                     $retval .= "<tr><td>" . display_name($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";

web/admin/inc/manageAdmins.inc.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 
         echo "</td>
               <td>
-                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'>
+                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "") . " accept-charset='UTF-8'>
                 <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input>
                 <button type='submit' name='submitbutton' class='delete' value='" . BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
                 </form>

web/admin/inc/manageDBLink.inc.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 // if we have a pushed close button, submit attributes and send user back to the overview page
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE ) || Config::$DB['enforce-external-sync'] == FALSE)
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == BUTTON_CLOSE) || Config::$DB['enforce-external-sync'] == FALSE)
     header("Location: ../overview_federation.php");
 
 // if not, must operate on a proper IdP

web/admin/inc/sendinvite.inc.php

Spacing +4 added lines, -5 removed lines

@@ -130,17 +130,17 @@ 
 // then, send out the mail
 $message = _("Hello,") . "
     
-" . wordwrap($introtext, 72)  . "
+" . wordwrap($introtext, 72) . "
     
 ";
 
 if ($new_idp_authorized_fedadmin) { // see if we are supposed to add a custom message
     $customtext = $federation->getAttributes('fed:custominvite');
     if (count($customtext) > 0)
-        $message .= wordwrap(_("Additional message from your federation administrator:"),72) . "
+        $message .= wordwrap(_("Additional message from your federation administrator:"), 72) . "
 ---------------------------------
 "
-                  . wordwrap($customtext[0]['value'],72) . "
+                  . wordwrap($customtext[0]['value'], 72) . "
 ---------------------------------
 
 ";
@@ -158,8 +158,7 @@ 
         _("and enter the invitation token") . "
     $newtoken
 " . ( /* $new_idp_authorized_fedadmin */ FALSE ?
-                wordwrap(_("manually. If you reply to this mail, you will reach the federation administrators of your federation."), 72) :
-                wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
+                wordwrap(_("manually. If you reply to this mail, you will reach the federation administrators of your federation."), 72) : wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
 
 " . wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "
 

web/admin/inc/option_xhr.inc.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     case "eap-specific":
         break;
     default:
-        debug(1,"Unknown type of option!");
+        debug(1, "Unknown type of option!");
         exit(1);
     }
     // echo "<pre>".print_r($list)."</pre>";

web/admin/inc/option_html.inc.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
     // print_r($prepopulate);
     $optioninfo = Options::instance();
     // print_r($prepopulate);
-    if (is_array($prepopulate) && ( count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific") ) { // editing... fill with values
+    if (is_array($prepopulate) && (count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific")) { // editing... fill with values
         $a = 0;
         foreach ($prepopulate as $option)
             if (preg_match("/$class:/", $option['name']) && !preg_match("/(profile:QR-user|user:fedadmin)/", $option['name'])) {
@@ -102,16 +102,16 @@ 
         $a = 0;
         foreach ($list as $key => $value) {
             $listtype = $optioninfo->optionType($value);
-            $retval .="<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
+            $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
             if ($a == $defaultselect) {
                 $retval .= "selected='selected'";
                 $activelisttype = $listtype;
             }
-            $retval .=">" . display_name($value). "</option>";
+            $retval .= ">" . display_name($value) . "</option>";
             $a++;
         }
-        $retval .="</select></td>";
-        $retval .="<td>
+        $retval .= "</select></td>";
+        $retval .= "<td>
           <select style='display:" . ($activelisttype["flag"] == "ML" ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'>
             <option value='' name='select_language' selected>" . _("select language") . "</option>
             <option value='C' name='all_languages'>" . _("default/other languages") . "</option>";
@@ -171,7 +171,7 @@ 
                 $global_location_count++;
                 $location_index = $global_location_count;
                 $link = "<button id='location_b_$global_location_count' class='location_button'>" . _("Click to see location") . " $global_location_count</button>";
-                $retval .="<input readonly style='display:none' type='text' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value='$prefill'>$link";
+                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value='$prefill'>$link";
                 break;
             case "file":
                 $retval .= "<input readonly type='text' name='value[S$rowid-1]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($content) . "'>";
@@ -191,10 +191,10 @@ 
                 };
                 break;
             case "string":
-                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-0]' id='S" . $rowid . "-input-string' value=\"".htmlspecialchars($content)."\" style='display:block'>";
+                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-0]' id='S" . $rowid . "-input-string' value=\"" . htmlspecialchars($content) . "\" style='display:block'>";
                 break;
             case "text":
-                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value=\"".htmlspecialchars($content)."\" style='display:block'>";
+                $retval .= "<strong>$content</strong><input type='hidden' name='value[S$rowid-1]' id='S" . $rowid . "-input-text' value=\"" . htmlspecialchars($content) . "\" style='display:block'>";
                 break;
             case "boolean":
                 if ($content == "on")
@@ -213,7 +213,7 @@ 
         };
         $retval .= "</td>";
     }
-    $retval .="
+    $retval .= "
 
        <td>
           <button type='button' class='delete' onclick='deleteOption(" . $location_index . ",\"option-S" . $rowid . "\")'>-</button>

web/admin/inc/manageNewInst.inc.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
                 $entities = $thefed->listExternalEntities(TRUE);
 
                 foreach ($entities as $v) {
-                echo "<option id='".$v['contactlist']."' value='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
+                echo "<option id='" . $v['contactlist'] . "' value='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
             }
             }
 
@@ -110,9 +110,9 @@ 
         </tr>
     </table>
     <hr/>
-    <button type='submit' name='submitbutton' value='<?php echo BUTTON_SAVE;?>'><?php echo _("Send invitation"); ?></button>
+    <button type='submit' name='submitbutton' value='<?php echo BUTTON_SAVE; ?>'><?php echo _("Send invitation"); ?></button>
 </form>
 <br/>
 <form action='inc/manageNewInst.inc.php' method='post' accept-charset='UTF-8'>
-    <button type='submit' name='submitbutton' value='<?php echo BUTTON_CLOSE;?>'><?php echo _("Close"); ?></button>
+    <button type='submit' name='submitbutton' value='<?php echo BUTTON_CLOSE; ?>'><?php echo _("Close"); ?></button>
 </form>

web/tou.php

Spacing +6 added lines, -6 removed lines

@@ -18,13 +18,13 @@ 
 include(dirname(dirname(__FILE__)) . "/config/_config.php");
 require_once("UserAPI.php");
 
-debug(4,"\n----------------------------------TOU.PHP------------------------\n");
+debug(4, "\n----------------------------------TOU.PHP------------------------\n");
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo CAT::get_lang()?>">
     <head lang="<?php echo CAT::get_lang()?>"> 
-        <title><?php echo Config::$APPEARANCE['productname_long'];?></title>
-<link media="only screen and (max-device-width: 480px)" href="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/') ?>/resources/css/cat-basic.css.php" type= "text/css" rel="stylesheet" />
+        <title><?php echo Config::$APPEARANCE['productname_long']; ?></title>
+<link media="only screen and (max-device-width: 480px)" href="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/css/cat-basic.css.php" type= "text/css" rel="stylesheet" />
 <link media="only screen and (min-device-width: 481px)" href="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/css/cat-basic-large.css" type= "text/css" rel="stylesheet" />
         <meta charset="utf-8" /> 
 <script type="text/javascript">
@@ -39,7 +39,7 @@ 
     <body style="">
         <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" />
          <?php
-            print '<div id="motd">'.( isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp' ).'</div>'; 
+            print '<div id="motd">' . (isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp') . '</div>'; 
 
         print '<h1><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . CAT::get_lang() . '">' . Config::$APPEARANCE['productname'] . '</a></h1>';
 print '<div id="tou">';
@@ -48,11 +48,11 @@ 
 
 // this variable gets set during "make distribution" only
 $RELEASE = "THERELEASE";
-echo "".Config::$APPEARANCE['productname']." - ";
+echo "" . Config::$APPEARANCE['productname'] . " - ";
 if ($RELEASE != "THERELEASE") 
     echo sprintf(_("Release %s"), $RELEASE);
 else
     echo _("Unreleased SVN Revision");
-echo " &copy; 2011-13 DANTE Ltd. on behalf of the GN3 and GN3plus consortia</div>";?>
+echo " &copy; 2011-13 DANTE Ltd. on behalf of the GN3 and GN3plus consortia</div>"; ?>
 </body>
 </html>

web/user/js/cat_js.php

Spacing +15 added lines, -15 removed lines

@@ -57,7 +57,7 @@ 
     result = j.status;
     if(! result) {
       alert("<?php echo _("no matching data found")?>");
-      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
+      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
     }
     j = j.data;
     n = j.length;
@@ -185,11 +185,11 @@ 
          $("#profile_desc").text('');
        }
        if(j.local_url !== undefined && j.local_url) 
-         txt = txt+'<tr><td><?php echo _("WWW:");?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
+         txt = txt+'<tr><td><?php echo _("WWW:"); ?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
        if(j.local_email !== undefined && j.local_email) 
-         txt = txt+'<tr><td><?php echo _("email:");?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
+         txt = txt+'<tr><td><?php echo _("email:"); ?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
        if(j.local_phone !== undefined && j.local_phone) 
-         txt = txt+'<tr><td><?php echo _("tel:");?></td><td>'+j.local_phone+'</td></tr>';
+         txt = txt+'<tr><td><?php echo _("tel:"); ?></td><td>'+j.local_phone+'</td></tr>';
        if(txt) 
          txt = "<table><tr><th colspan='2'><?php echo _("If you encounter problems, then you can obtain direct assistance from you home organisation at:"); ?></th></tr>"+txt+'</table>';
         else 
@@ -218,7 +218,7 @@ 
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
           $("#"+v.id+",#g_"+v.id).click(function(event){
             i_div = $("#info_"+$(this).attr('id'));
-            t = "<?php echo _("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab.")?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php echo _("Continue");?></a></span>";
+            t = "<?php echo _("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab.")?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php echo _("Continue"); ?></a></span>";
             i_div.html(t);
             $(".redirect_link").click(function(event) {
                i_div.hide();
@@ -226,13 +226,13 @@ 
                
           });
         } else if(v.device_customtext != '0' || v.eap_customtext != '0' || v.message != '0' || v.status > 0) {
-          var continue_text = "<?php echo _("Continue");?>";
+          var continue_text = "<?php echo _("Continue"); ?>";
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
           $("#"+v.id+",#g_"+v.id).click(function(event){
             i_div = $("#info_"+$(this).attr('id'));
             if(v.status > 0) {
               t = "<?php echo _("This device cannot be configured with settings provided by your institution")?>";
-              continue_text = "<?php echo _("Close");?>";
+              continue_text = "<?php echo _("Close"); ?>";
             } else {
             t = i_div.html();
             if(v.message != '0') {
@@ -330,7 +330,7 @@ 
     return(Math.round(windowWidth/2));
 }
 
-<?php if(isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
+<?php if (isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
       print "front_page = 0;\n";
 } ?>
 
@@ -369,10 +369,10 @@ 
     $("#download_info a").attr('href',download_link);
     $('#download_info').show();
     if( generateTimer > 0 ) {
-       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link",generateTimer);
+       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link",generateTimer);
     }
     else {
-       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link;
+       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link;
     }
   }
 }
@@ -463,13 +463,13 @@ 
   $(window).resize(set_front_page);
   resetDevices();
  <?php 
-if(isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
-    if(! is_numeric($_REQUEST['idp']))
+if (isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
+    if (!is_numeric($_REQUEST['idp']))
         exit;
     $p_id = (isset($_REQUEST['profile']) && $_REQUEST['profile']) ? $_REQUEST['profile'] : 0; 
-    if(! is_numeric($p_id))
+    if (!is_numeric($p_id))
         exit;
-   print 'listProfiles('.$_REQUEST['idp'].','.$p_id.');';
+   print 'listProfiles(' . $_REQUEST['idp'] . ',' . $p_id . ');';
 }
  ?>
 
@@ -497,7 +497,7 @@ 
    "title":"<?php echo _("Home institution") ?>",
    "subtitle":"<?php echo _("Select your <strong>institution<\/strong>") ?>",
    "textHelp": "<?php echo _("Help, my institution is not on the list") ?>",
-   "textHelpMore": "<?php echo sprintf(_("This system relies on information supplied by local %s administrators. If your institution is not on the list, then nag them to add information to the %s database."),Config::$CONSORTIUM['name'],Config::$APPEARANCE['productname']); ?>",
+   "textHelpMore": "<?php echo sprintf(_("This system relies on information supplied by local %s administrators. If your institution is not on the list, then nag them to add information to the %s database."), Config::$CONSORTIUM['name'], Config::$APPEARANCE['productname']); ?>",
    "textLocateMe": "<?php echo _("Locate me more accurately using HTML5 Geo-Location") ?>",
    "textShowProviders": "<?php echo _("Show institutions in") ?>",
    "textAllCountries": "<?php echo _("all countries") ?>",