Merge branch '2.5.x-installer' into saas-installer-albert

Conflicts:
	.gitignore
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/SystemstatusController.php
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/upgrade/Upgrades.php
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
	airtime_mvc/build/airtime.conf
	airtime_mvc/build/sql/defaultdata.sql
	airtime_mvc/public/index.php
	airtime_mvc/tests/application/helpers/AirtimeInstall.php
	install_minimal/airtime-install
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-copy-files.sh
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-initialize.sh
	install_minimal/include/airtime-install.php
	install_minimal/include/airtime-installed-check.php
	install_minimal/include/airtime-remove-files.sh
	install_minimal/include/airtime-upgrade.php
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/monit/monit-airtime-generic.cfg
	python_apps/pypo/airtime-playout
	python_apps/pypo/install/pypo-copy-files.py
	python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
	python_apps/pypo/liquidsoap/ls_script.liq
	python_apps/pypo/pypo/__main__.py
	python_apps/pypo/pypo/media/update/replaygain.py
	python_apps/pypo/pypo/media/update/replaygainupdater.py
	python_apps/pypo/pypo/media/update/silananalyzer.py
	python_apps/python-virtualenv/airtime_virtual_env.pybundle
	python_apps/python-virtualenv/requirements
	utils/airtime-check-system.php

airtime_mvc/application/models/Preference.php

@@ -874,10 +874,30 @@ class Application_Model_Preference
 
         return self::getValue("enable_stream_conf");
     }
-    
-    public static function SetAirtimeVersion($version)
+
+    public static function GetSchemaVersion()
     {
-        self::setValue("system_version", $version);
+        CcPrefPeer::clearInstancePool(); //Ensure we don't get a cached Propel object (cached DB results)
+        //because we're updating this version number within this HTTP request as well.
+
+        //New versions use schema_version
+        $pref = CcPrefQuery::create()
+            ->filterByKeystr('schema_version')
+            ->findOne();
+
+        if (empty($pref)) {
+            //Pre-2.5.2 releases all used this ambiguous "system_version" key to represent both the code and schema versions...
+            $pref = CcPrefQuery::create()
+                ->filterByKeystr('system_version')
+                ->findOne();
+        }
+        $schemaVersion = $pref->getValStr();
+        return $schemaVersion;
+    }
+
+    public static function SetSchemaVersion($version)
+    {
+        self::setValue("schema_version", $version);
     }
 
     public static function GetAirtimeVersion()

airtime_mvc/application/models/Show.php

@@ -1287,7 +1287,7 @@ SQL;
                             "starts"                  => $rows[$i-1]['starts'],
                             "ends"                    => $rows[$i-1]['ends'],
                             "record"                  => $rows[$i-1]['record'],
-                            "image_path"             => $rows[$i-1]['image_path'],
+                            "image_path"              => $rows[$i-1]['image_path'],
                             "type"                   => "show");
                 }
     
@@ -1345,7 +1345,6 @@ SQL;
                     "starts"                  => $rows[$previousShowIndex]['starts'],
                     "ends"                    => $rows[$previousShowIndex]['ends'],
                     "record"                  => $rows[$previousShowIndex]['record'],
-                    "image_path"              => $rows[$previousShowIndex]['image_path'],
                     "type"                    => "show");
         }
     

airtime_mvc/application/models/StoredFile.php

@@ -1024,14 +1024,16 @@ SQL;
         $LIQUIDSOAP_ERRORS = array('TagLib: MPEG::Properties::read() -- Could not find a valid last MPEG frame in the stream.');
 
         // Ask Liquidsoap if file is playable
-        $ls_command = sprintf('/usr/bin/airtime-liquidsoap -v -c "output.dummy(audio_to_stereo(single(%s)))" 2>&1',
+        /* CC-5990/5991 - Changed to point directly to liquidsoap, removed PATH export */
+        $command = sprintf('liquidsoap -v -c "output.dummy(audio_to_stereo(single(%s)))" 2>&1',
             escapeshellarg($audio_file));
 
-        $command = "export PATH=/usr/local/bin:/usr/bin:/bin/usr/bin/ && $ls_command";
         exec($command, $output, $rv);
 
         $isError = count($output) > 0 && in_array($output[0], $LIQUIDSOAP_ERRORS);
 
+        Logging::info("Is error?! : " . $isError);
+        Logging::info("ls playability response: " . $rv);
         return ($rv == 0 && !$isError);
     }
 

airtime_mvc/application/models/Systemstatus.php

@@ -6,15 +6,15 @@ class Application_Model_Systemstatus
     public static function GetMonitStatus($p_ip)
     {
         $CC_CONFIG = Config::getConfig();
-        $monit_user = $CC_CONFIG['monit_user'];
-        $monit_password = $CC_CONFIG['monit_password'];
+//         $monit_user = $CC_CONFIG['monit_user'];
+//         $monit_password = $CC_CONFIG['monit_password'];
 
         $url = "http://$p_ip:2812/_status?format=xml";
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_USERPWD, "$monit_user:$monit_password");
+//         curl_setopt($ch, CURLOPT_USERPWD, "$monit_user:$monit_password");
         //wait a max of 3 seconds before aborting connection attempt
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
         $result = curl_exec($ch);