Code format. Always use () for functions.

11 files changed, 148 insertions, 150 deletions

diff --git a/auth/authentication.php b/auth/authentication.php
index 8ff8d97..6e03271 100644
--- a/auth/authentication.php
+++ b/auth/authentication.php
@@ -21,8 +21,8 @@
 
 ini_set('include_path', ini_get('include_path').':./libs/phpseclib-0.3.7');
 
-require_once 'ssh.php';
-require_once 'telnet.php';
+require_once('ssh.php');
+require_once('telnet.php');
 
 /**
  * This class needs to be extended by every class implementing an
diff --git a/auth/ssh.php b/auth/ssh.php
index 5fdd489..d8d56a1 100644
--- a/auth/ssh.php
+++ b/auth/ssh.php
@@ -19,9 +19,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'Crypt/RSA.php';
-require_once 'Net/SSH2.php';
-require_once 'authentication.php';
+require_once('Crypt/RSA.php');
+require_once('Net/SSH2.php');
+require_once('authentication.php');
 
 final class SSH extends Authentication {
   private $port;
diff --git a/auth/telnet.php b/auth/telnet.php
index 40a8822..2f3465d 100644
--- a/auth/telnet.php
+++ b/auth/telnet.php
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'authentication.php';
+require_once('authentication.php');
 
 final class Telnet extends Authentication {
   private $port;
diff --git a/execute.php b/execute.php
index 18c5051..a1da942 100644
--- a/execute.php
+++ b/execute.php
@@ -19,9 +19,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'includes/config.defaults.php';
-require_once 'config.php';
-require_once 'routers/router.php';
+require_once('includes/config.defaults.php');
+require_once('config.php');
+require_once('routers/router.php');
 
 // From where the user *really* comes from.
 if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
@@ -39,7 +39,7 @@ if (!isset($_POST['dontlook']) || !empty($_POST['dontlook'])) {
 // Just asked for the documentation
 if (isset($_POST['doc']) && !empty($_POST['doc'])) {
   $query = htmlspecialchars($_POST['doc']);
-  print json_encode($config['doc'][$query]);
+  print(json_encode($config['doc'][$query]));
 }
 
 if (isset($_POST['query']) && !empty($_POST['query']) &&
@@ -66,7 +66,7 @@ if (isset($_POST['query']) && !empty($_POST['query']) &&
     $data = array('error' => $error);
   }
 
-  print json_encode($data);
+  print(json_encode($data));
 }
 
 // End of execute.php
diff --git a/includes/utils.php b/includes/utils.php
index ebbea2c..828832f 100644
--- a/includes/utils.php
+++ b/includes/utils.php
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'config.php';
+require_once('config.php');
 
 /**
  * Test if a given parameter is a private IPv4 or IPv6.
diff --git a/index.php b/index.php
index b30591b..f28bfd4 100644
--- a/index.php
+++ b/index.php
@@ -19,8 +19,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'includes/config.defaults.php';
-require_once 'config.php';
+require_once('includes/config.defaults.php');
+require_once('config.php');
 
 final class LookingGlass {
   private $frontpage;
@@ -36,85 +36,84 @@ final class LookingGlass {
   }
 
   private function render_routers() {
-    print '<div class="form-group">';
-    print '<label for="routers">Router to use</label>';
-    print '<select size="5" class="form-control" name="routers" id="routers">';
+    print('<div class="form-group">');
+    print('<label for="routers">Router to use</label>');
+    print('<select size="5" class="form-control" name="routers" id="routers">');
 
     $first = true;
     foreach (array_keys($this->routers) as $router) {
       if ($first) {
         $first = false;
-        print '<option value="'.$router.'" selected="selected">'.
-          $this->routers[$router]['desc'].'</option>';
+        print('<option value="'.$router.'" selected="selected">'.
+          $this->routers[$router]['desc'].'</option>');
       } else {
-        print '<option value="'.$router.'">'.$this->routers[$router]['desc'].
-          '</option>';
+        print('<option value="'.$router.'">'.$this->routers[$router]['desc'].
+          '</option>');
       }
     }
 
-    print '</select>';
-    print '</div>';
+    print('</select>');
+    print('</div>');
   }
 
   private function render_commands() {
-    print '<div class="form-group">';
-    print '<label for="query">Command to issue</label>';
-    print '<select size="5" class="form-control" name="query" id="query">';
-    print '<option value="bgp" selected="selected">show route IP_ADDRESS</option>';
-    print '<option value="as-path-regex">show route as-path-regex AS_PATH_REGEX</option>';
-    print '<option value="as">show route AS</option>';
-    print '<option value="ping">ping IP_ADDRESS</option>';
-    print '<option value="traceroute">traceroute IP_ADDRESS</option>';
-    print '</select>';
-    print '</div>';
+    print('<div class="form-group">');
+    print('<label for="query">Command to issue</label>');
+    print('<select size="5" class="form-control" name="query" id="query">');
+    print('<option value="bgp" selected="selected">show route IP_ADDRESS</option>');
+    print('<option value="as-path-regex">show route as-path-regex AS_PATH_REGEX</option>');
+    print('<option value="as">show route AS</option>');
+    print('<option value="ping">ping IP_ADDRESS</option>');
+    print('<option value="traceroute">traceroute IP_ADDRESS</option>');
+    print('</select>');
+    print('</div>');
   }
 
   private function render_parameters() {
-    print '<div class="form-group">';
-    print '<label for="input-params">Parameter</label>';
-    print '<div class="input-group">';
-    print '<input class="form-control" name="parameters" id="input-params" autofocus />';
-    print '<div class="input-group-btn">';
-    print '<button type="button" class="btn btn-info" data-toggle="modal" data-target="#help">';
-    print '<span class="glyphicon glyphicon-question-sign"></span> Help';
-    print '</button>';
-    print '</div>';
-    print '</div>';
-    print '</div>';
+    print('<div class="form-group">');
+    print('<label for="input-param">Parameter</label>');
+    print('<div class="input-group">');
+    print('<input class="form-control" name="parameters" id="input-param" autofocus />');
+    print('<div class="input-group-btn">');
+    print('<button type="button" class="btn btn-info" data-toggle="modal" data-target="#help">');
+    print('<span class="glyphicon glyphicon-question-sign"></span> Help');
+    print('</button>');
+    print('</div>');
+    print('</div>');
+    print('</div>');
   }
 
   private function render_buttons() {
-    print '<div class="confirm btn-group btn-group-justified">';
-    print '<div class="btn-group">';
-    print '<button class="btn btn-primary" id="send" type="submit">Enter</button>';
-    print '</div>';
-    print '<div class="btn-group">';
-    print '<button class="btn btn-danger" id="clear" type="reset">Reset</button>';
-    print '</div>';
-    print '</div>';
+    print('<div class="confirm btn-group btn-group-justified">');
+    print('<div class="btn-group">');
+    print('<button class="btn btn-primary" id="send" type="submit">Enter</button>');
+    print('</div>');
+    print('<div class="btn-group">');
+    print('<button class="btn btn-danger" id="clear" type="reset">Reset</button>');
+    print('</div>');
+    print('</div>');
   }
 
   private function render_header() {
-    print '<a href="." title="Home">';
-    print '<div class="header_bar">';
+    print('<a href="." title="Home">');
+    print('<div class="header_bar">');
     if ($this->frontpage['show_title']) {
-      print '<h1>'.htmlentities($this->frontpage['title']).'</h1><br />';
+      print('<h1>'.htmlentities($this->frontpage['title']).'</h1><br />');
     }
     if (isset($this->frontpage['image'])) {
-      print '<img src="'.$this->frontpage['image'].'" alt="logo" />';
+      print('<img src="'.$this->frontpage['image'].'" alt="logo" />');
     }
-    print '</div>';
-    print '</a>';
+    print('</div>');
+    print('</a>');
   }
 
   private function render_content() {
-    print '<div class="alert alert-danger alert-dismissable" id="error">';
-    print '<button type="button" class="close" aria-hidden="true">&times;</button>';
-    print '<strong>Error!</strong>&nbsp;<span id="error-text"></span>';
-    print '</div>';
-    print '<div class="content" id="command_options">';
-    print '<form role="form" action="execute.php" method="post">';
-    print '<fieldset id="command_properties">';
+    print('<div class="alert alert-danger alert-dismissable" id="error">');
+    print('<button type="button" class="close" aria-hidden="true">&times;</button>');
+    print('<strong>Error!</strong>&nbsp;<span id="error-text"></span>');
+    print('</div>');
+    print('<div class="content" id="command_options">');
+    print('<form role="form" action="execute.php" method="post">');
 
     foreach ($this->frontpage['order'] as $element) {
       switch ($element) {
@@ -139,104 +138,103 @@ final class LookingGlass {
       }
     }
 
-    print '<input type="text" class="hidden" name="dontlook" placeholder="Don\'t look at me!" />';
-    print '</fieldset>';
-    print '</form>';
-    print '</div>';
-    print '<div class="loading">';
-    print '<div class="progress progress-striped active">';
-    print '<div class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">';
-    print '</div>';
-    print '</div>';
-    print '</div>';
-    print '<div class="result">';
-    print '<div id="output"></div>';
-    print '<div class="reset">';
-    print '<button class="btn btn-danger btn-block" id="backhome">Reset</button>';
-    print '</div>';
-    print '</div>';
+    print('<input type="text" class="hidden" name="dontlook" placeholder="Don\'t look at me!" />');
+    print('</form>');
+    print('</div>');
+    print('<div class="loading">');
+    print('<div class="progress progress-striped active">');
+    print('<div class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">');
+    print('</div>');
+    print('</div>');
+    print('</div>');
+    print('<div class="result">');
+    print('<div id="output"></div>');
+    print('<div class="reset">');
+    print('<button class="btn btn-danger btn-block" id="backhome">Reset</button>');
+    print('</div>');
+    print('</div>');
   }
 
   private function render_footer() {
-    print '<div class="footer_bar">';
-    print '<p class="text-center">';
+    print('<div class="footer_bar">');
+    print('<p class="text-center">');
 
     if ($this->frontpage['show_visitor_ip']) {
       if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-        print 'Your IP address: '.htmlentities($_SERVER['HTTP_X_FORWARDED_FOR']).'<br />';
+        print('Your IP address: '.htmlentities($_SERVER['HTTP_X_FORWARDED_FOR']).'<br />');
       } else {
-        print 'Your IP address: '.htmlentities($_SERVER['REMOTE_ADDR']).'<br />';
+        print('Your IP address: '.htmlentities($_SERVER['REMOTE_ADDR']).'<br />');
       }
     }
 
     if (isset($this->frontpage['disclaimer'])) {
-      print $this->frontpage['disclaimer'];
-      print '<br /><br />';
+      print($this->frontpage['disclaimer']);
+      print('<br /><br />');
     }
 
     if (isset($this->contact) && !empty($this->contact)) {
-      print 'Contact:&nbsp;';
-      print '<a href="mailto:'.$this->contact['mail'].'">'.
-        htmlentities($this->contact['name']).'</a>';
+      print('Contact:&nbsp;');
+      print('<a href="mailto:'.$this->contact['mail'].'">'.
+        htmlentities($this->contact['name']).'</a>');
     }
 
-    print '<br /><br />';
-    print '<span class="origin">Powered by <a href="https://github.com/respawner/looking-glass" title="Looking Glass Project">Looking Glass</a></span>';
-    print '</p>';
-    print '</div>';
+    print('<br /><br />');
+    print('<span class="origin">Powered by <a href="https://github.com/respawner/looking-glass" title="Looking Glass Project">Looking Glass</a></span>');
+    print('</p>');
+    print('</div>');
   }
 
   private function render_help_modal() {
-    print '<div id="help" class="modal fade">';
-    print '<div class="modal-dialog">';
-    print '<div class="modal-content">';
-    print '<div class="modal-header">';
-    print '<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>';
-    print '<h4 class="modal-title">Help</h4>';
-    print '</div>';
-    print '<div class="modal-body">';
-    print '<h4>Command <small id="command-reminder"></small></h4>';
-    print '<p id="description-help"></p>';
-    print '<h4>Parameter</h4>';
-    print '<p id="parameter-help"></p>';
-    print '</div>';
-    print '<div class="modal-footer">';
-    print '<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>';
-    print '</div>';
-    print '</div>';
-    print '</div>';
-    print '</div>';
+    print('<div id="help" class="modal fade">');
+    print('<div class="modal-dialog">');
+    print('<div class="modal-content">');
+    print('<div class="modal-header">');
+    print('<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>');
+    print('<h4 class="modal-title">Help</h4>');
+    print('</div>');
+    print('<div class="modal-body">');
+    print('<h4>Command <small id="command-reminder"></small></h4>');
+    print('<p id="description-help"></p>');
+    print('<h4>Parameter</h4>');
+    print('<p id="parameter-help"></p>');
+    print('</div>');
+    print('<div class="modal-footer">');
+    print('<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>');
+    print('</div>');
+    print('</div>');
+    print('</div>');
+    print('</div>');
   }
 
   public function render() {
-    print '<!DOCTYPE html>';
-    print '<html lang="en">';
-    print '<head>';
-    print '<meta charset="utf-8" />';
-    print '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
-    print '<meta name="viewport" content="width=device-width, initial-scale=1" />';
-    print '<meta name="keywords" content="Looking Glass, LG, BGP, prefix-list, AS-path, ASN, traceroute, ping, IPv4, IPv6, Cisco, Juniper, Internet" />';
-    print '<meta name="description" content="'.$this->frontpage['title'].'" />';
-    print '<title>'.htmlentities($this->frontpage['title']).'</title>';
-    print '<link href="libs/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet" />';
+    print('<!DOCTYPE html>');
+    print('<html lang="en">');
+    print('<head>');
+    print('<meta charset="utf-8" />');
+    print('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />');
+    print('<meta name="viewport" content="width=device-width, initial-scale=1" />');
+    print('<meta name="keywords" content="Looking Glass, LG, BGP, prefix-list, AS-path, ASN, traceroute, ping, IPv4, IPv6, Cisco, Juniper, Internet" />');
+    print('<meta name="description" content="'.$this->frontpage['title'].'" />');
+    print('<title>'.htmlentities($this->frontpage['title']).'</title>');
+    print('<link href="libs/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet" />');
     if ($this->frontpage['bootstrap_theme']) {
-      print '<link href="libs/bootstrap-3.3.0/css/bootstrap-theme.min.css" rel="stylesheet" />';
+      print('<link href="libs/bootstrap-3.3.0/css/bootstrap-theme.min.css" rel="stylesheet" />');
     }
     if ($this->frontpage['custom_bootstrap_theme']) {
-      print '<link href="'.$this->frontpage['custom_bootstrap_theme'].'" rel="stylesheet" />';
+      print('<link href="'.$this->frontpage['custom_bootstrap_theme'].'" rel="stylesheet" />');
     }
-    print '<link href="'.$this->frontpage['css'].'" rel="stylesheet" />';
-    print '</head>';
-    print '<body>';
+    print('<link href="'.$this->frontpage['css'].'" rel="stylesheet" />');
+    print('</head>');
+    print('<body>');
     $this->render_header();
     $this->render_content();
     $this->render_footer();
     $this->render_help_modal();
-    print '</body>';
-    print '<script src="js/jquery-2.1.1.min.js"></script>';
-    print '<script src="libs/bootstrap-3.3.0/js/bootstrap.min.js"></script>';
-    print '<script src="js/looking-glass.js"></script>';
-    print '</html>';
+    print('</body>');
+    print('<script src="js/jquery-2.1.1.min.js"></script>');
+    print('<script src="libs/bootstrap-3.3.0/js/bootstrap.min.js"></script>');
+    print('<script src="js/looking-glass.js"></script>');
+    print('</html>');
   }
 }
 
diff --git a/routers/bird.php b/routers/bird.php
index 25d7544..b86315b 100644
--- a/routers/bird.php
+++ b/routers/bird.php
@@ -19,8 +19,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'router.php';
-require_once 'includes/utils.php';
+require_once('router.php');
+require_once('includes/utils.php');
 
 final class Bird extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/cisco.php b/routers/cisco.php
index 304cb56..bc34653 100644
--- a/routers/cisco.php
+++ b/routers/cisco.php
@@ -19,8 +19,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'router.php';
-require_once 'includes/utils.php';
+require_once('router.php');
+require_once('includes/utils.php');
 
 final class Cisco extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/juniper.php b/routers/juniper.php
index d29161b..6c6acf7 100644
--- a/routers/juniper.php
+++ b/routers/juniper.php
@@ -19,8 +19,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'router.php';
-require_once 'includes/utils.php';
+require_once('router.php');
+require_once('includes/utils.php');
 
 final class Juniper extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/quagga.php b/routers/quagga.php
index 2dc7dc2..9d7ee77 100644
--- a/routers/quagga.php
+++ b/routers/quagga.php
@@ -19,8 +19,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'router.php';
-require_once 'includes/utils.php';
+require_once('router.php');
+require_once('includes/utils.php');
 
 final class Quagga extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/router.php b/routers/router.php
index 26f93fd..c878342 100644
--- a/routers/router.php
+++ b/routers/router.php
@@ -19,14 +19,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-require_once 'includes/config.defaults.php';
-require_once 'config.php';
-require_once 'bird.php';
-require_once 'cisco.php';
-require_once 'juniper.php';
-require_once 'quagga.php';
-require_once 'includes/utils.php';
-require_once 'auth/authentication.php';
+require_once('includes/config.defaults.php');
+require_once('config.php');
+require_once('bird.php');
+require_once('cisco.php');
+require_once('juniper.php');
+require_once('quagga.php');
+require_once('includes/utils.php');
+require_once('auth/authentication.php');
 
 abstract class Router {
   protected $global_config;
@@ -131,7 +131,7 @@ abstract class Router {
         return new Quagga($config, $router_config, $id, $requester);
 
       default:
-        print 'Unknown router type "'.$router_config['type'].'"."';
+        print 'Unknown router type "'.$router_config['type'].'".';
         return null;
     }
   }