admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change define (constant) phpcompta_user -> noalyss_user

Browse source
This commit is contained in:
Dany De Bontridder 2014-03-01 22:12:57 +01:00
parent 3b7cd65e2c
commit ceb93b5240
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
html/backup.php
View file

@ -56,10 +56,20 @@ if ( isset ($_REQUEST['sa']) )
if ( $sa=='b')
{
$cmd=escapeshellcmd (PG_DUMP);
putenv("PGPASSWORD=".noalyss_password);
putenv("PGUSER=".noalyss_user);
putenv("PGHOST=".noalyss_psql_host);
putenv("PGPORT=".noalyss_psql_port);
if ( defined ("noalyss_user"))
{
putenv("PGPASSWORD=".noalyss_password);
putenv("PGUSER=".noalyss_user);
putenv("PGHOST=".noalyss_psql_host);
putenv("PGPORT=".noalyss_psql_port);
}else if (defined ("phpcompta_user"))
{
putenv("PGPASSWORD=".phpcompta_password);
putenv("PGUSER=".phpcompta_user);
putenv("PGHOST=".phpcompta_psql_host);
putenv("PGPORT=".phpcompta_psql_port);
}
if ( $_REQUEST['t'] == 'd' )
{
$database=domaine."dossier".$_REQUEST['d'];

6
include/class_database.php
View file

@ -42,9 +42,9 @@ class Database
function __construct ($p_database_id=0,$p_type='dos')
{
if ( IsNumber($p_database_id) == false || strlen($p_database_id) > 5 ) die ("-->Dossier invalide [$p_database_id]");
$noalyss_user=noalyss_user;
$password=noalyss_password;
$port=noalyss_psql_port;
$noalyss_user=(defined ("noalyss_user"))?noalyss_user:phpcompta_user;
$password=(defined("noalyss_password"))?noalyss_password:phpcompta_password;
$port=(defined("noalyss_psql_port"))?noalyss_psql_port:phpcompta_psql_port;
$host=( ! defined ("noalyss_psql_host"))?'127.0.0.1':noalyss_psql_host;
if (defined ("MULTI") && MULTI=="0") {
$noalyss_user = noalyss_user;

17
include/restore.inc.php
View file

@ -31,10 +31,19 @@ if ( isset ($_REQUEST['sa'] ))
putenv("PATH=".PG_PATH);
$cmd=escapeshellcmd (PG_RESTORE);
putenv("PGPASSWORD=".noalyss_password);
putenv("PGUSER=".noalyss_user);
putenv("PGPORT=".noalyss_psql_port);
putenv("PGHOST=").noalyss_psql_host;
if (defined("noalyss_user"))
{
putenv("PGPASSWORD=" . noalyss_password);
putenv("PGUSER=" . noalyss_user);
putenv("PGHOST=" . noalyss_psql_host);
putenv("PGPORT=" . noalyss_psql_port);
} else if (defined("phpcompta_user"))
{
putenv("PGPASSWORD=" . phpcompta_password);
putenv("PGUSER=" . phpcompta_user);
putenv("PGHOST=" . phpcompta_psql_host);
putenv("PGPORT=" . phpcompta_psql_port);
}
$retour='<hr>'.HtmlInput::button_anchor("Retour","?action=restore");
if ( ! isset($_REQUEST['t']))