GEANT / CAT

web/copyright.php

Indentation +5 added lines, -5 removed lines

@@ -205,14 +205,14 @@
                  </td>
                  <td style="padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;">
                  <?php
-                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
-                         echo "
+                        if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+                            echo "
                   <span id='logos' style='position:fixed; left:50%;'><img src='resources/images/dante.png' alt='DANTE' style='height:23px;width:47px'/>
                   <img src='resources/images/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>";
-                     else
-                         echo "&nbsp;";
-                 ?>
+                        else
+                            echo "&nbsp;";
+                    ?>
                 </td>
             </tr>
         </table>

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         <div id="heading">
             <?php
             print '<img src="resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-            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 style="padding-bottom:0px; height:1em;">' . sprintf(_("%s Copyright and Licensing"), Config::$APPEARANCE['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . Config::$APPEARANCE['productname_long'] . '</h2>';
             echo '<table id="lang_select"><tr><td>';

Braces +10 added lines, -7 removed lines

@@ -196,22 +196,25 @@
 // this variable gets set during "make distribution" only
                     $RELEASE = "THERELEASE";
                     echo Config::$APPEARANCE['productname'] . " - ";
-                    if ($RELEASE != "THERELEASE")
-                        echo sprintf(_("Release %s"), $RELEASE);
-                    else
-                        echo _("Unreleased SVN Revision");
+                    if ($RELEASE != "THERELEASE") {
+                                            echo sprintf(_("Release %s"), $RELEASE);
+                    } else {
+                                            echo _("Unreleased SVN Revision");
+                    }
                     echo " &copy; 2011-15 G&Eacute;ANT Ltd. on behalf of the GN3 and GN3plus consortia and others <a href='copyright.php'>Full Copyright and Licenses</a>";
                 ?>
                  </td>
                  <td style="padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;">
                  <?php
-                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+                     if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+                         // SW: APPROVED
                          echo "
                   <span id='logos' style='position:fixed; left:50%;'><img src='resources/images/dante.png' alt='DANTE' style='height:23px;width:47px'/>
                   <img src='resources/images/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>";
-                     else
-                         echo "&nbsp;";
+                     } else {
+                                              echo "&nbsp;";
+                     }
                  ?>
                 </td>
             </tr>

web/404.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
 <body>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
+        print '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
+        print '<div id="motd">' . (isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp') . '</div>';
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), Config::$APPEARANCE['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . Config::$APPEARANCE['productname_long'] . '</h2>';
         echo '<table id="lang_select"><tr><td>';
@@ -41,8 +41,8 @@ 
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
         <h2>404</h2>
         <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . CAT::get_lang())?></p>
     </div> <!-- id="main_body" -->

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/4013.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
 <body>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
+        print '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
+        print '<div id="motd">' . (isset(Config::$APPEARANCE['MOTD']) ? Config::$APPEARANCE['MOTD'] : '&nbsp') . '</div>';
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), Config::$APPEARANCE['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . Config::$APPEARANCE['productname_long'] . '</h2>';
         echo '<table id="lang_select"><tr><td>';
@@ -41,8 +41,8 @@ 
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
-        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p>
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
+        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p>
         <h2>401/403</h2>
         <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . CAT::get_lang())?></p>
     </div> <!-- id="main_body" -->

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 ; 

utils/notify_invitation_expiry.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $mailtext .= "$instname\n";
 
         if ($numberofexistingidps > 0)
-            $mailtext .="
+            $mailtext .= "
 
 Additionally, $numberofexistingidps invitations for existing institutions have expired.
 ";

Braces +6 added lines, -4 removed lines

@@ -45,14 +45,16 @@
 invitation tokens for the following new institutions have recently expired:
 
 ";
-        foreach ($listofinstnames as $instname)
-            $mailtext .= "$instname\n";
+        foreach ($listofinstnames as $instname) {
+                    $mailtext .= "$instname\n";
+        }
 
-        if ($numberofexistingidps > 0)
-            $mailtext .="
+        if ($numberofexistingidps > 0) {
+                    $mailtext .="
 
 Additionally, $numberofexistingidps invitations for existing institutions have expired.
 ";
+        }
         $mailtext .= "
 We thought you might like to know.
 

core/DeviceFactory.php

Spacing +9 added lines, -9 removed lines

@@ -47,24 +47,24 @@
     public function __construct($blueprint) {
 
       $Dev = Devices::listDevices();
-        if(isset($Dev[$blueprint])) {
-            if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
-                require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
-            debug(4,"loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
-            $class_name = "Device_".$Dev[$blueprint]['module'];
+        if (isset($Dev[$blueprint])) {
+            if ($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
+                require_once("devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php");
+            debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
+            $class_name = "Device_" . $Dev[$blueprint]['module'];
             $this->device = new $class_name();
-            if(! $this->device) {
-                debug(2,"module loading failed");
+            if (!$this->device) {
+                debug(2, "module loading failed");
                 die("module loading failed");
             }
         } else {
             error("unknown devicename:$blueprint");
         }
-       $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
+       $this->device->module_path = CAT::$root . '/devices/' . $Dev[$blueprint]['directory'];
        $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
        $this->device->device_id = $blueprint;
        $options = Devices::$Options;
-       if(isset($Dev[$blueprint]['options'])) {
+       if (isset($Dev[$blueprint]['options'])) {
           $Opt = $Dev[$blueprint]['options'];
           foreach ($Opt as $option => $value)
             $options[$option] = $value;

Braces +6 added lines, -4 removed lines

@@ -48,8 +48,9 @@ 
 
       $Dev = Devices::listDevices();
         if(isset($Dev[$blueprint])) {
-            if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
-                require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
+            if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module']) {
+                            require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
+            }
             debug(4,"loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
             $class_name = "Device_".$Dev[$blueprint]['module'];
             $this->device = new $class_name();
@@ -66,8 +67,9 @@ 
        $options = Devices::$Options;
        if(isset($Dev[$blueprint]['options'])) {
           $Opt = $Dev[$blueprint]['options'];
-          foreach ($Opt as $option => $value)
-            $options[$option] = $value;
+          foreach ($Opt as $option => $value) {
+                      $options[$option] = $value;
+          }
        }
        $this->device->options = $options;
     }

Indentation +10 added lines, -10 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function __construct($blueprint) {
 
-      $Dev = Devices::listDevices();
+        $Dev = Devices::listDevices();
         if(isset($Dev[$blueprint])) {
             if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
                 require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
@@ -60,15 +60,15 @@ 
         } else {
             error("unknown devicename:$blueprint");
         }
-       $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
-       $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
-       $this->device->device_id = $blueprint;
-       $options = Devices::$Options;
-       if(isset($Dev[$blueprint]['options'])) {
-          $Opt = $Dev[$blueprint]['options'];
-          foreach ($Opt as $option => $value)
+        $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
+        $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
+        $this->device->device_id = $blueprint;
+        $options = Devices::$Options;
+        if(isset($Dev[$blueprint]['options'])) {
+            $Opt = $Dev[$blueprint]['options'];
+            foreach ($Opt as $option => $value)
             $options[$option] = $value;
-       }
-       $this->device->options = $options;
+        }
+        $this->device->options = $options;
     }
 }
\ No newline at end of file

core/X509.php

Indentation +61 added lines, -61 removed lines

@@ -33,42 +33,42 @@ 
  *  @author http://php.net/manual/en/ref.openssl.php (comment from 29-Mar-2007)
  */
 public function pem2der($pem_data) {
-   $begin = "CERTIFICATE-----";
-   $end   = "-----END";
-   $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
-   $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
-   $der = base64_decode($pem_data);
-   return $der;
+    $begin = "CERTIFICATE-----";
+    $end   = "-----END";
+    $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
+    $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
+    $der = base64_decode($pem_data);
+    return $der;
 }
 
 public function der2pem($der_data) {
-   $pem = chunk_split(base64_encode($der_data), 64, "\n");
-   $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
-   return $pem;
+    $pem = chunk_split(base64_encode($der_data), 64, "\n");
+    $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
+    return $pem;
 }
 /**
-  * prepare PEM and DER formats, MD5 and SHA1 fingerprints and subject of the certificate
-  *
-  * returns an array with the following fields:
-  * <pre> uuid
-  * pem	certificate in PEM format
-  * der	certificate in DER format
-  * md5	MD5 fingerprint
-  * sha1	SHA1 fingerprint
-  * name	certificate subject
-  * root value 1 if root certificate 0 otherwise
-  * ca   value 1 if CA certificate 0 otherwise
-  *
-  * </pre>
-  * @param blob $cadata certificate in ether PEM or DER format
-  * @return array
-  */
+ * prepare PEM and DER formats, MD5 and SHA1 fingerprints and subject of the certificate
+ *
+ * returns an array with the following fields:
+ * <pre> uuid
+ * pem	certificate in PEM format
+ * der	certificate in DER format
+ * md5	MD5 fingerprint
+ * sha1	SHA1 fingerprint
+ * name	certificate subject
+ * root value 1 if root certificate 0 otherwise
+ * ca   value 1 if CA certificate 0 otherwise
+ *
+ * </pre>
+ * @param blob $cadata certificate in ether PEM or DER format
+ * @return array
+ */
 public function processCertificate ($cadata) {
     $begin_pem = strpos($cadata,"-----BEGIN CERTIFICATE-----");
-   if($begin_pem !== FALSE) {
+    if($begin_pem !== FALSE) {
         $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
         if($end_c !== FALSE) {
-           $cadata = substr($cadata,$begin_pem,$end_c - $begin_pem);
+            $cadata = substr($cadata,$begin_pem,$end_c - $begin_pem);
         }
         $ca_der = X509::pem2der($cadata);
         $ca_pem = X509::der2pem($ca_der);
@@ -91,25 +91,25 @@ 
     $out =  ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
     $diff_a = array_diff($mydetails['issuer'], $mydetails['subject']);
     if(count($diff_a) == 0 ) {
-     $out['root'] = 1;
-     $mydetails['type'] = 'root';
+        $out['root'] = 1;
+        $mydetails['type'] = 'root';
     } else {
-     $out['root'] = 0;
+        $out['root'] = 0;
     }
     // if no basicContraints are set at all, this is a problem in itself
     // is this a CA? or not? Treat as server, but add a warning...
     if (isset($mydetails['extensions']['basicConstraints'])) {
-       $out['ca'] = preg_match('/^CA:TRUE/',$mydetails['extensions']['basicConstraints']);
-       $out['basicconstraints_set'] = 1;
+        $out['ca'] = preg_match('/^CA:TRUE/',$mydetails['extensions']['basicConstraints']);
+        $out['basicconstraints_set'] = 1;
     } else {
-       $out['ca'] = 0; // we need to resolve this ambiguity
-       $out['basicconstraints_set'] = 0;
+        $out['ca'] = 0; // we need to resolve this ambiguity
+        $out['basicconstraints_set'] = 0;
     }
     
     if( $out['ca'] > 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'interm_ca';
+        $mydetails['type'] = 'interm_ca';
     if( $out['ca'] == 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'server';
+        $mydetails['type'] = 'server';
     $mydetails['sha1'] = $sha1;
     $out['full_details'] = $mydetails;
     
@@ -119,51 +119,51 @@ 
     
     openssl_x509_export($myca, $output, FALSE);
     if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
-      $out['full_details']['signature_algorithm'] = $match[1];
+        $out['full_details']['signature_algorithm'] = $match[1];
     else
-      $out['full_details']['signature_algorithm'] = $output;
+        $out['full_details']['signature_algorithm'] = $output;
  
     if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
-      $out['full_details']['public_key_length'] = $match[1];
+        $out['full_details']['public_key_length'] = $match[1];
     else
-      $out['full_details']['public_key_length'] = $output;
+        $out['full_details']['public_key_length'] = $output;
     
     return $out;
 }
 
 /**
-  * split a certificate file into components 
-  *
-  * returns an array containing the PEM format of the certificate (s)
-  * if the file contains multiple certificates it gets split into components
-  *
-  * @param blob $cadata certificate in ether PEM or DER format
-  * @return array
-  */
+ * split a certificate file into components 
+ *
+ * returns an array containing the PEM format of the certificate (s)
+ * if the file contains multiple certificates it gets split into components
+ *
+ * @param blob $cadata certificate in ether PEM or DER format
+ * @return array
+ */
 
 public function splitCertificate($cadata) {
-  $returnarray = [];
-  // maybe we got no real cert data at all? The code is hardened, but will
-  // produce ugly WARNING level output in the logfiles, so let's avoid at least
-  // the trivial case: if the file is empty, there's no cert in it
-  if ($cadata == "")
-      return $returnarray;
-  $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
-  if( $start_c !== FALSE) {
+    $returnarray = [];
+    // maybe we got no real cert data at all? The code is hardened, but will
+    // produce ugly WARNING level output in the logfiles, so let's avoid at least
+    // the trivial case: if the file is empty, there's no cert in it
+    if ($cadata == "")
+        return $returnarray;
+    $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
+    if( $start_c !== FALSE) {
         $cadata = substr($cadata,$start_c);
         $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
         $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
         while ( $next_c !== FALSE) {
-          $returnarray[] = substr($cadata,0,$end_c);
-          $cadata = substr($cadata,$next_c);
-          $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-          $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
+            $returnarray[] = substr($cadata,0,$end_c);
+            $cadata = substr($cadata,$next_c);
+            $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
+            $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
         }
         $returnarray[] = substr($cadata,0,$end_c);
     } else {
         // TODO: before we blindly hand it over to der2pem - is this valid DER
         // data at all?
-      $returnarray[] = X509::der2pem($cadata);
+        $returnarray[] = X509::der2pem($cadata);
     }
     // print_r($returnarray);
     

Spacing +29 added lines, -29 removed lines

@@ -35,7 +35,7 @@ 
 public function pem2der($pem_data) {
    $begin = "CERTIFICATE-----";
    $end   = "-----END";
-   $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
+   $pem_data = substr($pem_data, strpos($pem_data, $begin) + strlen($begin));
    $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
    $der = base64_decode($pem_data);
    return $der;
@@ -43,7 +43,7 @@ 
 
 public function der2pem($der_data) {
    $pem = chunk_split(base64_encode($der_data), 64, "\n");
-   $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
+   $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n";
    return $pem;
 }
 /**
@@ -63,19 +63,19 @@ 
   * @param blob $cadata certificate in ether PEM or DER format
   * @return array
   */
-public function processCertificate ($cadata) {
-    $begin_pem = strpos($cadata,"-----BEGIN CERTIFICATE-----");
-   if($begin_pem !== FALSE) {
-        $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-        if($end_c !== FALSE) {
-           $cadata = substr($cadata,$begin_pem,$end_c - $begin_pem);
+public function processCertificate($cadata) {
+    $begin_pem = strpos($cadata, "-----BEGIN CERTIFICATE-----");
+   if ($begin_pem !== FALSE) {
+        $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+        if ($end_c !== FALSE) {
+           $cadata = substr($cadata, $begin_pem, $end_c - $begin_pem);
         }
         $ca_der = X509::pem2der($cadata);
         $ca_pem = X509::der2pem($ca_der);
         // echo "XXXXXXXXXXXXX".$cadata."XXXXXXXXXXXXX"; exit;
     } else {
         $ca_der = $cadata;
-        $ca_pem =  X509::der2pem($cadata);
+        $ca_pem = X509::der2pem($cadata);
     }
 
     # check that the certificate is OK
@@ -86,11 +86,11 @@ 
     $mydetails = openssl_x509_parse($myca);
     if (!isset($mydetails['subject']))
         return FALSE;
-    $md5 = openssl_digest($ca_der,'MD5');
-    $sha1 = openssl_digest($ca_der,'SHA1');
-    $out =  ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
+    $md5 = openssl_digest($ca_der, 'MD5');
+    $sha1 = openssl_digest($ca_der, 'SHA1');
+    $out = ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
     $diff_a = array_diff($mydetails['issuer'], $mydetails['subject']);
-    if(count($diff_a) == 0 ) {
+    if (count($diff_a) == 0) {
      $out['root'] = 1;
      $mydetails['type'] = 'root';
     } else {
@@ -99,16 +99,16 @@ 
     // if no basicContraints are set at all, this is a problem in itself
     // is this a CA? or not? Treat as server, but add a warning...
     if (isset($mydetails['extensions']['basicConstraints'])) {
-       $out['ca'] = preg_match('/^CA:TRUE/',$mydetails['extensions']['basicConstraints']);
+       $out['ca'] = preg_match('/^CA:TRUE/', $mydetails['extensions']['basicConstraints']);
        $out['basicconstraints_set'] = 1;
     } else {
        $out['ca'] = 0; // we need to resolve this ambiguity
        $out['basicconstraints_set'] = 0;
     }
     
-    if( $out['ca'] > 0 && $out['root'] == 0 )
+    if ($out['ca'] > 0 && $out['root'] == 0)
      $mydetails['type'] = 'interm_ca';
-    if( $out['ca'] == 0 && $out['root'] == 0 )
+    if ($out['ca'] == 0 && $out['root'] == 0)
      $mydetails['type'] = 'server';
     $mydetails['sha1'] = $sha1;
     $out['full_details'] = $mydetails;
@@ -118,12 +118,12 @@ 
     
     
     openssl_x509_export($myca, $output, FALSE);
-    if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
+    if (preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
       $out['full_details']['signature_algorithm'] = $match[1];
     else
       $out['full_details']['signature_algorithm'] = $output;
  
-    if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
+    if ((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
       $out['full_details']['public_key_length'] = $match[1];
     else
       $out['full_details']['public_key_length'] = $output;
@@ -148,18 +148,18 @@ 
   // the trivial case: if the file is empty, there's no cert in it
   if ($cadata == "")
       return $returnarray;
-  $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
-  if( $start_c !== FALSE) {
-        $cadata = substr($cadata,$start_c);
-        $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-        $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
-        while ( $next_c !== FALSE) {
-          $returnarray[] = substr($cadata,0,$end_c);
-          $cadata = substr($cadata,$next_c);
-          $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-          $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
+  $start_c = strpos($cadata, "-----BEGIN CERTIFICATE-----");
+  if ($start_c !== FALSE) {
+        $cadata = substr($cadata, $start_c);
+        $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+        $next_c = strpos($cadata, "-----BEGIN CERTIFICATE-----", 30);
+        while ($next_c !== FALSE) {
+          $returnarray[] = substr($cadata, 0, $end_c);
+          $cadata = substr($cadata, $next_c);
+          $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+          $next_c = strpos($cadata, "-----BEGIN CERTIFICATE-----", 30);
         }
-        $returnarray[] = substr($cadata,0,$end_c);
+        $returnarray[] = substr($cadata, 0, $end_c);
     } else {
         // TODO: before we blindly hand it over to der2pem - is this valid DER
         // data at all?

Braces +25 added lines, -18 removed lines

@@ -81,11 +81,13 @@ 
     # check that the certificate is OK
 //print "<pre>CA:\n$ca_pem</pre>\n";
     $myca = openssl_x509_read($ca_pem);
-    if ($myca == FALSE) 
-        return FALSE;
+    if ($myca == FALSE) {
+            return FALSE;
+    }
     $mydetails = openssl_x509_parse($myca);
-    if (!isset($mydetails['subject']))
-        return FALSE;
+    if (!isset($mydetails['subject'])) {
+            return FALSE;
+    }
     $md5 = openssl_digest($ca_der,'MD5');
     $sha1 = openssl_digest($ca_der,'SHA1');
     $out =  ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
@@ -106,10 +108,12 @@ 
        $out['basicconstraints_set'] = 0;
     }
     
-    if( $out['ca'] > 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'interm_ca';
-    if( $out['ca'] == 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'server';
+    if( $out['ca'] > 0 && $out['root'] == 0 ) {
+         $mydetails['type'] = 'interm_ca';
+    }
+    if( $out['ca'] == 0 && $out['root'] == 0 ) {
+         $mydetails['type'] = 'server';
+    }
     $mydetails['sha1'] = $sha1;
     $out['full_details'] = $mydetails;
     
@@ -118,15 +122,17 @@ 
     
     
     openssl_x509_export($myca, $output, FALSE);
-    if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
-      $out['full_details']['signature_algorithm'] = $match[1];
-    else
-      $out['full_details']['signature_algorithm'] = $output;
+    if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) {
+          $out['full_details']['signature_algorithm'] = $match[1];
+    } else {
+          $out['full_details']['signature_algorithm'] = $output;
+    }
  
-    if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
-      $out['full_details']['public_key_length'] = $match[1];
-    else
-      $out['full_details']['public_key_length'] = $output;
+    if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) {
+          $out['full_details']['public_key_length'] = $match[1];
+    } else {
+          $out['full_details']['public_key_length'] = $output;
+    }
     
     return $out;
 }
@@ -146,8 +152,9 @@ 
   // maybe we got no real cert data at all? The code is hardened, but will
   // produce ugly WARNING level output in the logfiles, so let's avoid at least
   // the trivial case: if the file is empty, there's no cert in it
-  if ($cadata == "")
-      return $returnarray;
+  if ($cadata == "") {
+        return $returnarray;
+  }
   $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
   if( $start_c !== FALSE) {
         $cadata = substr($cadata,$start_c);