[Phpcompta-dev] r4944 - in phpcompta/trunk: . html include

[phpcompta-dev]

Author: danydb
Date: 2012-06-19 19:46:29 +0200 (Tue, 19 Jun 2012)
New Revision: 4944

Modified:
   phpcompta/trunk/
   phpcompta/trunk/html/
   phpcompta/trunk/html/backup.php
   phpcompta/trunk/include/
   phpcompta/trunk/include/class_stock_goods.php
   phpcompta/trunk/include/restore.inc.php
Log:
set properly the PG variable for restore and backup


Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svn:ignore
   - cache
compile
tmp

   + cache
compile
tmp
.a.swp



Property changes on: phpcompta/trunk/html
___________________________________________________________________
Name: svn:ignore
   - *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp
.direct.php.swp
.style-light.css.swp
.a.swp
.htaccess.swp
.b.php.swp
.style.css.swp

   + *.log
ajax
.user_login.php.swp
.~lock.a.csv#
.~lock.a.ods#
.a.csv.swp
.direct.php.swp
.style-light.css.swp
.a.swp
.htaccess.swp
.b.php.swp
.style.css.swp
.last.txt.swp
.export.php.swp


Modified: phpcompta/trunk/html/backup.php
===================================================================
--- phpcompta/trunk/html/backup.php     2012-06-19 13:26:24 UTC (rev 4943)
+++ phpcompta/trunk/html/backup.php     2012-06-19 17:46:29 UTC (rev 4944)
@@ -59,10 +59,11 @@
         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'];
-            $args= " -Fc -Z9 --no-owner -p ".phpcompta_psql_port." ".$database;
+            $args= " -Fc -Z9 --no-owner -h ".phpcompta_psql_host." -p 
".phpcompta_psql_port." ".$database;
             header('Content-type: application/octet');
             
header('Content-Disposition:attachment;filename="'.$database.'.bin"',FALSE);
 
@@ -73,7 +74,7 @@
         if ( $_REQUEST['t'] == 'm' )
         {
             $database=domaine."mod".$_REQUEST['d'];
-            $args= " -Fc -Z9 --no-owner -p ".phpcompta_psql_port." ".$database;
+            $args= " -Fc -Z9 --no-owner -h ".phpcompta_psql_host." -p 
".phpcompta_psql_port." ".$database;
             header('Content-type: bin/x-application');
             header('Content-Disposition: 
attachment;filename="'.$database.'.bin"',FALSE);
             $a=passthru ($cmd.$args);


Property changes on: phpcompta/trunk/include
___________________________________________________________________
Name: svn:ignore
   - .constant.php.swp

   + .constant.php.swp
.action.inc.php.swp


Modified: phpcompta/trunk/include/class_stock_goods.php
===================================================================
--- phpcompta/trunk/include/class_stock_goods.php       2012-06-19 13:26:24 UTC 
(rev 4943)
+++ phpcompta/trunk/include/class_stock_goods.php       2012-06-19 17:46:29 UTC 
(rev 4944)
@@ -75,7 +75,7 @@
                        $sg_code[$e]->setReadOnly($p_readonly);
                        $sg_quantity[$e]->setReadOnly($p_readonly);
                }
-               require_once 'template/stock_inv.php';
+//             require_once 'template/stock_inv.php';
        }
 
        function save($p_array)

Modified: phpcompta/trunk/include/restore.inc.php
===================================================================
--- phpcompta/trunk/include/restore.inc.php     2012-06-19 13:26:24 UTC (rev 
4943)
+++ phpcompta/trunk/include/restore.inc.php     2012-06-19 17:46:29 UTC (rev 
4944)
@@ -35,6 +35,8 @@
     putenv("PGPASSWORD=".phpcompta_password);
     putenv("PGUSER=".phpcompta_user);
     putenv("PGPORT=".phpcompta_psql_port);
+       putenv("PGHOST=").phpcompta_psql_host;
+       
     $retour='<hr>'.HtmlInput::button_anchor("Retour","?action=restore");
     if ( ! isset($_REQUEST['t']))
     {



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu