diff --git a/build/exe/doliwamp/dolibarr.conf.install b/build/exe/doliwamp/dolibarr.conf.install index a220015cbed..c57cfddfbbb 100644 --- a/build/exe/doliwamp/dolibarr.conf.install +++ b/build/exe/doliwamp/dolibarr.conf.install @@ -1,21 +1,21 @@ Alias /dolibarr "WAMPROOT/www/dolibarr/htdocs/" -# to give access to dolibarr from outside -# replace the lines +# NOTE: +# To restrict access to dolibarr from outside set lines # -# Order Deny,Allow +# Order Deny,Allow # Deny from all # Allow from 127.0.0.1 # -# by +# instead of # -# Order Allow,Deny -# Allow from all +# Order Allow,Deny +# Allow from all # - Options Indexes FollowSymLinks MultiViews - AllowOverride all - Order Allow,Deny - Allow from all + Options Indexes FollowSymLinks MultiViews + AllowOverride all + Order Allow,Deny + Allow from all \ No newline at end of file diff --git a/build/exe/doliwamp/doliwamp2.4.iss b/build/exe/doliwamp/doliwamp2.4.iss index 53ba516d40b..305b9fa89c5 100644 --- a/build/exe/doliwamp/doliwamp2.4.iss +++ b/build/exe/doliwamp/doliwamp2.4.iss @@ -360,6 +360,7 @@ begin StringChange (srcContents, 'WAMPPHPVERSION', phpVersion); StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion); StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion); + StringChange (srcContents, 'WAMPAPACHEPORT', apachePort); SaveStringToFile(destFile, srcContents, False); end else @@ -369,6 +370,7 @@ begin StringChange (srcContents, 'WAMPPHPVERSION', phpVersion); StringChange (srcContents, 'WAMPMYSQLVERSION', mysqlVersion); StringChange (srcContents, 'WAMPAPACHEVERSION', apacheVersion); + StringChange (srcContents, 'WAMPAPACHEPORT', apachePort); SaveStringToFile(destFile, srcContents, False); end diff --git a/build/exe/doliwamp/index.php.install b/build/exe/doliwamp/index.php.install index fc42b5c504b..73bf50a8d09 100644 --- a/build/exe/doliwamp/index.php.install +++ b/build/exe/doliwamp/index.php.install @@ -75,8 +75,61 @@ EOFILE; $pngFolderGo = <<< EOFILE iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJISURBVDjLpZPLS5RhFIef93NmnMIRSynvgRF5KWhRlmWbbotwU9sWLupfCBeBEYhQm2iVq1oF0TKIILIkMgosxBaBkpFDmpo549y+772dFl5bBIG/5eGch9+5KRFhOwrYpmIAk8+OjScr29uV2soTotzXtLOZLiD6q0oBUDjY89nGAJQErU3dD+NKKZDVYpTChr9a5sdvpWUtClCWqBRxZiE/9+o68CQGgJUQr8ujn/dxugyCSpRKkaw/S33n7QQigAfxgKCCitqpp939mwCjAvEapxOIF3xpBlOYJ78wQjxZB2LAa0QsYEm19iUQv29jBihJeltCF0F0AZNbIdXaS7K6ba3hdQey6iBWBS6IbQJMQGzHHqrarm0kCh6vf2AzLxGX5eboc5ZLBe52dZBsvAGRsAUgIi7EFycQl0VcDrEZvFlGXBZshtCGNNa0cXVkjEdXIjBb1kiEiLd4s4jYLOKy9L1+DGLQ3qKtpW7XAdpqj5MLC/Q8uMi98oYtAC2icIj9jdgMYjNYrznf0YsTj/MOjzCbTXO48RR5XaJ35k2yMBCoGIBov2yLSztNPpHCpwKROKHVOPF8X5rCeIv1BuMMK1GOI02nyZsiH769DVcBYXRneuhSJ8I5FCmAsNomrbPsrWzGeocTz1x2ht0VtXxKj/Jl+v1y0dCg/vVMl4daXKg12mtCq9lf0xGcaLnA2Mw7hidfTGhL5+ygROp/v/HQQLB4tPlMzcjk8EftOTk7KHr1hP4T0NKvFp0vqyl5F18YFLse/wPLHlqRZqo3CAAAAABJRU5ErkJggg== EOFILE; -$gifLogo = <<< EOFILE -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 +$pngLogo = <<< EOFILE +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 EOFILE; $pngPlugin = <<< EOFILE iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsSAAALEgHS3X78AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAABmklEQVR42mL4//8/AyUYIIDAxK5du1BwXEb3/9D4FjBOzZ/wH10ehkF6AQIIw4B1G7b+D09o/h+X3gXG4YmteA0ACCCsLghPbPkfm9b5PzK5439Sdg9eAwACCEyANMBwaFwTGIMMAOEQIBuGA6Mb/qMbABBAEAOQnIyMo1M74Tgiqf2/b3gVhgEAAQQmQuKa/8ekdYMxyLCgmEYMHJXc9t87FNMAgACCGgBxIkgzyDaQU5FxQGQN2AUBUXX/vULKwdgjsOQ/SC9AAKEEYlB03f+oFJABdSjYP6L6P0guIqkVjt0DisEGAAQQigEgG0AhHxBVi4L9wqvBBiEHtqs/xACAAAIbEBBd/x+Eg2ObwH4FORmGfYCaQRikCUS7B5YBNReBMUgvQABBDADaAtIIwsEx9f/Dk9pQsH9kHTh8XANKMAIRIIDAhF9ELTiQQH4FaQAZCAsskPNhyRpkK7oBAAEEMSC8GsVGkEaYIlBghcU3gbGzL6YBAAEEJnzCgP6EYs/gcjCGKQI5G4Z9QiswDAAIIAZKszNAgAEAHgFgGSNMTwgAAAAASUVORK5CYII= @@ -112,9 +165,9 @@ if (isset($_GET['img'])) echo base64_decode($pngFolderGo); exit(); - case 'gifLogo' : - header("Content-type: image/gif"); - echo base64_decode($gifLogo); + case 'pngLogo' : + header("Content-type: image/png"); + echo base64_decode($pngLogo); exit(); case 'pngPlugin' : @@ -178,7 +231,7 @@ while ($file = readdir($handle)) if (is_dir($file) && !in_array($file,$projectsListIgnore)) { $projectContents .= '
  • '.$file; - if ($file == 'dolibarr') $projectContents .= ' (URL=http://ipofyourserver/'.$file.'/)'; + if ($file == 'dolibarr') $projectContents .= ' (URL=http://ipofyourserver:WAMPAPACHEPORT/'.$file.'/)'; $projectContents .= '
    • '; } } @@ -229,12 +282,11 @@ body { border-bottom: 1px solid #999; letter-spacing: -500em; text-indent: -500em; - height: 125px; + height: 0px; } .utility { - position: absolute; right: 4em; - top: 145px; + top: 20px; font-size: 0.85em; } .utility li { @@ -242,7 +294,7 @@ body { } h2 { - margin: 0.8em 0 0 0; + margin: 18px 0 4px 0; } ul { @@ -250,12 +302,11 @@ ul { margin: 0; padding: 0; } -#head ul li, dl ul li, #foot li { +#head ul li, dl ul li { list-style: none; display: inline; margin: 0; padding: 0 0.2em; - background: url(index.php?img=gifLogo) 0 0 no-repeat; } ul.aliases, ul.projects, ul.tools { list-style: none; @@ -317,20 +368,18 @@ a:hover { - - + +
    + + - +
    +

    {$langues[$langue]['titreConf']}

    @@ -361,7 +410,7 @@ a:hover { ${aliasContents} diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 0a25bd37314..fc7a59a6e02 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $langs->load("admin"); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 77fb64f2c56..501e28c7dce 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); $langs->load("bills"); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 761c827a6d2..09890fdc1c4 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); $year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"]; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index c08ea1219a9..3a1a215c26b 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -24,7 +24,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); $year=$_GET["year"]; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index ac817398824..b018a159e12 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -16,18 +16,16 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/compta/stats/casoc.php \brief Page reporting CA par société - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); $langs->load("companies"); diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 54399293e9e..3c6e39af39b 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -15,18 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/compta/stats/index.php \brief Page reporting CA - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); $year_start=isset($_GET["year_start"])?$_GET["year_start"]:$_POST["year_start"]; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index eaf7afdaf28..a5292b9e99b 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -27,7 +27,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 65fde9f1e52..c2352a5290c 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -28,7 +28,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/report.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/report.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); diff --git a/htdocs/lib/menubase.class.php b/htdocs/core/menubase.class.php similarity index 99% rename from htdocs/lib/menubase.class.php rename to htdocs/core/menubase.class.php index 0aff7447fd8..e7d346f9d4a 100644 --- a/htdocs/lib/menubase.class.php +++ b/htdocs/core/menubase.class.php @@ -17,10 +17,10 @@ */ /** - \file htdocs/lib/menubase.class.php + \file htdocs/core/menubase.class.php \ingroup core \version $Id$ - \brief File of class to manage menu entries + \brief File of class to manage dynamic menu entries \remarks Initialy built by build_class_from_table on 2008-01-12 14:19 */ diff --git a/htdocs/includes/menus/barre_left/auguria_backoffice.php b/htdocs/includes/menus/barre_left/auguria_backoffice.php index 165f898be80..df52cedeb2a 100644 --- a/htdocs/includes/menus/barre_left/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_backoffice.php @@ -53,7 +53,7 @@ class MenuLeft { */ function MenuLeft($db,&$menu_array) { - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_left/auguria_frontoffice.php b/htdocs/includes/menus/barre_left/auguria_frontoffice.php index c01899d6f79..ddfd2eef63f 100644 --- a/htdocs/includes/menus/barre_left/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_frontoffice.php @@ -52,7 +52,7 @@ class MenuLeft { */ function MenuLeft($db,&$menu_array) { - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_top/auguria_backoffice.php b/htdocs/includes/menus/barre_top/auguria_backoffice.php index 3e06dc6bd87..cef20f0e85a 100644 --- a/htdocs/includes/menus/barre_top/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_top/auguria_backoffice.php @@ -59,7 +59,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); global $user,$conf,$langs,$dolibarr_main_db_name;; diff --git a/htdocs/includes/menus/barre_top/auguria_frontoffice.php b/htdocs/includes/menus/barre_top/auguria_frontoffice.php index d6b430d7434..1a41f84fa5f 100644 --- a/htdocs/includes/menus/barre_top/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_top/auguria_frontoffice.php @@ -59,7 +59,7 @@ class MenuTop { */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); global $user,$conf,$langs,$dolibarr_main_db_name;; diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index ceb8576bafe..91dc90f4ad1 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -343,7 +343,7 @@ class MenuTop { // Affichage des menus personnalises - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $menuArbo = new Menubase($this->db,'eldy','top'); $tabMenu = $menuArbo->menutopCharger(0,$_SESSION['mainmenu'],'eldy'); diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php index 8afdafaf3f9..8d6a3908848 100644 --- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php @@ -308,7 +308,7 @@ class MenuTop { // Affichage des menus personnalises - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $menuArbo = new Menubase($this->db,'eldy','top'); $tabMenu = $menuArbo->menutopCharger(1,$_SESSION['mainmenu'],'eldy'); diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php index 1009d7c263c..06f2aa4b97d 100644 --- a/htdocs/includes/menus/barre_top/empty.php +++ b/htdocs/includes/menus/barre_top/empty.php @@ -68,7 +68,7 @@ class MenuTop { /* // Code to show personalized menus - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $menuArbo = new Menubase($this->db,'eldy','top'); $tabMenu = $menuArbo->menutopCharger(2,$_SESSION['mainmenu'],''); diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php index 93ed8ccb768..6f5a21cd7b6 100644 --- a/htdocs/includes/menus/barre_top/rodolphe.php +++ b/htdocs/includes/menus/barre_top/rodolphe.php @@ -307,7 +307,7 @@ class MenuTop { // Affichage des menus personnalises - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $menuArbo = new Menubase($this->db,'rodolphe','top'); $tabMenu = $menuArbo->menutopCharger(2,$_SESSION['mainmenu'],'rodolphe'); diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index 3de9a2ec56b..6596811ec90 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -728,7 +728,7 @@ class DolibarrModules { global $user; - require_once(DOL_DOCUMENT_ROOT."/lib/menubase.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $err=0; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 1e6551eb56f..3d0dc797520 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -33,7 +33,7 @@ require_once($dolibarr_main_document_root . '/contrat/contrat.class.php'); require_once($dolibarr_main_document_root . '/commande/commande.class.php'); require_once($dolibarr_main_document_root . '/fourn/fournisseur.commande.class.php'); require_once($dolibarr_main_document_root . '/lib/price.lib.php'); -require_once($dolibarr_main_document_root . '/lib/menubase.class.php'); +require_once($dolibarr_main_document_root . '/core/menubase.class.php'); $grant_query=''; $etape = 2; diff --git a/htdocs/lib/report.inc.php b/htdocs/lib/report.lib.php similarity index 94% rename from htdocs/lib/report.inc.php rename to htdocs/lib/report.lib.php index c3602ada3b8..0f900300f3f 100644 --- a/htdocs/lib/report.inc.php +++ b/htdocs/lib/report.lib.php @@ -15,13 +15,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ - * - * $Id$ */ /** - \file htdocs/lib/report.inc.php - \brief Ensemble de fonctions de base de dolibarr pour reporting sous forme d'include + \file htdocs/lib/report.lib.php + \brief Ensemble de fonctions de base de dolibarr pour reporting sous forme d'include + \version $Id$ */