diff --git a/application/configs/application.ini b/application/configs/application.ini index 88feac347..836d659da 100644 --- a/application/configs/application.ini +++ b/application/configs/application.ini @@ -12,9 +12,9 @@ resources.view[] = resources.db.adapter = "Pdo_Pgsql" resources.db.params.charset = "utf8" resources.db.params.host = "localhost" -resources.db.params.username = "campcaster" -resources.db.params.password = "campcaster" -resources.db.params.dbname = "campcaster" +resources.db.params.username = "airtime" +resources.db.params.password = "airtime" +resources.db.params.dbname = "airtime" [staging : production] diff --git a/application/configs/conf.php b/application/configs/conf.php index 7779721b5..c46d38b69 100644 --- a/application/configs/conf.php +++ b/application/configs/conf.php @@ -8,11 +8,11 @@ global $CC_CONFIG; $CC_CONFIG = array( // Database config 'dsn' => array( - 'username' => 'campcaster', - 'password' => 'campcaster', + 'username' => 'airtime', + 'password' => 'airtime', 'hostspec' => 'localhost', 'phptype' => 'pgsql', - 'database' => 'campcaster', + 'database' => 'airtime', ), // Name of the web server user @@ -173,4 +173,4 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'] //$CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC); -?> \ No newline at end of file +?> diff --git a/application/configs/propel-config.php b/application/configs/propel-config.php index 768c5b151..1860e1090 100644 --- a/application/configs/propel-config.php +++ b/application/configs/propel-config.php @@ -9,7 +9,7 @@ $conf = array ( 'adapter' => 'pgsql', 'connection' => array ( - 'dsn' => 'pgsql:host=localhost;port=5432;dbname=campcaster;user=campcaster;password=campcaster', + 'dsn' => 'pgsql:host=localhost;port=5432;dbname=airtime;user=airtime;password=airtime', ), ), 'default' => 'campcaster', @@ -17,4 +17,4 @@ $conf = array ( 'generator_version' => '1.5.2', ); $conf['classmap'] = include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-propel-config.php'); -return $conf; \ No newline at end of file +return $conf; diff --git a/build/build.properties b/build/build.properties index 071fae700..02554bf8b 100644 --- a/build/build.properties +++ b/build/build.properties @@ -3,7 +3,7 @@ project.build = ${project.home}/build #Database driver propel.database = pgsql -propel.database.url = pgsql:host=localhost dbname=campcaster user=campcaster password=campcaster +propel.database.url = pgsql:host=localhost dbname=airtime user=airtime password=airtime #Project name propel.project = campcaster diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 064864205..55f6681fd 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -145,7 +145,7 @@ } function getScheduleFromServer(){ - $.ajax({ url: "http://localhost/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){ + $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){ parseItems(data.entries); }}); setTimeout(getScheduleFromServer, 5000); diff --git a/utils/airtime-import.php b/utils/airtime-import.php index d6c74d4b2..21d47e2de 100644 --- a/utils/airtime-import.php +++ b/utils/airtime-import.php @@ -238,11 +238,11 @@ if ($DEBUG_IMPORT) { $testonly = false; $importMode = "link"; $files = array("/path/to/your/test/file.mp3"); - $dsn = array('username' => 'campcaster', - 'password' => 'campcaster', + $dsn = array('username' => 'airtime', + 'password' => 'airtime', 'hostspec' => 'localhost', 'phptype' => 'pgsql', - 'database' => 'campcaster'); + 'database' => 'airtime'); } else { $dsn = $CC_CONFIG['dsn']; }