From 9bfb6b53b850bedc559636d13b1228f3e54af9aa Mon Sep 17 00:00:00 2001
From: mkonecny <martin.konecny@sourcefabric.org>
Date: Thu, 16 Dec 2010 16:36:51 -0500
Subject: [PATCH] fixed problems with not working out of a fresh install.

---
 application/controllers/ApiController.php | 4 ++--
 application/models/StoredFile.php         | 4 ++--
 build/schema.xml                          | 2 ++
 build/sql/schema.sql                      | 2 ++
 pypo/install/pypo-install.py              | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/application/controllers/ApiController.php b/application/controllers/ApiController.php
index 86559506a..fb85f94ab 100644
--- a/application/controllers/ApiController.php
+++ b/application/controllers/ApiController.php
@@ -36,7 +36,7 @@ class ApiController extends Zend_Controller_Action
     }
 
 
-    public function mediaAction()
+    public function getMediaAction()
     {
         global $CC_CONFIG;
 
@@ -203,4 +203,4 @@ class ApiController extends Zend_Controller_Action
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/application/models/StoredFile.php b/application/models/StoredFile.php
index 9925fcc63..7c17b6fd0 100644
--- a/application/models/StoredFile.php
+++ b/application/models/StoredFile.php
@@ -1697,7 +1697,7 @@ class StoredFile {
     {
         global $CC_CONFIG;
         return "http://".$CC_CONFIG["storageUrlHost"]
-        .$CC_CONFIG["apiPath"]."getMedia/file/"
+        .$CC_CONFIG["apiPath"]."get-media/file/"
         .$this->gunid.".".$this->getFileExtension();
     }
 
@@ -1784,4 +1784,4 @@ class StoredFile {
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/build/schema.xml b/build/schema.xml
index cea6a40e6..1c1a079dd 100644
--- a/build/schema.xml
+++ b/build/schema.xml
@@ -211,6 +211,8 @@
     <column name="fade_out" phpName="FadeOut" type="TIME" required="false" defaultValue="00:00:00"/>
     <column name="cue_in" phpName="CueIn" type="TIME" required="false" defaultValue="00:00:00"/>
     <column name="cue_out" phpName="CueOut" type="TIME" required="false" defaultValue="00:00:00"/>
+    <column name="schedule_group_played" phpName="ScheduleGroupPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
+    <column name="media_item_played" phpName="MediaItemPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
   </table>
   <table name="cc_sess" phpName="CcSess">
     <column name="sessid" phpName="Sessid" type="CHAR" size="32" primaryKey="true" required="true"/>
diff --git a/build/sql/schema.sql b/build/sql/schema.sql
index fffa3356b..4d6576e50 100644
--- a/build/sql/schema.sql
+++ b/build/sql/schema.sql
@@ -306,6 +306,8 @@ CREATE TABLE "cc_schedule"
 	"fade_out" TIME default '00:00:00',
 	"cue_in" TIME default '00:00:00',
 	"cue_out" TIME default '00:00:00',
+	"schedule_group_played" BOOLEAN default 'f',
+	"media_item_played" BOOLEAN default 'f',
 	PRIMARY KEY ("id")
 );
 
diff --git a/pypo/install/pypo-install.py b/pypo/install/pypo-install.py
index 36f64170c..da6d11835 100644
--- a/pypo/install/pypo-install.py
+++ b/pypo/install/pypo-install.py
@@ -32,7 +32,7 @@ def create_user(username):
   if (output[0:3] != "uid"):
     # Make the pypo user
     print "Creating user "+username
-    os.system("adduser --system --quiet --group --disabled-login "+username)
+    os.system("adduser --system --quiet --group --shell /bin/bash "+username)
   else:
     print "User already exists."