GEANT / CAT

web/admin/edit_federation_result.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 pageheader(sprintf(_("%s: Federation Customisation (submission completed)"), Config::$APPEARANCE['productname']), "FEDERATION");
 $my_fed = valid_Fed($_GET['fed_id'], $_SESSION['user']);
 if (isset($_POST['submitbutton'])) {
-    if (( $_POST['submitbutton'] == BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
+    if (($_POST['submitbutton'] == BUTTON_SAVE) && isset($_POST['option']) && isset($_POST['value'])) { // here we go
         $fed_name = $my_fed->identifier;
         echo "<h1>" . sprintf(_("Submitted attributes for federation '%s'"), $fed_name) . "</h1>";
         $remaining_attribs = $my_fed->beginflushAttributes();

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/user/js/roll.php

Indentation +6 added lines, -7 removed lines

@@ -68,13 +68,12 @@
 
 <?php
 /**
-  * The OS object holds operating system descriptions
-  * @param name is the main title
-  * @param subtitle - the subtitle
-  * @param path - the path to the scriin-dump image
-  * @param signed - if true show information that the module is signed
-    
-*/
+ * The OS object holds operating system descriptions
+ * @param name is the main title
+ * @param subtitle - the subtitle
+ * @param path - the path to the scriin-dump image
+ * @param signed - if true show information that the module is signed
+ */
 ?>
 
 function OS(name, subtitle, path, signed) {

web/user/js/cat_js.php

Indentation +8 added lines, -8 removed lines

@@ -331,7 +331,7 @@ 
 }
 
 <?php if(isset($_REQUEST['idp']) && $_REQUEST['idp']) { 
-      print "front_page = 0;\n";
+        print "front_page = 0;\n";
 } ?>
 
 function showTOU(){
@@ -469,9 +469,9 @@ 
     $p_id = (isset($_REQUEST['profile']) && $_REQUEST['profile']) ? $_REQUEST['profile'] : 0; 
     if(! is_numeric($p_id))
         exit;
-   print 'listProfiles('.$_REQUEST['idp'].','.$p_id.');';
+    print 'listProfiles('.$_REQUEST['idp'].','.$p_id.');';
 }
- ?>
+    ?>
 
 $(".signin").click(function(event){
      pressedButton = $(this);
@@ -532,12 +532,12 @@ 
         });
 DiscoJuice.Constants.Countries = {
 <?php 
-  $C = $Gui->printCountryList(1);
-     $ret = '';
-   foreach ($C as $key => $val) {
+    $C = $Gui->printCountryList(1);
+        $ret = '';
+    foreach ($C as $key => $val) {
     $ret .= "'$key': \"$val\",";
-   }
-   echo substr($ret, 0, -1);
+    }
+    echo substr($ret, 0, -1);
 ?>
         };
 

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,15 +463,15 @@ 
   $(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 . ');';
 }
  ?>
 
@@ -499,7 +499,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") ?>",

web/user/cat_back.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 // extract request parameters; action is mandatory
 if(!isset($_REQUEST['action']))
-   exit;
+    exit;
 
 $action  = $_REQUEST['action'];
 $id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );

Spacing +11 added lines, -11 removed lines

@@ -10,26 +10,26 @@ 
  *
  * @package UserAPI
  */
-include(dirname(dirname(dirname(__FILE__)))."/config/_config.php");
+include(dirname(dirname(dirname(__FILE__))) . "/config/_config.php");
 include_once("UserAPI.php");
 include_once("Logging.php");
 $API = new UserAPI();
 
 // extract request parameters; action is mandatory
-if(!isset($_REQUEST['action'])) {
+if (!isset($_REQUEST['action'])) {
    exit;
 }
 
 $action  = $_REQUEST['action'];
-$id      = ( isset($_REQUEST['id'])      ? $_REQUEST['id']      : FALSE );
-$lang    = ( isset($_REQUEST['lang'])    ? $_REQUEST['lang']    : FALSE );
-$profile = ( isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE );
-$disco   = ( isset($_REQUEST['disco'])   ? $_REQUEST['disco']   : FALSE );
-$sort    = ( isset($_REQUEST['sort'])    ? $_REQUEST['sort']    : 0 );
-$generatedfor      = ( isset($_REQUEST['generatedfor'])      ? $_REQUEST['generatedfor']      : 'user' );
+$id      = (isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE);
+$lang    = (isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE);
+$profile = (isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE);
+$disco   = (isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE);
+$sort    = (isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0);
+$generatedfor = (isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user');
     
 $loggerInstance = new Logging();
-$loggerInstance->debug(4,"cat_back action: ".$action.':'.$id.':'.$lang.':'.$profile.':'.$disco."\n");
+$loggerInstance->debug(4, "cat_back action: " . $action . ':' . $id . ':' . $lang . ':' . $profile . ':' . $disco . "\n");
 
 switch ($action) {
     case 'listLanguages':
@@ -48,7 +48,7 @@ 
         if ($id === FALSE) {
             exit;
         }
-        $API->JSON_listProfiles($id,$sort);
+        $API->JSON_listProfiles($id, $sort);
         break;
     case 'listDevices':
         $API->JSON_listDevices($id);
@@ -63,7 +63,7 @@ 
         if ($id === FALSE || $profile === FALSE) { 
             exit;
         }
-        $API->downloadInstaller($id, $profile,$generatedfor);
+        $API->downloadInstaller($id, $profile, $generatedfor);
         break;
     case 'profileAttributes': // needs $id set
         if ($id === FALSE) { 

web/download.php

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 $p = new Profile($profile_id);
 
 if(!$p->institution || $p->institution !== $inst_id) {
-  header("HTTP/1.0 404 Not Found");
-  return;
+    header("HTTP/1.0 404 Not Found");
+    return;
 }
 
 // now we generate the installer

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
  * @package UserGUI
  */
 
-include(dirname(dirname(__FILE__))."/config/_config.php");
+include(dirname(dirname(__FILE__)) . "/config/_config.php");
 require_once("UserAPI.php");
 require_once("Logging.php");
 require_once('ProfileFactory.php');
@@ -30,24 +30,24 @@ 
 
 
 if ($generated_for != "admin" && $generated_for != "user") {
-    $loggerInstance->debug(2,"Invalid downloads triggered (neither for admin nor user???)");
+    $loggerInstance->debug(2, "Invalid downloads triggered (neither for admin nor user???)");
     print("Invalid downloads triggered (neither for admin nor user???)");
     exit(1);
 }
 
 //print_r($_REQUEST);
 
-$loggerInstance->debug(4,"download: profile:$profile_id; inst:$instId; device:$device\n");
+$loggerInstance->debug(4, "download: profile:$profile_id; inst:$instId; device:$device\n");
 
 // first block will test if the user input was valid.
 
 $p = ProfileFactory::instantiate($profile_id);
 
-if(!$p->institution || $p->institution !== $instId) {
+if (!$p->institution || $p->institution !== $instId) {
   header("HTTP/1.0 404 Not Found");
   return;
 }
 
 // now we generate the installer
 
-$Gui->downloadInstaller($device,$profile_id, $generated_for);
\ No newline at end of file
+$Gui->downloadInstaller($device, $profile_id, $generated_for);
\ No newline at end of file

web/diag/action_userdiag.php

Braces +23 added lines, -16 removed lines

@@ -67,10 +67,11 @@ 
 
 function mainpage_url() {
     $main_url = valid_host($_SERVER['HTTP_HOST']);
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-        $main_url = "https://" . $main_url;
-    else
-        $main_url = "http://" . $main_url;
+    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+            $main_url = "https://" . $main_url;
+    } else {
+            $main_url = "http://" . $main_url;
+    }
     $main_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/diag/"));
     return $main_url;
 }
@@ -135,8 +136,9 @@ 
                     array_multisort($name, SORT_ASC, SORT_LOCALE_STRING, $displaylist);
                     setlocale(LC_ALL, $current_locale);
 
-                    foreach ($displaylist as $id => $oneinst)
-                        echo "<option id='" . $id . "' value='" . $oneinst['realmlist'] . "'>" . $oneinst['name'] . "</option>";
+                    foreach ($displaylist as $id => $oneinst) {
+                                            echo "<option id='" . $id . "' value='" . $oneinst['realmlist'] . "'>" . $oneinst['name'] . "</option>";
+                    }
                     ?>
                 </select>
                 <button type='submit' class='submit'><?php echo _("Submit Information"); ?></button>
@@ -197,10 +199,12 @@ 
                 $checkresult[$number] = $check['instance']->UDP_reachability($number, FALSE, FALSE);
                 if ($checkresult[$number] == RETVAL_CONVERSATION_REJECT) { // so now things work?!
                     // either a packet size or Operator-Name problem!
-                    if ($check['instance']->UDP_reachability($number, TRUE, FALSE) != RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
-                    if ($check['instance']->UDP_reachability($number, FALSE, TRUE) != RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    if ($check['instance']->UDP_reachability($number, TRUE, FALSE) != RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
+                    if ($check['instance']->UDP_reachability($number, FALSE, TRUE) != RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
                 } else { // still no response or immediate reject
                     // if this is a CAT realm with anon ID set, we can't be seeing an NPS ignorance problem
                     // and consequently, the realm has actual issues
@@ -234,12 +238,13 @@ 
 // re-write check history with that extra knowledge
     $copycat = $realmproblems;
 
-    foreach ($realmproblems as &$problem)
-        if ($problem['STATUS'] == "REALM_POSSIBLY_NPS")
+    foreach ($realmproblems as &$problem) {
+            if ($problem['STATUS'] == "REALM_POSSIBLY_NPS")
             foreach ($copycat as $otherproblem)
                 if ($problem['REALM'] == $otherproblem['REALM'] && $problem['FROM'] != $otherproblem['FROM'] && $otherproblem['STATUS'] != "REALM_POSSIBLY_NPS")
                     if ($otherproblem['STATUS'] == "REACHABLE") { // worked elsewhere, but not on this probe:
                         $problem['STATUS'] = "REALM_DOWN";
+    }
                     } else { // inherit other problem; in any case not an NPS problem
                         $problem['STATUS'] = $otherproblem['STATUS'];
                     }
@@ -249,11 +254,12 @@ 
 
     $copycat = $realmproblems;
 
-    foreach ($realmproblems as &$problem)
-        if ($problem['STATUS'] == "REALM_DOWN")
+    foreach ($realmproblems as &$problem) {
+            if ($problem['STATUS'] == "REALM_DOWN")
             foreach ($copycat as $otherproblem)
                 if ($problem['REALM'] == $otherproblem['REALM'] && $problem['FROM'] != $otherproblem['FROM'] && $otherproblem['STATUS'] == "REACHABLE")
                     $problem['STATUS'] = "INFRASTRUCTURE";
+    }
     unset($problem);
 
 // finally, extract all certprobs we got from the reachability checks; merge from all
@@ -264,8 +270,9 @@ 
     foreach ($checks as $check) {
         $instance = $check['instance'];
         $resultset = $instance->UDP_reachability_result;
-        foreach ($resultset as $result)
-            $all_certprobs = array_merge($all_certprobs, $result['cert_oddities']);
+        foreach ($resultset as $result) {
+                    $all_certprobs = array_merge($all_certprobs, $result['cert_oddities']);
+        }
     }
     echo "<pre>";
     print_r($realmproblems);

web/resources/css/cat.css.php

Spacing +21 added lines, -21 removed lines

@@ -9,7 +9,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
     height: 100%;
@@ -23,7 +23,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -205,9 +205,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 div.pagecontent {
@@ -400,7 +400,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -513,7 +513,7 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-left:30px;
 }
 
@@ -567,7 +567,7 @@ 
 }
 
 span.redirect_link {
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
@@ -614,7 +614,7 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -695,7 +695,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 0px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -704,7 +704,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 00px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -759,7 +759,7 @@ 
     padding-top: 4px; 
     padding-bottom: 12px; 
     padding-left: 30px; 
-    background: <?php echo $colour1;?>; 
+    background: <?php echo $colour1; ?>; 
     text-align: left; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -769,9 +769,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -790,7 +790,7 @@ 
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 11px;
     font-weight: normal;
 }
@@ -838,7 +838,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -891,7 +891,7 @@ 
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -946,7 +946,7 @@ 
 
 #menu_column {
     border-right:solid;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     border-width:5px;
     min-height:400px;
     padding-left: 10px;
@@ -957,7 +957,7 @@ 
 
 #front_page_leftmenu {
     border-right:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
     padding-left: 10px; 
@@ -986,11 +986,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -998,7 +998,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

web/resources/css/cat-basic.css.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
 }
 
@@ -48,7 +48,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
    border-radius:10px ; 
    border-radius:2vw ;