diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 21a3ae5ed6d..e1e21d9f3b7 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -142,7 +142,7 @@ class modMyModule extends DolibarrModules // 'type'=>'top', // This is a Top menu entry // 'titre'=>'MyModule top menu', // 'mainmenu'=>'mymodule', - // 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school). + // 'leftmenu'=>'1', // Use 1 if you also want to add left menu entries using this descriptor. // 'url'=>'/mymodule/pagetop.php', // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. // 'position'=>100, diff --git a/htdocs/webcal/pre.inc.php b/htdocs/webcal/pre.inc.php deleted file mode 100644 index b2f8303d29a..00000000000 --- a/htdocs/webcal/pre.inc.php +++ /dev/null @@ -1,38 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - \file htdocs/webcal/pre.inc.php - \ingroup webcalendar - \brief Fichier de gestion du menu gauche du module webcalendar - \version $Id$ -*/ -require ("../main.inc.php"); - - -function llxHeader($head = "", $title="", $help_url='') -{ - global $langs; - - top_menu($head, $title); - - $menu = new Menu(); - - left_menu($menu->liste, $help_url); -} -?> diff --git a/htdocs/webcal/webcal.php b/htdocs/webcal/webcal.php index 344ee228752..e158c576a0b 100644 --- a/htdocs/webcal/webcal.php +++ b/htdocs/webcal/webcal.php @@ -18,12 +18,12 @@ /** \file htdocs/webcal/webcal.php \ingroup webcalendar - \brief Page générant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage du calendrier + \brief Page generant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage du calendrier \author Laurent Destailleur \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); if (empty($conf->global->PHPWEBCALENDAR_URL)) { @@ -55,7 +55,7 @@ print "
Malheureusement, votre navigateur est trop vieux pour visualiser cette zone.
- Il vous faut un navigateur gérant les frames.
+ Il vous faut un navigateur gerant les frames.
diff --git a/htdocs/webcal/webcalexport.php b/htdocs/webcal/webcalexport.php index 8d5e32a35e7..54b45e57356 100644 --- a/htdocs/webcal/webcalexport.php +++ b/htdocs/webcal/webcalexport.php @@ -25,13 +25,13 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/webcal/webcal.class.php'); + // C'est un wrapper, donc header vierge function llxHeader() { print 'Export cal'; } function llxFooter() { print ''; } -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/webcal/webcal.class.php'); - // Security check if (! $conf->webcal->enabled) accessforbidden(); diff --git a/htdocs/webcal/webcaltop.php b/htdocs/webcal/webcaltop.php index 0948b815f26..a210dd59e44 100644 --- a/htdocs/webcal/webcaltop.php +++ b/htdocs/webcal/webcaltop.php @@ -18,10 +18,10 @@ */ /** - \file htdocs/webcal/webcaltop.php - \ingroup webcalendar - \brief Top frame to show calendar - \version $Id$ + * \file htdocs/webcal/webcaltop.php + * \ingroup webcalendar + * \brief Top frame to show calendar + * \version $Id$ */ require ("../main.inc.php");