diff --git a/.travis.yml b/.travis.yml index 31c720e58e9..11da1e2d048 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # from Dolibarr GitHub repository. # For syntax, see http://about.travis-ci.org/docs/user/languages/php/ -# We use dist: precise to have php 5.3 available +# We use dist: precise to have php 5.3 available dist: trusty sudo: required @@ -20,7 +20,7 @@ addons: # To use the last version of pgloader, we add repo of postgresql - postgresql - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' - - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' + - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' packages: # We need a webserver to test the webservices # Let's install Apache with. @@ -101,7 +101,7 @@ before_install: pgloader --version echo fi - + install: - | echo "Updating Composer" @@ -133,7 +133,7 @@ install: - | echo "Installing PHP CodeSniffer" - composer -n require squizlabs/php_codesniffer ^2 + composer -n require squizlabs/php_codesniffer ^3 echo - | @@ -195,7 +195,7 @@ before_script: mysql --version | head - mysql -e "SELECT VERSION();" | head - echo - + - | echo "Setting up database" if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then @@ -203,7 +203,7 @@ before_script: mysql -e 'DROP DATABASE IF EXISTS travis;' mysql -e 'CREATE DATABASE IF NOT EXISTS travis;' mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' - mysql -e 'FLUSH PRIVILEGES;' + mysql -e 'FLUSH PRIVILEGES;' mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql fi if [ "$DB" = 'postgresql' ]; then @@ -384,4 +384,3 @@ after_failure: # TODO: PostgreSQL log file echo fi - diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index 29e1f5775e7..b038840621f 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -4,6 +4,7 @@ Dolibarr coding standard. build/html + build/aps documents htdocs/custom htdocs/includes @@ -14,40 +15,25 @@ - + - + 0 - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - 0 - - - 0 - + + + + + + + + + + + @@ -147,7 +133,7 @@ 0 - + @@ -163,7 +149,7 @@ 0 - + @@ -199,7 +185,7 @@ 0 - + 0 @@ -219,14 +205,14 @@ 0 - + 0 - - - - + 5 - + 0 0 - + @@ -267,11 +253,11 @@ 0 - + 0 - + 0 @@ -341,14 +327,14 @@ 0 - + 0 - + 0 @@ -356,7 +342,7 @@ 0 - + @@ -376,6 +362,9 @@ 0 + + 0 + 0 @@ -385,19 +374,19 @@ 0 - + - + diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 4c91efc265c..46b2b827d73 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -91,7 +91,7 @@ if ($id > 0) if ($result > 0) { - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index e4f6ffc397a..4ad7a74bcb9 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -366,7 +366,7 @@ if ($action == 'edit') { $mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:''); - print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_ID").''; // SuperAdministrator access only if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { @@ -386,7 +386,7 @@ if ($action == 'edit') { $mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:''); - print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_PW").''; // SuperAdministrator access only if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php index edb2735b354..fe09ee14378 100644 --- a/htdocs/admin/multicurrency.php +++ b/htdocs/admin/multicurrency.php @@ -19,14 +19,11 @@ /** * \file admin/multicurrency.php * \ingroup multicurrency - * \brief This file is an example module setup page - * Put some comments here + * \brief Page to setup multicurrency module */ + // Dolibarr environment - require '../main.inc.php'; - -// Libraries require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php'; require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php'; @@ -42,6 +39,8 @@ if (! $user->admin) { // Parameters $action = GETPOST('action', 'alpha'); + + /* * Actions */ @@ -164,6 +163,8 @@ if ($resql) * View */ +$form=new Form($db); + $page_name = "MultiCurrencySetup"; llxHeader('', $langs->trans($page_name)); @@ -176,21 +177,16 @@ print_fiche_titre($langs->trans($page_name), $linkback); $head = multicurrencyAdminPrepareHead(); dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurrency"); -// Setup page goes here -$form=new Form($db); -$var=false; print ''; print ''; print ''."\n"; -print ''; -print ''."\n"; - +print ''."\n"; +print ''; print ''; print ''; -print ''; -print ''; - print ''; print ''; -print ''; -print ''; print ''; print ''; -print ''; -print ''; print ''; print ''; -print ''; -print ''; */ print '
'.$langs->trans("Parameters").' '.$langs->trans("Value").''.$langs->trans("Value").'
'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE").' '; +print ''; print '
'; print ''; print ''; @@ -200,11 +196,9 @@ print '
'; print '
'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").' '; +print ''; print '
'; print ''; print ''; @@ -217,8 +211,7 @@ print '
'.$langs->transnoentitiesnoconv("multicurrency_buyPriceInCurrency").' '; +print ''; print ''; print ''; print ''; @@ -232,8 +225,7 @@ print '
'.$langs->transnoentitiesnoconv("multicurrency_modifyRateApplication").' '; +print ''; print ''; print ''; print ''; @@ -245,16 +237,17 @@ print '
'; + print '
'; if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) { - $var=false; + print '
'; print ''; + print ''; print ''."\n"; - print ''; - print ''; - print ''; print ''; - print ''; - print ''; print ''; - print ''; - print ''; print ''; - print ''; - print ''; print '
'.$form->textwithpicto($langs->trans("CurrencyLayerAccount"), $langs->trans("CurrencyLayerAccount_help_to_synchronize")).' '; + print ''; print ''; print ''; print ''; @@ -263,11 +256,9 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print '
'.$langs->transnoentitiesnoconv("multicurrency_appId").' '; + print ''; print ''; print ''; print ''; @@ -279,8 +270,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print '
'.$langs->transnoentitiesnoconv("multicurrency_appCurrencySource").' '; + print ''; print ''; print ''; print ''; @@ -291,8 +281,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print '
'.$langs->transnoentitiesnoconv("multicurrency_alternateCurrencySource").' '; + print ''; print ''; print ''; print ''; @@ -302,35 +291,35 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) print '
'; + print '
'; print '
'; } +print '
'; print ''; print ''; print ''."\n"; -print ''; -print ''."\n"; +print ''."\n"; +print ''; - -print ''; print ''; +print ''; +print ''; +print ''; -print ''; -print ''; - +print ''; +print ''; +print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; foreach ($TCurrency as &$currency) { @@ -338,8 +327,7 @@ foreach ($TCurrency as &$currency) print ''; print ''; - print ''; - print ''; } print '
'.$form->textwithpicto($langs->trans("CurrenciesUsed"), $langs->transnoentitiesnoconv("CurrenciesUsed_help_to_add")).' '.$langs->trans("Rate").''.$langs->trans("Rate").'
'.$form->selectCurrency('', 'code').''; print ''; print ''; -print ''.$form->selectCurrency('', 'code').' '; print ' '; print ''; -print '
'.$conf->currency.$form->textwithpicto(' ', $langs->trans("BaseCurrency")).' 1'; -print '
1
'.$currency->code.' - '.$currency->name.' '; + print ''; print '
'; print ''; print ''; @@ -349,13 +337,11 @@ foreach ($TCurrency as &$currency) print ' '; print ''; print '
'; - print '
'; - - +print '
'; print ' '; } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index 1464c9c2e6b..2f3d184fdb9 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -207,5 +207,6 @@ if (!$rowid) } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index d20df866f6a..415ed32a62a 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -203,5 +203,6 @@ if (! $rowid) { print ''; } else {} +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php index 545d953e753..24ae20848f1 100644 --- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php @@ -143,6 +143,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php index 1f5b9582558..7d153a78cdc 100644 --- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php +++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php @@ -145,6 +145,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php index fdf51406e8e..7be0dcbc78a 100644 --- a/htdocs/supplier_proposal/contact.php +++ b/htdocs/supplier_proposal/contact.php @@ -202,6 +202,6 @@ if ($id > 0 || ! empty($ref)) } } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index 12de448829e..cf500246290 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -87,7 +87,7 @@ if ($object->id > 0) $head = supplier_proposal_prepare_head($object); dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal'); - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) @@ -170,5 +170,6 @@ else print $langs->trans("ErrorUnknown"); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 0e1b51480c1..cec80662c41 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -375,6 +375,6 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php index 3f83b4dca88..95a753272be 100644 --- a/htdocs/supplier_proposal/info.php +++ b/htdocs/supplier_proposal/info.php @@ -123,5 +123,6 @@ print ''; dol_fiche_end(); +// End of page llxFooter(); $db->close(); diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php index ba54859a207..ff531b05d83 100644 --- a/htdocs/supplier_proposal/note.php +++ b/htdocs/supplier_proposal/note.php @@ -143,6 +143,6 @@ if ($id > 0 || ! empty($ref)) } } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js index 008d99e4cd4..50ff0cc6eed 100644 --- a/htdocs/theme/eldy/ckeditor/config.js +++ b/htdocs/theme/eldy/ckeditor/config.js @@ -39,7 +39,7 @@ CKEDITOR.editorConfig = function( config ) ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], ['CreateDiv','ShowBlocks'], ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'], - ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'], + ['Bold','Italic','Underline','Strike','Superscript'], // 'Subscript' ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['BidiLtr', 'BidiRtl'], @@ -58,7 +58,7 @@ CKEDITOR.editorConfig = function( config ) ['Undo','Redo','-','Find','Replace'], ['CreateDiv','ShowBlocks'], ['Format','Font','FontSize'], - ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar'], @@ -72,7 +72,7 @@ CKEDITOR.editorConfig = function( config ) ['SpellChecker', 'Scayt'], // 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone ['Undo','Redo','-','Find','Replace'], ['Format','Font','FontSize'], - ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar'], diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js index 008d99e4cd4..50ff0cc6eed 100644 --- a/htdocs/theme/md/ckeditor/config.js +++ b/htdocs/theme/md/ckeditor/config.js @@ -39,7 +39,7 @@ CKEDITOR.editorConfig = function( config ) ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], ['CreateDiv','ShowBlocks'], ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'], - ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'], + ['Bold','Italic','Underline','Strike','Superscript'], // 'Subscript' ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['BidiLtr', 'BidiRtl'], @@ -58,7 +58,7 @@ CKEDITOR.editorConfig = function( config ) ['Undo','Redo','-','Find','Replace'], ['CreateDiv','ShowBlocks'], ['Format','Font','FontSize'], - ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar'], @@ -72,7 +72,7 @@ CKEDITOR.editorConfig = function( config ) ['SpellChecker', 'Scayt'], // 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone ['Undo','Redo','-','Find','Replace'], ['Format','Font','FontSize'], - ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar'], diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index b9fbfdb5979..fa1421411c9 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -555,7 +555,7 @@ class Ticket extends CommonObject * @param int $offset Offset for query * @param int $arch archive or not (not used) * @param array $filter Filter for query - * output + * output * @return int <0 if KO, >0 if OK */ public function fetchAll($user, $sortorder = 'ASC', $sortfield = 't.datec', $limit = '', $offset = 0, $arch = '', $filter = '') diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php index e31cd98912d..d1d80387f6e 100644 --- a/htdocs/ticket/document.php +++ b/htdocs/ticket/document.php @@ -138,7 +138,7 @@ if ($object->id) dol_fiche_end(); - // Construit liste des fichiers + // Build file list $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1); $totalsize = 0; foreach ($filearray as $key => $file) { @@ -158,5 +158,6 @@ else accessforbidden('', 0, 0); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php index 9f431909957..48e2b4091d6 100644 --- a/htdocs/user/admin/group_extrafields.php +++ b/htdocs/user/admin/group_extrafields.php @@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php index ff07845f92d..81dc7c290c1 100644 --- a/htdocs/user/admin/user_extrafields.php +++ b/htdocs/user/admin/user_extrafields.php @@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname)) require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 1764ab5baf4..3146f1095b0 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -218,7 +218,6 @@ print ""; print "\n"; - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 7f11911a46b..136384877fb 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -559,6 +559,6 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer) print ' if ($id && $action == 'create' && $user->rights->user->user->creer) print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 8fd979015bf..6c57af79de2 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2538,5 +2538,6 @@ if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax)) print ''; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index a4c4e90f99d..bfab243bbaf 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -216,7 +216,6 @@ if ($id > 0) } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/document.php b/htdocs/user/document.php index a917a972ddc..6b22a303f96 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -141,7 +141,7 @@ if ($object->id) print '
'; print '
'; - // Construit liste des fichiers + // Build file list $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); $totalsize=0; foreach($filearray as $key => $file) @@ -178,6 +178,6 @@ else accessforbidden('',0,0); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 47a5a5df9eb..44eef8dfc1f 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -586,5 +586,6 @@ else } } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index bb9d05d59f1..5bc6130a2b6 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -212,5 +212,6 @@ else print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index 946ba132af8..745f9002055 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -227,6 +227,6 @@ else dol_print_error($db); } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 0d019b1226c..4b4b181cdc8 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -349,5 +349,6 @@ if ($object->id > 0) dol_fiche_end(); } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index 0b1842dabde..a33049ffbad 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -204,6 +204,6 @@ jQuery(document).ready(function() { '; */ +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 6ace60c2fca..f9ccd9aa7ca 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -286,6 +286,6 @@ if ($canreadperms) //print ''; print '
'; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/info.php b/htdocs/user/info.php index 19ecf15eb65..8fba36a3e8a 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -93,6 +93,6 @@ print ''; dol_fiche_end(); - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 4f9eac61d9f..4a4ffeb875d 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -218,5 +218,6 @@ else print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/list.php b/htdocs/user/list.php index a1f0cdd5471..f610d6b720e 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -628,5 +628,6 @@ print "\n"; $db->free($result); +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 5b787ded7b0..5e1c33cb57d 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -158,6 +158,6 @@ if ($id) print "\n"; } +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index e8914298ac3..7e04adab9a7 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -507,7 +507,6 @@ if ($result > 0) } else dol_print_error('','RecordNotFound'); - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 1bf0dbbe785..5c2869847c6 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -374,5 +374,6 @@ if ($action == 'edit') print ''; } +// End of page llxFooter(); $db->close(); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 30b988d3b22..e6487cba47c 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -400,6 +400,6 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e dol_fiche_end(); +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php index 57db7c49f20..c21049a5c76 100644 --- a/htdocs/variants/admin/admin.php +++ b/htdocs/variants/admin/admin.php @@ -71,7 +71,7 @@ print ''; print '
'; print ''; +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index 3addef7ddf9..3f298ae93e6 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -299,5 +299,6 @@ if ($action == 'edit') { ?> close(); +$db->close();; diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index b741fef40bb..636824d1980 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -773,7 +773,6 @@ if (! empty($id) || ! empty($ref)) // not found } - +// End of page llxFooter(); - $db->close(); diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php index c4d775f3d50..c3fbc39b82c 100644 --- a/htdocs/variants/create.php +++ b/htdocs/variants/create.php @@ -97,5 +97,6 @@ print '
$attribute): ?> - > + ref) ?> label) ?> countChildValues() ?> @@ -143,7 +142,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; @@ -151,4 +149,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; close(); \ No newline at end of file diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php index e0e549cf2a7..5c49e457c4f 100644 --- a/htdocs/webservices/admin/index.php +++ b/htdocs/webservices/admin/index.php @@ -156,6 +156,6 @@ if (! empty($conf->use_javascript_ajax)) print ''; } - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php index 1096b9da923..685579c6674 100644 --- a/htdocs/webservices/server_category.php +++ b/htdocs/webservices/server_category.php @@ -92,7 +92,7 @@ $server->wsdl->addComplexType( /* * Les catégories filles, sous tableau dez la catégorie */ - $server->wsdl->addComplexType( +$server->wsdl->addComplexType( 'FillesArray', 'complexType', 'array', @@ -108,38 +108,38 @@ $server->wsdl->addComplexType( /* * Image of product */ - $server->wsdl->addComplexType( - 'PhotosArray', - 'complexType', - 'array', - 'sequence', - '', - array( - 'image' => array( - 'name' => 'image', - 'type' => 'tns:image', - 'minOccurs' => '0', - 'maxOccurs' => 'unbounded' - ) - ) - ); +$server->wsdl->addComplexType( + 'PhotosArray', + 'complexType', + 'array', + 'sequence', + '', + array( + 'image' => array( + 'name' => 'image', + 'type' => 'tns:image', + 'minOccurs' => '0', + 'maxOccurs' => 'unbounded' + ) + ) +); /* * An image */ - $server->wsdl->addComplexType( - 'image', - 'complexType', - 'struct', - 'all', - '', - array( - 'photo' => array('name'=>'photo','type'=>'xsd:string'), - 'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'), - 'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'), - 'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string') - ) - ); +$server->wsdl->addComplexType( + 'image', + 'complexType', + 'struct', + 'all', + '', + array( + 'photo' => array('name'=>'photo','type'=>'xsd:string'), + 'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'), + 'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'), + 'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string') + ) +); /* * Retour diff --git a/htdocs/website/index.php b/htdocs/website/index.php index ff33c44763d..ceb6f5480d9 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2439,8 +2439,6 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa } } - - +// End of page llxFooter(); - $db->close();