[Noalyss-commit] [noalyss] 03/06: Testé avec MonoDossier et MultiDossier

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit cce45d454f7a4ab1795e1fa38b233559689c121e
Author: Dany De Bontridder <address@hidden>
Date:   Sat Jan 30 22:54:10 2016 +0100

    Testé avec MonoDossier et MultiDossier
---
 html/install.php   |   15 +++++++--------
 include/config.inc |   35 ++++++++---------------------------
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/html/install.php b/html/install.php
index 166cbd3..25dd70e 100644
--- a/html/install.php
+++ b/html/install.php
@@ -591,7 +591,7 @@ if ($account == 0 ) {
 
  if ( ! DEBUG) ob_end_clean();
 echo '<h1>'._('Important').'</h1>';
-echo '<p>'._('Utilisateur  administrateur'),' ',$cadmin,'</p>';
+echo '<p>'._('Utilisateur  administrateur'),' ',NOALYSS_ADMINISTRATOR,'</p>';
 echo '<p>',_('Mot de passe'),' phpcompta','</p>';
  }// end if
 // Add a french accountancy model
@@ -613,11 +613,7 @@ if  (defined("MULTI") && MULTI == 0)
                      
             if ( ! DEBUG) ob_end_clean();
        }
-        /* update name administrator */
-        if ( isset ($_REQUEST['cadmin'])) {
-           $db->exec_sql("update ac_users set use_login=$1 where use_id=1",
-            array($cadmin));
-        }
+       
         
         if ($db->exist_table("version") == false)
        {
@@ -647,9 +643,12 @@ if  (defined("MULTI") && MULTI == 0)
                 
$db->execute_script(NOALYSS_INCLUDE.'/sql/patch/ac-upgrade'.$i.'.sql');
             }
         }
+        
+        $db->exec_sql("update ac_users set use_login=$1 where use_id=1",
+              array(strtolower(NOALYSS_ADMINISTRATOR)));
         echo '<h1>'._('Important').'</h1>';
-        echo '<p>'._('Utilisateur administrateur'),' ',$cadmin,'</p>';
-        echo '<p>',_('Mot de passe'),' phpcompta','</p>';
+        echo '<p>'._('Utilisateur administrateur'),' 
',NOALYSS_ADMINISTRATOR,'</p>';
+        echo '<p>',_('Mot de passe par défaut à l\'installation'),' 
phpcompta','</p>';
         echo "<h2 class=\"warning\">";
         printf (" VOUS DEVEZ EFFACER CE FICHIER %s",__FILE__);
         echo "</h2>";
diff --git a/include/config.inc b/include/config.inc
index 2afcaf5..9f35240 100644
--- a/include/config.inc
+++ b/include/config.inc
@@ -1,28 +1,4 @@
-<?php
-/*
- *   This file is part of NOALYSS.
- *
- *   NOALYSS is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   NOALYSS is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with NOALYSS; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder address@hidden
-
-/*!\file
- * \brief user setting
- */
+<?php 
 date_default_timezone_set ('Europe/Brussels');
 $_ENV['TMP']='/tmp';
 define("PG_PATH","/usr/bin");
@@ -33,6 +9,10 @@ define ("noalyss_user","noalyss_sql");
 define ("noalyss_password","dany");
 define ("noalyss_psql_port","5432");
 define ("noalyss_psql_host","localhost");
+
+// If you change the NOALYSS_ADMINISTRATOR , you will need to rerun 
http://..../noalyss/html/install.php
+// But it doesn't change the password
+define ("NOALYSS_ADMINISTRATOR","admin");
 define ("LOCALE",1);
 define ("domaine","");
 define ("MULTI",1);
@@ -50,7 +30,8 @@ define ("dbname","");
 // define ("NOALYSS_PLUGIN","");
 // define ("NOALYSS_INCLUDE","");
 // define ("NOALYSS_TEMPLATE","");
-
+// Fix an issue with PDF when exporting receipt in PDF in ANCGL
+// define ("FIX_BROKEN_PDF","NO");
 
 // Uncomment if you don't want 
 // to be informed when a new release is 
@@ -60,4 +41,4 @@ define ("dbname","");
 // To allow to access the Info system
 // define ("SYSINFO_DISPLAY",true);
 // For developpement
-// define ("NOALYSS_VERSION",9999);
+// define ("NOALYSS VERSION",9999);