diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index d4edf506100..736cce80791 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -21,78 +21,28 @@ */ require("./pre.inc.php"); -if ($HTTP_POST_VARS["action"] == 'changetheme') -{ - $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'MAIN_THEME', value='".$HTTP_POST_VARS["theme"]."', visible=0"; - - if ($db->query($sql)) - { - - } - Header('Location: index.php'); -} - if ($HTTP_POST_VARS["action"] == 'update') { dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM",$HTTP_POST_VARS["nom"]); dolibarr_set_const($db, "MAIN_INFO_TVAINTRA",$HTTP_POST_VARS["tva"]); - Header('Location: index.php'); + Header("Location: $PHP_SELF"); } llxHeader(); -print_titre("Configuration Dolibarr (version ".DOL_VERSION.")"); +print_titre("Configuration générale (Dolibarr version ".DOL_VERSION.")"); -print ''; -print ''; -print ''; -print "\n"; - -print ''; -print ''; - -if ($_GET["action"] == 'modtheme') -{ - clearstatcache(); - $dir = "../theme/"; - $handle=opendir($dir); - - print ''; - print ''; - print ''; -} -else -{ - print ''; -} -print '
NomValeurAction
Version' . DOL_VERSION . ' 
Theme
' . $conf->theme . 'Changer

'; +print "
\n"; if ($_GET["action"] == 'edit') { - print '
'; + print ''; print ''; print ''; - print ''; + print ''; print ''; @@ -108,14 +58,14 @@ else { print '
Informations sur la société ou association
Informations sur la société ou association
Nom de la société/association'; print '
'; - print ''; + print ''; print ''; print ''; print '
Informations sur la société ou association
Informations sur la société ou association
Nom de la société/association' . MAIN_INFO_SOCIETE_NOM . '
Numéro de tva intracommunautaire' . MAIN_INFO_TVAINTRA . '

'; print '
'; - print 'Editer'; + print 'Editer'; print '
'; diff --git a/htdocs/admin/pre.inc.php b/htdocs/admin/pre.inc.php index 8e75bfb05a9..53880c2819f 100644 --- a/htdocs/admin/pre.inc.php +++ b/htdocs/admin/pre.inc.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,30 +32,34 @@ function llxHeader($head = "", $urlp = "") { $menu = new Menu(); - $menu->add("index.php", "Configuration"); + $menu->add(DOL_URL_ROOT."/admin/index.php", "Configuration générale"); - $menu->add("modules.php", "Modules"); + $menu->add(DOL_URL_ROOT."/admin/const.php", "Configuration autre"); - $menu->add("boxes.php", "Boites"); + $menu->add(DOL_URL_ROOT."/admin/ihm.php", "IHM"); + + $menu->add(DOL_URL_ROOT."/admin/modules.php", "Modules"); + + $menu->add(DOL_URL_ROOT."/admin/boxes.php", "Boites"); if(defined("MAIN_MODULE_EXTERNAL_RSS") && MAIN_MODULE_EXTERNAL_RSS) { - $menu->add_submenu("external_rss.php", "Syndication"); + $menu->add_submenu(DOL_URL_ROOT."/admin/external_rss.php", "Syndication"); } //$menu->add_submenu("sqltables.php", "Tables"); if ($conf->boutique->enabled) { - $menu->add("boutique.php", "Boutique"); + $menu->add(DOL_URL_ROOT."/admin/boutique.php", "Boutique"); if (defined("DB_NAME_OSC")) { - $menu->add_submenu("osc-languages.php", "OSC Languages $toto"); + $menu->add_submenu(DOL_URL_ROOT."/admin/osc-languages.php", "OSC Languages $toto"); } } - $menu->add("system/", "System"); + $menu->add("system/", "Système"); left_menu($menu->liste); } diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index fa26ce8c2c5..f860aaea36c 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -22,7 +22,7 @@ require("./pre.inc.php"); llxHeader(); -print_titre("Constantes de configuration Dolibarr"); +print_titre("Liste de tous les paramètres de configuration Dolibarr"); print ''; print ''; diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 959ef427d34..ea434ef12c0 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,31 +19,66 @@ * $Id$ * $Source$ */ -require("./pre.inc.php"); + +// Choix du menu à garder fixe +// Ceci va servir pour garder le menu fixe quelquesoit les liens cliqué +// dans ce menu. Cela permet d'appeler des pages en dehors sans perdre +// le menu qui nous intéresse. +// ELDY: A finir +//session_start(); +//$fix_top_menu="accueil"; +//$fix_left_menu="system"; +//session_register("fix_top_menu"); +//session_register("fix_left_menu"); + +//include_once("../../allpre.inc.php"); +include_once("./pre.inc.php"); llxHeader(); -print_titre("Configuration Dolibarr (version ".DOL_VERSION.")"); +print_titre("Résumé des informations systèmes Dolibarr"); -print '
'; -print ''; -print ''; -print "\n"; - -print "'; -print "'; -print "'; -print "'; - - -print ''; -print "'; -print "'; -print "'; -print "'; -print "'; +print "
\n"; +print '
NomValeurAction
Version" . DOL_VERSION . ' 
css" . $conf->css . ' 
theme" . $conf->theme . ' 
document root" . DOL_DOCUMENT_ROOT . ' 
Database
type" . $conf->db->type . ' 
host" . $conf->db->host . ' 
user" . $conf->db->user . '  
pass" . $conf->db->pass . '  
Database name" . $conf->db->name . ' 
'; +print "\n"; +print "\n"; print '
Dolibar
Version" . DOL_VERSION . "
'; +print "
\n"; + +print ''; +print "\n"; +print "\n"; +print '
OS
Version".get_cfg_var("System")."
'; + +print "
\n"; + +print ''; +print "\n"; +print "\n"; +print "\n"; +print '
Serveur Web
Version".$_SERVER["SERVER_SOFTWARE"]."
document root" . DOL_DOCUMENT_ROOT . "
'; + +print "
\n"; + +print ''; +print "\n"; +print "\n"; +print "\n"; +print '
PHP
Version".phpversion()."
Liaison Web-PHP".php_sapi_name()."
'; + +print "
\n"; + +print ''; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print '
Base de données
type" . $conf->db->type . "
host" . $conf->db->host . "
user" . $conf->db->user . " 
pass" . $conf->db->pass . " 
Database name" . $conf->db->name . "
'; + + llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index 05be5da383c..10d2a2b1bcf 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -22,7 +22,9 @@ require("./pre.inc.php"); llxHeader(); -print "
"; + +ob_start(); + if ($what == 'conf') { phpinfo(INFO_CONFIGURATION); @@ -39,6 +41,21 @@ else { phpinfo(); } -print "
"; + +$chaine = ob_get_contents(); +ob_end_clean(); + +# Nettoie la sortie php pour inclusion dans une page deja existante +$chaine = eregi_replace('.*.*','',$chaine); +$chaine = eregi_replace('.*<body>','',$chaine); +$chaine = eregi_replace('a:link.*underline','',$chaine); +$chaine = eregi_replace('table.*important; }','',$chaine); +$chaine = eregi_replace('<hr />','',$chaine); +$chaine = eregi_replace('</body></html>','',$chaine); + +print "$chaine\n"; +print "<br>\n"; + llxfooter(); ?> diff --git a/htdocs/admin/system/pre.inc.php b/htdocs/admin/system/pre.inc.php index b491594ac59..8beabb77583 100644 --- a/htdocs/admin/system/pre.inc.php +++ b/htdocs/admin/system/pre.inc.php @@ -1,5 +1,6 @@ <?PHP /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> + * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,21 +30,16 @@ function llxHeader($head = "", $urlp = "") { $menu = new Menu(); - $menu->add("index.php", "System"); - $menu->add_submenu("../modules.php", "Modules"); + $menu->add("index.php", "Résumé"); - $menu->add("mysql.php", "Mysql"); - $menu->add_submenu("mysql-tables.php", "Tables"); - $menu->add_submenu("mysql-tables-contraintes.php", "Tables Contraintes"); + $menu->add(DOL_URL_ROOT."/about.php", "Dolibarr"); + $menu->add_submenu("constall.php", "Tous les paramètres"); - $menu->add("pear.php", "Pear"); - $menu->add_submenu("pear_packages.php", "Paquets"); + $menu->add("os.php", "OS"); - $menu->add("const.php", "Constantes"); + $menu->add("web.php", "Serveur Web"); - $menu->add_submenu("constall.php", "Tout voir"); - - $menu->add("info.php", "phpinfo"); + $menu->add("phpinfo.php", "Php"); $menu->add_submenu("phpinfo.php?what=conf", "Conf"); @@ -51,7 +47,12 @@ function llxHeader($head = "", $urlp = "") { $menu->add_submenu("phpinfo.php?what=modules", "Modules"); - $menu->add(DOL_URL_ROOT."/admin/", "Configuration"); + $menu->add("pear.php", "Pear"); + $menu->add_submenu("pear_packages.php", "Paquets"); + + $menu->add("mysql.php", "Base de données"); + $menu->add_submenu("mysql-tables.php", "Tables"); + $menu->add_submenu("mysql-tables-contraintes.php", "Tables Contraintes"); left_menu($menu->liste); }