From 3f2ba2780f8020fcbbb60bff1bacd94a3c2b53f1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 22 Jun 2019 18:06:14 +0200 Subject: [PATCH] Add @ignore so scrutinizer ignores duplicate definition of llxHeader --- htdocs/asterisk/wrapper.php | 3 +++ htdocs/document.php | 2 ++ htdocs/imports/emptyexample.php | 15 +++++++++++++-- htdocs/opensurvey/fonctions.php | 2 +- htdocs/viewimage.php | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index 75cff3a8202..22b78b421f6 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -39,6 +39,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); /** * Empty header * + * @ignore * @return void */ function llxHeader() @@ -48,9 +49,11 @@ function llxHeader() print 'Asterisk redirection from Dolibarr...'."\n"; print ''."\n"; } + /** * Empty footer * + * @ignore * @return void */ function llxFooter() diff --git a/htdocs/document.php b/htdocs/document.php index 57897786f0d..8e86d6c3e6f 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -55,6 +55,7 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias')) /** * Header empty * + * @ignore * @return void */ function llxHeader() @@ -63,6 +64,7 @@ function llxHeader() /** * Footer empty * + * @ignore * @return void */ function llxFooter() diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php index 5d70a3fc08e..619207ca6f1 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.php @@ -21,12 +21,23 @@ * \brief Show example of import file */ -// This file is a wrapper, so empty header +/** + * This file is a wrapper, so empty header + * + * @ignore + * @return void + */ function llxHeader() { print 'Build an import example file'; } -// This file is a wrapper, so empty footer + +/** + * This file is a wrapper, so empty footer + * + * @ignore + * @return void + */ function llxFooter() { print ''; diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php index b93440f9afd..e890efbc1c9 100644 --- a/htdocs/opensurvey/fonctions.php +++ b/htdocs/opensurvey/fonctions.php @@ -122,7 +122,7 @@ function get_server_name() global $dolibarr_main_url_root; $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); - $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current $url=$urlwithouturlroot.dol_buildpath('/opensurvey/', 1); diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 4d13b182fd4..b77beb001b3 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -66,6 +66,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity); /** * Header empty * + * @ignore * @return void */ function llxHeader() @@ -74,6 +75,7 @@ function llxHeader() /** * Footer empty * + * @ignore * @return void */ function llxFooter()