Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

This commit is contained in:
drigato 2013-12-02 14:13:06 -05:00
parent f571000657 28c81fcebb
commit 81912f2934
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CREDITS
View File

@ -2,11 +2,34 @@
CREDITS CREDITS
======= =======
Version 2.5.1
Albert Santoni (albert.santoni@sourcefabric.org)
Role: Developer Team Lead
Denise Rigato (denise.rigato@sourcefabric.org)
Role: Software Developer
Naomi Aro (naomi.aro@sourcefabric.org)
Role: Software Developer
Cliff Wang (cliff.wang@sourcefabric.org)
Role: QA
Daniel James (daniel.james@sourcefabric.org)
Role: Documentor & QA
Community Contributors:
John Chewter
Version 2.5.0 Version 2.5.0
------------- -------------
Albert Santoni (albert.santoni@sourcefabric.org) Albert Santoni (albert.santoni@sourcefabric.org)
Rold: Developer Team Lead Role: Developer Team Lead
Denise Rigato (denise.rigato@sourcefabric.org) Denise Rigato (denise.rigato@sourcefabric.org)
Role: Software Developer Role: Software Developer

2
install_minimal/include/AirtimeInstall.php
View File

@ -224,7 +224,7 @@ class AirtimeInstall
return true; return true;
} }
$command = "su postgres -c \"createdb $database --encoding UTF8 --owner $username\""; $command = "sudo -i -u postgres psql postgres -c \"CREATE DATABASE ".$database." WITH ENCODING 'UTF8' TEMPLATE template0 OWNER ".$username."\"";
@exec($command, $output, $results); @exec($command, $output, $results);
if ($results == 0) { if ($results == 0) {

6
install_minimal/include/airtime-install.php
View File

@ -12,6 +12,12 @@ require_once(__DIR__.'/airtime-constants.php');
// The only way we get here is if we are doing a new install or a reinstall. // The only way we get here is if we are doing a new install or a reinstall.
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
if (PHP_VERSION_ID < 50400) //PHP 5.4
{
echo("ERROR: Your PHP version is too old!\nAirtime requires PHP 5.4 or greater.\n");
exit(1);
}
$iniExists = file_exists("/etc/airtime/airtime.conf"); $iniExists = file_exists("/etc/airtime/airtime.conf");
if ($iniExists) { if ($iniExists) {
//reinstall, Will ask if we should rewrite config files. //reinstall, Will ask if we should rewrite config files.