From a756b6a9e4d0ccdebfbe0bbdd89b28a125ba048d Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 11:37:30 -0400
Subject: [PATCH 01/14] CC-5781: Upgrade script for new storage quota
 implementation

Created skeleton for upgrade script
---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php | 14 ++++++++++++++
 .../upgrades/airtime-2.5.3/airtime-upgrade.php     |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
new file mode 100644
index 000000000..9cfdd2d63
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -0,0 +1,14 @@
+<?php
+class StorageQuotaUpgrade
+{
+    public static function startUpgrade()
+    {
+        echo "* Updating storage usage for new quota tracking".PHP_EOL;
+        self::setStorageUsage();
+    }
+
+    private static function setStorageUsage()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php
index 042b92d05..31792eb7a 100644
--- a/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/airtime-upgrade.php
@@ -1,8 +1,10 @@
 <?php
 
 require_once 'DbUpgrade.php';
+require_once 'StorageQuotaUpgrade.php';
 
 $filename = "/etc/airtime/airtime.conf";
 $values = parse_ini_file($filename, true);
 
 AirtimeDatabaseUpgrade::start($values);
+StorageQuotaUpgrade::startUpgrade();

From 9d488a01ce42ab867d0e269941e88cdc8f4b5cf7 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 11:58:58 -0400
Subject: [PATCH 02/14] Included upgrade folder path for 2.5.3 so Airtime can
 upgrade from older versions

---
 install_minimal/include/airtime-upgrade.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index a85fbeed0..af9f971d4 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -102,4 +102,8 @@ if (strcmp($version, "2.5.1") < 0) {
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.5.1/airtime-upgrade.php");
     pause();
 }
+if (strcmp($version, "2.5.3") < 0) {
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.5.3/airtime-upgrade.php");
+    pause();
+}
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;

From 770a51dccd8033b7ed8e3c75bceb47b2cd6b6ee0 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 12:14:49 -0400
Subject: [PATCH 03/14] Changed airtime version in necessary places

---
 CREDITS                                       | 2 +-
 VERSION                                       | 2 +-
 install_minimal/include/airtime-constants.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CREDITS b/CREDITS
index 826799c99..b52ae289e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,7 +2,7 @@
 CREDITS
 =======
 
-Version 2.5.1
+Version 2.5.3
 
 Albert Santoni (albert.santoni@sourcefabric.org)
   Role: Developer Team Lead
diff --git a/VERSION b/VERSION
index 5a1ef0b72..b7fd8620d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.5.0
+PRODUCT_RELEASE=2.5.3
diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 2a3bf95ee..fd6240bd2 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.5.1');
+define('AIRTIME_VERSION', '2.5.3');

From 6abe613a73112343cacc0bf24157c8cdc68098c3 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 14:11:31 -0400
Subject: [PATCH 04/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 9cfdd2d63..33731a2d3 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -9,6 +9,15 @@ class StorageQuotaUpgrade
 
     private static function setStorageUsage()
     {
-        
+        $musicDir = CcMusicDirsQuery::create()
+            ->filterByDbType('stor')
+            ->filterByDbExists(true)
+            ->findOne();
+        $storPath = $musicDir->getDbDirectory();
+
+        $freeSpace = disk_free_space($storPath);
+        $totalSpace = disk_total_space($storPath);
+
+        Application_Model_Preference::setDiskUsage($totalSpace - $freeSpace);
     }
 }
\ No newline at end of file

From c1cc3740f3839468c78a5fe879e527b45de0a1ec Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 14:23:00 -0400
Subject: [PATCH 05/14] CC-5781: Upgrade script for new storage quota
 implementation

Include propel library
---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 33731a2d3..b6c17b618 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -1,4 +1,6 @@
 <?php
+require_once 'propel/runtime/lib/Propel.php';
+
 class StorageQuotaUpgrade
 {
     public static function startUpgrade()
@@ -20,4 +22,4 @@ class StorageQuotaUpgrade
 
         Application_Model_Preference::setDiskUsage($totalSpace - $freeSpace);
     }
-}
\ No newline at end of file
+}

From 197e12093dbdb283abfc582abbfb13bd471edd0f Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 14:40:08 -0400
Subject: [PATCH 06/14] CC-5781: Upgrade script for new storage quota
 implementation

add propel to include path
---
 .../airtime-2.5.3/StorageQuotaUpgrade.php        | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index b6c17b618..6ac193e65 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -1,5 +1,19 @@
 <?php
-require_once 'propel/runtime/lib/Propel.php';
+
+// Define path to application directory
+defined('APPLICATION_PATH')
+    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../../install_minimal/../airtime_mvc/application'));
+
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, array(
+    get_include_path(),
+    realpath(APPLICATION_PATH . '/../library')
+)));
+
+/*set_include_path(implode(PATH_SEPARATOR, array(
+    get_include_path(),
+    realpath(APPLICATION_PATH . '/../library/propel/runtime/lib')
+)));*/
 
 class StorageQuotaUpgrade
 {

From 57955420f3b9bb82c5d88c3c8d18dcc5fffabed2 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 14:49:23 -0400
Subject: [PATCH 07/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 6ac193e65..97bb2a188 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -10,10 +10,10 @@ set_include_path(implode(PATH_SEPARATOR, array(
     realpath(APPLICATION_PATH . '/../library')
 )));
 
-/*set_include_path(implode(PATH_SEPARATOR, array(
+set_include_path(implode(PATH_SEPARATOR, array(
     get_include_path(),
     realpath(APPLICATION_PATH . '/../library/propel/runtime/lib')
-)));*/
+)));
 
 class StorageQuotaUpgrade
 {

From 10778fd88d2ef70ee06963959998e63a848bb41d Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 14:52:55 -0400
Subject: [PATCH 08/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 97bb2a188..dbef72e41 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -15,6 +15,9 @@ set_include_path(implode(PATH_SEPARATOR, array(
     realpath(APPLICATION_PATH . '/../library/propel/runtime/lib')
 )));
 
+//Propel classes.
+set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
+
 class StorageQuotaUpgrade
 {
     public static function startUpgrade()

From 6cd1ebb5eae3d2167e3048e89d9089a983113d12 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 14:59:58 -0400
Subject: [PATCH 09/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php         | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index dbef72e41..56a792f5a 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -10,14 +10,11 @@ set_include_path(implode(PATH_SEPARATOR, array(
     realpath(APPLICATION_PATH . '/../library')
 )));
 
-set_include_path(implode(PATH_SEPARATOR, array(
-    get_include_path(),
-    realpath(APPLICATION_PATH . '/../library/propel/runtime/lib')
-)));
-
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
 
+require_once 'CcMusicDirsQuery.php';
+
 class StorageQuotaUpgrade
 {
     public static function startUpgrade()

From b61fae77b3163caba3b05f56ab11715fcd45a0e7 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 15:04:54 -0400
Subject: [PATCH 10/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 56a792f5a..99ee2e8dd 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -12,6 +12,7 @@ set_include_path(implode(PATH_SEPARATOR, array(
 
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
+set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
 
 require_once 'CcMusicDirsQuery.php';
 

From 54868c9f6eb317c2165fdf7d5b3ae95950125b25 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 15:07:42 -0400
Subject: [PATCH 11/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 99ee2e8dd..0bfe3df1e 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -12,6 +12,7 @@ set_include_path(implode(PATH_SEPARATOR, array(
 
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
+set_include_path(APPLICATION_PATH . '/models/om' . PATH_SEPARATOR . get_include_path());
 set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
 
 require_once 'CcMusicDirsQuery.php';

From aa531c882f4412d1e625af8ecaa5d3e0cc91cff0 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 15:16:32 -0400
Subject: [PATCH 12/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 0bfe3df1e..d039df381 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -12,10 +12,11 @@ set_include_path(implode(PATH_SEPARATOR, array(
 
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
-set_include_path(APPLICATION_PATH . '/models/om' . PATH_SEPARATOR . get_include_path());
-set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
+#set_include_path(APPLICATION_PATH . '/models/om' . PATH_SEPARATOR . get_include_path());
+#set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
 
 require_once 'CcMusicDirsQuery.php';
+require_once 'BaseCcMusicDirsQuery.php';
 
 class StorageQuotaUpgrade
 {

From c18c4da629dba56976a7dd5f1d15f33c45935964 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 15:18:33 -0400
Subject: [PATCH 13/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index d039df381..43c2e124c 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -12,8 +12,8 @@ set_include_path(implode(PATH_SEPARATOR, array(
 
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
-#set_include_path(APPLICATION_PATH . '/models/om' . PATH_SEPARATOR . get_include_path());
-#set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
+set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
+set_include_path(APPLICATION_PATH . '/models/om' . PATH_SEPARATOR . get_include_path());
 
 require_once 'CcMusicDirsQuery.php';
 require_once 'BaseCcMusicDirsQuery.php';

From 70e660e7dae1bac300a228e3b401015811dc33ce Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 7 Apr 2014 15:26:56 -0400
Subject: [PATCH 14/14] CC-5781: Upgrade script for new storage quota
 implementation

---
 .../upgrades/airtime-2.5.3/StorageQuotaUpgrade.php        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
index 43c2e124c..8574d4bee 100644
--- a/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
+++ b/install_minimal/upgrades/airtime-2.5.3/StorageQuotaUpgrade.php
@@ -10,13 +10,19 @@ set_include_path(implode(PATH_SEPARATOR, array(
     realpath(APPLICATION_PATH . '/../library')
 )));
 
+/*set_include_path(implode(PATH_SEPARATOR, array(
+    get_include_path(),
+    realpath(APPLICATION_PATH . '/../library/propel/runtime/lib')
+)));*/
+
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
 set_include_path(APPLICATION_PATH . '/models/airtime' . PATH_SEPARATOR . get_include_path());
 set_include_path(APPLICATION_PATH . '/models/om' . PATH_SEPARATOR . get_include_path());
 
+require_once 'propel/runtime/lib/Propel.php';
 require_once 'CcMusicDirsQuery.php';
-require_once 'BaseCcMusicDirsQuery.php';
+#require_once 'BaseCcMusicDirsQuery.php';
 
 class StorageQuotaUpgrade
 {