From ead69f843d48358be94b7440b61d7cae6a07c4ce Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 16 May 2013 22:13:12 +0000 Subject: [PATCH] =?UTF-8?q?Task=20#0000839:=20R=C3=A9=C3=A9criture=20de=20?= =?UTF-8?q?la=20proc=C3=A9dure=20d'installation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inclu en premier lieu constant.php pour avoir la bonne valeur dans include_path Tous les tags '; $my_domain=""; -require ('config.inc.php'); +require_once '../include/constant.php'; +require_once ('config.inc.php'); if ( strlen(domaine) > 0 ) { $my_domain="Domaine : ".domaine; diff --git a/html/login.php b/html/login.php index 82b75deee..6f862191a 100644 --- a/html/login.php +++ b/html/login.php @@ -17,6 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr +require_once '../include/constant.php'; + include_once ("ac_common.php"); require_once('constant.php'); @@ -41,7 +43,7 @@ if ( isset ($_POST["p_user"] ) ) /* * Check repository version */ - if ( $rep->get_value('select val from version') != DBVERSIONREPO) + if ( $rep->get_value('select val from version') != DBVERSIONREPO) { echo alert('Version de base de données incorrectes, vous devez mettre à jour'); echo ""; @@ -51,12 +53,12 @@ if ( isset ($_POST["p_user"] ) ) include_once ("class_user.php"); $User=new User($rep); $User->Check(false,'LOGIN'); - if ($g_captcha == true) + if ($g_captcha == true) { include("securimage/securimage.php"); $img = new Securimage(); $valid = $img->check($_POST['captcha_code']); - if ( $valid == false ) + if ( $valid == false ) { echo alert('Code invalide'); echo ""; @@ -74,7 +76,7 @@ else * Check repository version */ - if ( $rep->get_value('select val from version') != DBVERSIONREPO) + if ( $rep->get_value('select val from version') != DBVERSIONREPO) { echo alert('Version de base de données incorrectes, vous devez mettre à jour'); echo ""; diff --git a/html/recherche.php b/html/recherche.php index df30ec37b..9b1acc845 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -21,6 +21,7 @@ /*! \file * \brief Search module */ +require_once '../include/constant.php'; require_once('class_dossier.php'); include_once("ac_common.php"); include_once ("constant.php"); diff --git a/html/show_document.php b/html/show_document.php index 974b1886c..bff4d1027 100644 --- a/html/show_document.php +++ b/html/show_document.php @@ -23,7 +23,7 @@ /** \file * \brief retrieve a document */ - +require_once '../include/constant.php'; require_once('class_database.php'); require_once("ac_common.php"); require_once( "class_document.php"); diff --git a/html/show_document_modele.php b/html/show_document_modele.php index 0ac452a2e..9e536a76d 100644 --- a/html/show_document_modele.php +++ b/html/show_document_modele.php @@ -22,7 +22,7 @@ /*! \file * \brief send the document template */ - +require_once '../include/constant.php'; require_once('class_database.php'); require_once("ac_common.php"); diff --git a/html/show_pj.php b/html/show_pj.php index a31067610..0fbc22d7e 100644 --- a/html/show_pj.php +++ b/html/show_pj.php @@ -22,6 +22,7 @@ /*!\file * \brief show an attach of an operation */ +require_once '../include/constant.php'; include_once ("ac_common.php"); require_once('class_dossier.php'); $gDossier=dossier::id(); diff --git a/html/user_login.php b/html/user_login.php index 5cadeb751..495b45dca 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -22,6 +22,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr // $Revision$ +require_once '../include/constant.php'; include_once ("ac_common.php"); require_once('class_database.php'); require_once('class_itext.php'); diff --git a/html/user_pref.php b/html/user_pref.php index 7418c0dcc..1c5a439cd 100644 --- a/html/user_pref.php +++ b/html/user_pref.php @@ -22,7 +22,7 @@ /*! \file * \brief Page for the personal preference (theme, password,...) */ - +require_once '../include/constant.php'; include_once ("ac_common.php"); require_once('class_database.php'); /* Admin. Dossier */ diff --git a/include/ac_common.php b/include/ac_common.php index f128bf8bc..63ff606b2 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -297,7 +297,7 @@ function html_page_start($p_theme="", $p_script="", $p_script2="") echo " $title - + " . $p_script2 . " diff --git a/include/ajax_boxcard_search.php b/include/ajax_boxcard_search.php index 00d4e1d04..36fb328ec 100644 --- a/include/ajax_boxcard_search.php +++ b/include/ajax_boxcard_search.php @@ -69,7 +69,7 @@ Filtre

Aucun résultat

- + diff --git a/include/constant.php b/include/constant.php index 4760bceda..065c03fc6 100644 --- a/include/constant.php +++ b/include/constant.php @@ -1,4 +1,5 @@ ✖"; $g_succeed=""; /*set to none for production */ /* uncomment for production */ -//define ('SVNINFO',5900); +define ('SVNINFO',5900); $version_phpcompta=SVNINFO; -define ("DEBUG",false); +define ("DEBUG",true); /* define ('SVNINFO',5015); * $version_phpcompta=SVNINFO; * define ("DEBUG",true); diff --git a/include/stock_cfg.inc.php b/include/stock_cfg.inc.php index f0887a481..b3dd1873f 100644 --- a/include/stock_cfg.inc.php +++ b/include/stock_cfg.inc.php @@ -98,14 +98,14 @@ $array=$cn->get_array($sql." ".$order); - - +
@@ -135,7 +135,7 @@

Opérations concernées

    - Actions concernées
      - '; - - - - + @@ -344,7 +344,7 @@ function toggleShowDetail() {
- +
diff --git a/include/template/profile_sec_repository.php b/include/template/profile_sec_repository.php index e991bd701..cc86e3327 100644 --- a/include/template/profile_sec_repository.php +++ b/include/template/profile_sec_repository.php @@ -1,4 +1,4 @@ - - - value=$aright_value; $isel->selected=$array[$i]['ur_right']; echo $isel->input();?> - + diff --git a/include/template/user_sec_profile.php b/include/template/user_sec_profile.php index 071905099..ba6077716 100644 --- a/include/template/user_sec_profile.php +++ b/include/template/user_sec_profile.php @@ -42,18 +42,18 @@ - - value=$aright_value; $isel->selected=$array[$i]['ua_right']; echo $isel->input();?> - + \ No newline at end of file