diff --git a/application/forms/Preferences.php b/application/forms/Preferences.php index 2e770a9a6..eaaff98a6 100644 --- a/application/forms/Preferences.php +++ b/application/forms/Preferences.php @@ -59,7 +59,7 @@ class Application_Form_Preferences extends Zend_Form )); //SoundCloud Password - $this->addElement('text', 'SoundCloudPassword', array( + $this->addElement('password', 'SoundCloudPassword', array( 'class' => 'input_text', 'label' => 'SoundCloud Password:', 'required' => false, diff --git a/install/airtime-install.php b/install/airtime-install.php index b1c1019ac..8b203f6df 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -16,7 +16,7 @@ AirtimeIni::UpdateIniFiles(); require_once(dirname(__FILE__).'/../application/configs/conf.php'); require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); -echo PHP_EOL."*** Installing Airtime alpha 1.7 ***".PHP_EOL; +echo PHP_EOL."*** Installing Airtime ".AIRTIME_VERSION." ***".PHP_EOL; echo PHP_EOL."*** Database Installation ***".PHP_EOL; diff --git a/install/airtime-uninstall.php b/install/airtime-uninstall.php index 0065052f9..7accac35f 100644 --- a/install/airtime-uninstall.php +++ b/install/airtime-uninstall.php @@ -15,7 +15,7 @@ require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); AirtimeInstall::RemoveSymlinks(); -echo "Uninstalling Airtime alpha 1.7".PHP_EOL; +echo "Uninstalling Airtime ".AIRTIME_VERSION.PHP_EOL; echo "******************************* Uninstall Begin ********************************".PHP_EOL; //------------------------------------------------------------------------ diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index cea643cf9..8a5071392 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -36,7 +36,6 @@ class AirtimeIni{ echo "Could not copy recorder.cfg to /etc/airtime/. Exiting."; exit(1); } - if (!copy(__DIR__."/../../python_apps/pypo/scripts/liquidsoap.cfg", "/etc/airtime/liquidsoap.cfg")){ echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; exit(1); @@ -107,7 +106,7 @@ class AirtimeIni{ { $api_key = AirtimeIni::GenerateRandomString(); AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'api_key', $api_key); - AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'baseFilesDir', realpath(__DIR__.'/../../files')); + AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'baseFilesDir', realpath(__DIR__.'/../../').'/files'); AirtimeIni::UpdateIniValue('/etc/airtime/pypo.cfg', 'api_key', "'$api_key'"); AirtimeIni::UpdateIniValue('/etc/airtime/recorder.cfg', 'api_key', "'$api_key'"); AirtimeIni::UpdateIniValue(__DIR__.'/../../build/build.properties', 'project.home', realpath(__dir__.'/../../'));