From d367c0f55c8a6d109ffe6309eecf6bfba4920857 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 17 Sep 2012 16:41:40 -0400
Subject: [PATCH] remove all newline characters from AirtimeInstall.php

---
 install_minimal/include/AirtimeInstall.php | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 02a2b43b2..b2d4bf451 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -107,16 +107,16 @@ class AirtimeInstall
                 echo "done.\n";
             }
         } catch (Exception $e) {
-            echo "Error!\n".$e->getMessage()."\n";
-            echo "   SQL statement was:\n";
+            echo "Error!\n".$e->getMessage()."\n";
+            echo "   SQL statement was:\n";
             echo "   ".$sql."\n\n";
         }
     }
 
-    public static function DropSequence($p_sequenceName)
-    {
+    public static function DropSequence($p_sequenceName)
+    {
         AirtimeInstall::InstallQuery("DROP SEQUENCE IF EXISTS $p_sequenceName");
-    }
+    }
 
     /**
      * Try to connect to the database.  Return true on success, false on failure.
@@ -130,12 +130,12 @@ class AirtimeInstall
         try {
             $con = Propel::getConnection();
         } catch (Exception $e) {
-            echo $e->getMessage().PHP_EOL;
-            echo "Database connection problem.".PHP_EOL;
-            echo "Check if database '{$CC_CONFIG['dsn']['database']}' exists".
-                " with corresponding permissions.".PHP_EOL;
-            if ($p_exitOnError) {
-                exit(1);
+            echo $e->getMessage().PHP_EOL;
+            echo "Database connection problem.".PHP_EOL;
+            echo "Check if database '{$CC_CONFIG['dsn']['database']}' exists".
+                " with corresponding permissions.".PHP_EOL;
+            if ($p_exitOnError) {
+                exit(1);
             }
             return false;
         }
@@ -314,7 +314,7 @@ class AirtimeInstall
 
     public static function SetUniqueId()
     {
-        $con = Propel::getConnection();
+        $con = Propel::getConnection();
         $uniqueId = md5(uniqid("", true));
 
         $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('uniqueId', '$uniqueId')";
@@ -328,7 +328,7 @@ class AirtimeInstall
     public static function SetDefaultTimezone()
     {
         $con = Propel::getConnection();
-        // we need to run php as commandline because we want to get the timezone in cli php.ini file
+        // we need to run php as commandline because we want to get the timezone in cli php.ini file
         //$defaultTimezone = exec("php -r 'echo date_default_timezone_get().PHP_EOL;'");
         $defaultTimezone = exec("cat /etc/timezone");
         $defaultTimezone = trim($defaultTimezone);
@@ -345,7 +345,7 @@ class AirtimeInstall
 
     public static function SetImportTimestamp()
     {
-        $con = Propel::getConnection();
+        $con = Propel::getConnection();
         $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('import_timestamp', '0')";
         $result = $con->exec($sql);
         if ($result < 1) {