';
if ($key == 'status') {
print $object->getLibStatut(5);
+ } elseif ($key == 'rowid') {
+ print $object->showOutputField($val, $key, $object->id, '');
} else {
print $object->showOutputField($val, $key, $object->$key, '');
}
@@ -545,7 +611,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
print $hookmanager->resPrint;
// Action column
print '| ';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
$selected = 0;
if (in_array($object->id, $arrayofselected)) {
$selected = 1;
@@ -605,7 +671,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
$genallowed = $permissiontoread;
$delallowed = $permissiontoadd;
- print $formfile->showdocuments('massfilesarea_asset', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '');
+ print $formfile->showdocuments('massfilesarea_asset', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
}
// End of page
diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php
new file mode 100644
index 00000000000..fd5999b20b0
--- /dev/null
+++ b/htdocs/asset/model/accountancy_codes.php
@@ -0,0 +1,191 @@
+
+ * Copyright (C) 2018 Alexandre Spangaro
+ *
+ * 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 3 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, see .
+ */
+
+/**
+ * \file htdocs/asset/model/accountancy_code.php
+ * \ingroup asset
+ * \brief Card with accountancy code on Asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$assetaccountancycodes = new AssetAccountancyCodes($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodelaccountancycodes', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+ $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->write))); // Used by the include of actions_addupdatedelete.inc.php
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) accessforbidden();
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->asset->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+$result = $assetaccountancycodes->fetchAccountancyCodes(0, $object->id);
+if ($result < 0) {
+ setEventMessages($assetaccountancycodes->error, $assetaccountancycodes->errors, 'errors');
+}
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+ $backurlforlist = DOL_URL_ROOT.'/asset/list.php';
+
+ if (empty($backtopage) || ($cancel && empty($id))) {
+ if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+ if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+ $backtopage = $backurlforlist;
+ } else {
+ $backtopage = DOL_URL_ROOT.'/asset/model/accountancy_codes.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+ }
+ }
+ }
+
+ if ($cancel) {
+ /*var_dump($cancel);var_dump($backtopage);var_dump($backtopageforcancel);exit;*/
+ if (!empty($backtopageforcancel)) {
+ header("Location: ".$backtopageforcancel);
+ exit;
+ } elseif (!empty($backtopage)) {
+ header("Location: ".$backtopage);
+ exit;
+ }
+ $action = '';
+ }
+
+ if ($action == "update") {
+ $assetaccountancycodes->setAccountancyCodesFromPost();
+
+ $result = $assetaccountancycodes->updateAccountancyCodes($user, 0, $object->id);
+ if ($result < 0) {
+ setEventMessages($assetaccountancycodes->error, $assetaccountancycodes->errors, 'errors');
+ $action = 'edit';
+ } else {
+ setEventMessage($langs->trans('RecordSaved'));
+ header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+ exit;
+ }
+ }
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('AssetModel'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+ $head = assetModelPrepareHead($object);
+ print dol_get_fiche_head($head, 'accountancy_codes', $langs->trans("AssetModel"), -1, $object->picto);
+
+ // Object card
+ // ------------------------------------------------------------
+ $linkback = '' . $langs->trans("BackToList") . '';
+
+ $morehtmlref = ' ';
+ $morehtmlref .= ' ';
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '';
+
+ if ($action == 'edit') {
+ print '';
+ } else {
+ include DOL_DOCUMENT_ROOT . '/asset/tpl/accountancy_codes_view.tpl.php';
+ }
+
+ print dol_get_fiche_end();
+
+ if ($action != 'edit') {
+ print '' . "\n";
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ }
+
+ if (empty($reshook)) {
+ if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+ }
+ }
+ print ' ' . "\n";
+ }
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
new file mode 100644
index 00000000000..cd0365a1418
--- /dev/null
+++ b/htdocs/asset/model/agenda.php
@@ -0,0 +1,217 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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 3 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, see .
+ */
+
+/**
+ * \file htdocs/asset/model/agenda.php
+ * \ingroup asset
+ * \brief Tab of events on Asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+ $actioncode = GETPOST('actioncode', 'array', 3);
+ if (!count($actioncode)) {
+ $actioncode = '0';
+ }
+} else {
+ $actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+ $sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+ $sortorder = 'DESC,DESC';
+}
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodelagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+ $upload_dir = $conf->asset->multidir_output[$object->entity] . "/model/" . $object->id;
+}
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->write))); // Used by the include of actions_addupdatedelete.inc.php
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) $socid = $user->socid;
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->asset->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$parameters = array('id' => $id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+ // Cancel
+ if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+ header("Location: " . $backtopage);
+ exit;
+ }
+
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+ $actioncode = '';
+ $search_agenda_label = '';
+ }
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+ $title = $langs->trans("Agenda");
+ //if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+ $help_url = 'EN:Module_Agenda_En';
+ llxHeader('', $title, $help_url);
+
+ if (!empty($conf->notification->enabled)) {
+ $langs->load("mails");
+ }
+ $head = assetModelPrepareHead($object);
+
+
+ print dol_get_fiche_head($head, 'agenda', $langs->trans("AssetModel"), -1, $object->picto);
+
+ // Object card
+ // ------------------------------------------------------------
+ $linkback = '' . $langs->trans("BackToList") . '';
+
+ $morehtmlref = '';
+ $morehtmlref .= ' ';
+
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '';
+ print ' ';
+
+ $object->info($object->id);
+ dol_print_object_info($object, 1);
+
+ print ' ';
+ $morehtmlref .= ' ';
+
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+ print '';
+ print ' ';
+ print ' ';
+ print ' ' . "\n";
+
+ // Common attributes
+ include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+
+ // Other attributes. Fields from hook formObjectOptions and Extrafields.
+ include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+ print ' ';
+ print ' ';
+ print ' ' . "\n";
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ }
+
+ if (empty($reshook)) {
+ if ($object->status == $object::STATUS_DRAFT) {
+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+ }
+
+ // Back to draft
+ if ($object->status != $object::STATUS_DRAFT) {
+ print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=confirm_setdraft&confirm=yes&token=' . newToken(), '', $permissiontoadd);
+ }
+
+ if ($object->status != $object::STATUS_VALIDATED) {
+ print dolGetButtonAction($langs->trans('Enable'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=confirm_validate&confirm=yes&token=' . newToken(), '', $permissiontoadd);
+ }
+
+ if ($object->status != $object::STATUS_CANCELED) {
+ print dolGetButtonAction($langs->trans('Disable'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.newToken(), '', $permissiontoadd);
+ }
+
+ // Clone
+ print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&socid=' . $object->socid . '&action=clone&token=' . newToken(), '', $permissiontoadd);
+
+ // Delete (need delete permission, or if draft, just need create/modify permission)
+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete&token=' . newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+ }
+ print ' ' . "\n";
+ }
+
+ print '';
+ print ' '; // ancre
+
+ print ' ';
+
+ // $MAXEVENT = 10;
+ //
+ // $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id);
+ //
+ // // List of actions on element
+ // include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+ // $formactions = new FormActions($db);
+ // $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, 0, 1, '', $MAXEVENT, '', $morehtmlright);
+
+ print ' ';
+ $morehtmlref .= ' ';
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '';
+
+ if ($action == 'edit') {
+ print '';
+ } else {
+ include DOL_DOCUMENT_ROOT . '/asset/tpl/depreciation_options_view.tpl.php';
+ }
+
+ print dol_get_fiche_end();
+
+ if ($action != 'edit') {
+ print '' . "\n";
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ }
+
+ if (empty($reshook)) {
+ if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+ }
+ }
+ print ' ' . "\n";
+ }
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
new file mode 100644
index 00000000000..a6423bb3a73
--- /dev/null
+++ b/htdocs/asset/model/list.php
@@ -0,0 +1,681 @@
+
+ * Copyright (C) 2018 Alexandre Spangaro
+ *
+ * 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 3 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, see .
+ */
+
+/**
+ * \file htdocs/asset/model/list.php
+ * \ingroup asset
+ * \brief List page for asset model
+ */
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/assetmodel.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "other"));
+
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'assetmodellist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+ $page = 0;
+} // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetmodellist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+ reset($object->fields); // Reset is required to avoid key() to return null.
+ $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+ $sortorder = "ASC";
+}
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val) {
+ if ($key == 'fk_pays' && !GETPOSTISSET('search_'.$key)) {
+ $search[$key] = $mysoc->country_id;
+ } elseif (GETPOST('search_'.$key, 'alpha') !== '') {
+ $search[$key] = GETPOST('search_'.$key, 'alpha');
+ }
+ if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+ $search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+ $search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+ }
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+ if (!empty($val['searchall'])) {
+ $fieldstosearchall['t.'.$key] = $val['label'];
+ }
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+ // If $val['visible']==0, then we never show the field
+ if (!empty($val['visible'])) {
+ $visible = (int) dol_eval($val['visible'], 1);
+ $arrayfields['t.'.$key] = array(
+ 'label'=>$val['label'],
+ 'checked'=>(($visible < 0) ? 0 : 1),
+ 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'position'=>$val['position'],
+ 'help'=> isset($val['help']) ? $val['help'] : ''
+ );
+ }
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->write)));
+$permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->delete) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->delete)));
+
+// Security check
+if (empty($conf->asset->enabled)) {
+ accessforbidden('Module not enabled');
+}
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) accessforbidden();
+$socid = 0; if ($user->socid > 0) $socid = $user->socid;
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->asset->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+ $action = 'list';
+ $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+ $massaction = '';
+}
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+ foreach ($object->fields as $key => $val) {
+ $search[$key] = '';
+ if ($key == 'fk_pays') $search[$key] = $mysoc->country_id;
+ if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+ $search[$key.'_dtstart'] = '';
+ $search[$key.'_dtend'] = '';
+ }
+ }
+ $toselect = array();
+ $search_array_options = array();
+ }
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+ || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+ $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+ }
+
+ // Mass actions
+ $objectclass = 'AssetModel';
+ $objectlabel = 'AssetModel';
+ $uploaddir = $conf->asset->dir_output;
+ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+
+$help_url = '';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("AssetModels"));
+$morejs = array();
+$morecss = array();
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+$sql .= $object->getFieldList('t');
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+ }
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+if ($object->ismultientitymanaged == 1) {
+ $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+ $sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+ if (array_key_exists($key, $object->fields)) {
+ if ($key == 'status' && $search[$key] == -1) {
+ continue;
+ }
+ $mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+ if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
+ if ($search[$key] == '-1' || ($search[$key] === '0' && (empty($object->fields[$key]['arrayofkeyval']) || !array_key_exists('0', $object->fields[$key]['arrayofkeyval'])))) {
+ $search[$key] = '';
+ }
+ $mode_search = 2;
+ }
+ if ($search[$key] != '') {
+ $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+ }
+ } else {
+ if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+ $columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
+ if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+ if (preg_match('/_dtstart$/', $key)) {
+ $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
+ }
+ if (preg_match('/_dtend$/', $key)) {
+ $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+ }
+ }
+ }
+ }
+}
+if ($search_all) {
+ $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql .= " GROUP BY ";
+foreach($object->fields as $key => $val) {
+ $sql .= "t.".$key.", ";
+}
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+ }
+}
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
+*/
+
+// Add HAVING from hooks
+/*
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= !empty($hookmanager->resPrint) ? (" HAVING 1=1 " . $hookmanager->resPrint) : "";
+*/
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+ /* This old and fast method to get and count full list returns all record so use a high amount of memory.
+ $resql = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($resql);
+ */
+ /* The slow method does not consume memory on mysql (not tested on pgsql) */
+ /*$resql = $db->query($sql, 0, 'auto', 1);
+ while ($db->fetch_object($resql)) {
+ $nbtotalofrecords++;
+ }*/
+ /* The fast and low memory method to get and count full list converts the sql into a sql count */
+ $sqlforcount = preg_replace('/^SELECT[a-z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+ $resql = $db->query($sqlforcount);
+ $objforcount = $db->fetch_object($resql);
+ $nbtotalofrecords = $objforcount->nbtotalofrecords;
+ if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
+ $page = 0;
+ $offset = 0;
+ }
+ $db->free($resql);
+}
+
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+ $sql .= $db->plimit($limit + 1, $offset);
+}
+
+$resql = $db->query($sql);
+if (!$resql) {
+ dol_print_error($db);
+ exit;
+}
+
+$num = $db->num_rows($resql);
+
+
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+ $obj = $db->fetch_object($resql);
+ $id = $obj->rowid;
+ header("Location: ".DOL_URL_ROOT.'/asset/model/card.php?id='.$id);
+ exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+ $param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+ $param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+ if (is_array($search[$key]) && count($search[$key])) {
+ foreach ($search[$key] as $skey) {
+ if ($skey != '') {
+ $param .= '&search_'.$key.'[]='.urlencode($skey);
+ }
+ }
+ } elseif ($search[$key] != '') {
+ $param .= '&search_'.$key.'='.urlencode($search[$key]);
+ }
+}
+if ($optioncss != '') {
+ $param .= '&optioncss='.urlencode($optioncss);
+}
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
+
+// List of mass actions available
+$arrayofmassactions = array(
+ //'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+ //'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+ //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+ //'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+);
+if ($permissiontodelete) {
+ $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+ $arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+print ''."\n";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+ $hidegeneratedfilelistifempty = 1;
+ if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+ $hidegeneratedfilelistifempty = 0;
+ }
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+ $formfile = new FormFile($db);
+
+ // Show list of available documents
+ $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+ $urlsource .= str_replace('&', '&', $param);
+
+ $filedir = $diroutputmassaction;
+ $genallowed = $permissiontoread;
+ $delallowed = $permissiontoadd;
+
+ print $formfile->showdocuments('massfilesarea_asset', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php
new file mode 100644
index 00000000000..4af8407976f
--- /dev/null
+++ b/htdocs/asset/model/note.php
@@ -0,0 +1,120 @@
+
+ * Copyright (C) 2018 Alexandre Spangaro
+ *
+ * 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 3 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, see .
+ */
+
+/**
+ * \file htdocs/asset/model/note.php
+ * \ingroup asset
+ * \brief Card with notes on Asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodelnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+ $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->write))); // Used by the include of actions_addupdatedelete.inc.php
+$permissionnote = $permissiontoadd; // Used by the include of actions_setnotes.inc.php
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) $socid = $user->socid;
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->asset->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+ include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('AssetModel'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+ $object->fetch_thirdparty();
+
+ $head = assetModelPrepareHead($object);
+
+ print dol_get_fiche_head($head, 'note', $langs->trans("AssetModel"), -1, $object->picto);
+
+ // Object card
+ // ------------------------------------------------------------
+ $linkback = '' . $langs->trans("BackToList") . '';
+
+ $morehtmlref = '';
+ $morehtmlref .= ' ';
+
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+ print '';
+ print ' ';
+
+
+ $cssclass = "titlefield";
+ include DOL_DOCUMENT_ROOT . '/core/tpl/notes.tpl.php';
+
+ print ' ';
- /*
- // Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
- // Thirdparty
- $morehtmlref.=' '.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
- // Project
- if (! empty($conf->projet->enabled))
- {
- $langs->load("projects");
- $morehtmlref.=' '.$langs->trans('Project') . ' ';
- if ($user->rights->asset->creer)
- {
- if ($action != 'classify')
- //$morehtmlref.=' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.=' ';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
- }
- } else {
- if (! empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref.=' ';
- $morehtmlref.=$proj->ref;
- $morehtmlref.='';
- } else {
- $morehtmlref.='';
- }
- }
- }*/
$morehtmlref .= ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ foreach ($mode_info['fields'] as $field_key => $field_info) {
+ print '| ' . $langs->trans($field_info['label']) . ' | ';
+ if (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key])) {
+ $accountancy_code = $assetaccountancycodes->accountancy_codes[$mode_key][$field_key];
+ if (!empty($conf->accounting->enabled)) {
+ $accountingaccount = new AccountingAccount($db);
+ $accountingaccount->fetch('', $accountancy_code, 1);
+
+ print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+ } else {
+ print $accountancy_code;
+ }
+ }
+ print ' | ';
+ }
+ print ' ';
+ print ' ';
+ print load_fiche_titre($langs->trans($mode_info['label']), '', '');
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ' . "\n";
+ $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
+ foreach ($mode_info['fields'] as $field_key => $field_info) {
+ // Discard if extrafield is a hidden field on form
+ if (abs($field_info['visible']) != 1 && abs($field_info['visible']) != 3 && abs($field_info['visible']) != 4) {
+ continue;
+ }
+ if (array_key_exists('enabled', $field_info) && isset($field_info['enabled']) && !verifCond($field_info['enabled'])) {
+ continue; // We don't want this field
+ }
+ if (!empty($field_info['column_break'])) {
+ print ' ';
+
+ // We close div and reopen for second column
+ print ' ';
+ print ' ';
+
+ print ' ';
+ print ' ';
+ }
+
+ $html_name = $prefix_html_name . $field_key;
+ if (!empty($field_info['enabled_field'])) {
+ $info = explode(':', $field_info['enabled_field']);
+ $enabled_field_info[] = array(
+ 'mode_key' => $info[0],
+ 'field_key' => $info[1],
+ 'value' => $info[2],
+ 'target' => 'field_' . $html_name,
+ );
+ }
+
+ $more_class = '';
+ if (!empty($field_info['required']) || (isset($field_info['notnull']) && $field_info['notnull'] > 0)) {
+ $more_class .= ' fieldrequired';
+ }
+ if (preg_match('/^(text|html)/', $val['type'])) {
+ $more_class .= ' tdtop';
+ }
+
+ print '';
+ if (!empty($field_info['help'])) {
+ print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
+ } else {
+ print $langs->trans($field_info['label']);
+ }
+ print '';
+ print '| ';
+ if (!empty($field_info['picto'])) {
+ print img_picto('', $field_info['picto'], '', false, 0, 0, '', 'pictofixedwidth');
+ }
+ if (in_array($field_info['type'], array('int', 'integer'))) {
+ $value = GETPOSTISSET($html_name) ?GETPOST($html_name, 'int') : $assetdepreciationoptions->$field_key;
+ } elseif ($field_info['type'] == 'double') {
+ $value = GETPOSTISSET($html_name) ? price2num(GETPOST($html_name, 'alphanohtml')) : $assetdepreciationoptions->$field_key;
+ } elseif (preg_match('/^(text|html)/', $field_info['type'])) {
+ $tmparray = explode(':', $field_info['type']);
+ if (!empty($tmparray[1])) {
+ $check = $tmparray[1];
+ } else {
+ $check = 'restricthtml';
+ }
+ $value = GETPOSTISSET($html_name) ? GETPOST($html_name, $check) : $assetdepreciationoptions->$field_key;
+ } elseif ($field_info['type'] == 'price') {
+ $value = GETPOSTISSET($html_name) ? price2num(GETPOST($html_name)) : ($assetdepreciationoptions->$field_key ? price2num($assetdepreciationoptions->$field_key) : (!empty($field_info['default']) ? dol_eval($field_info['default'], 1) : 0));
+ } elseif ($field_key == 'lang') {
+ $value = GETPOSTISSET($html_name) ? GETPOST($html_name, 'aZ09') : $assetdepreciationoptions->lang;
+ } else {
+ $value = GETPOSTISSET($html_name) ? GETPOST($html_name, 'alpha') : $assetdepreciationoptions->$field_key;
+ }
+ if (!empty($field_info['noteditable'])) {
+ print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $prefix_html_name, 0);
+ } else {
+ if ($field_key == 'lang') {
+ print img_picto('', 'language', 'class="pictofixedwidth"');
+ print $formadmin->select_language($value, $html_name, 0, null, 1, 0, 0, 'minwidth300', 2);
+ } else {
+ print $assetdepreciationoptions->showInputField($field_info, $field_key, $value, '', '', $prefix_html_name, 0);
+ }
+ }
+ print ' | ';
+ print ' ';
+ }
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ' . "\n";
+ $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
+ foreach ($mode_info['fields'] as $field_key => $field_info) {
+ if (!empty($field_info['enabled_field'])) {
+ $info = explode(':', $field_info['enabled_field']);
+ if ($assetdepreciationoptions->deprecation_options[$info[0]][$info[1]] != $info[2]) {
+ continue;
+ }
+ }
+ // Discard if extrafield is a hidden field on form
+ if (abs($field_info['visible']) != 1 && abs($field_info['visible']) != 3 && abs($field_info['visible']) != 4 && abs($field_info['visible']) != 5) {
+ continue;
+ }
+ if (array_key_exists('enabled', $field_info) && isset($field_info['enabled']) && !verifCond($field_info['enabled'])) {
+ continue; // We don't want this field
+ }
+ if (!empty($field_info['column_break'])) {
+ print ' ';
+
+ // We close div and reopen for second column
+ print ' ';
+ print ' ';
+
+ print ' ';
+ print ' ';
+ }
+
+ $key = $mode_key . '_' . $field_key;
+ $value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
+
+ print '';
+ if (!empty($field_info['help'])) {
+ print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
+ } else {
+ if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 1) {
+ print showValueWithClipboardCPButton($value, 0, $langs->transnoentitiesnoconv($field_info['label']));
+ } else {
+ print $langs->trans($field_info['label']);
+ }
+ }
+ print '';
+ print '| ';
+ if (in_array($field_info['type'], array('text', 'html'))) {
+ print ' ';
+ }
+ if ($field_key == 'lang') {
+ $langs->load("languages");
+ $labellang = ($value ? $langs->trans('Language_' . $value) : '');
+ print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
+ print $labellang;
+ } else {
+ if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
+ $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+ print showValueWithClipboardCPButton($out, 0, $out);
+ } else {
+ print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+ }
+ }
+ if (in_array($field_info['type'], array('text', 'html'))) {
+ print ' ';
+ }
+ print ' | ';
+ print ' ';
+ }
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ';
+ print ' ' . "\n";
+ $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
+ foreach ($mode_info['fields'] as $field_key => $field_info) {
+ if (!empty($field_info['enabled_field'])) {
+ $info = explode(':', $field_info['enabled_field']);
+ if ($assetdepreciationoptions->deprecation_options[$info[0]][$info[1]] != $info[2]) {
+ continue;
+ }
+ }
+ // Discard if extrafield is a hidden field on form
+ if (abs($field_info['visible']) != 1 && abs($field_info['visible']) != 3 && abs($field_info['visible']) != 4 && abs($field_info['visible']) != 5) {
+ continue;
+ }
+ if (array_key_exists('enabled', $field_info) && isset($field_info['enabled']) && !verifCond($field_info['enabled'])) {
+ continue; // We don't want this field
+ }
+ if (!empty($field_info['column_break'])) {
+ print ' ';
+
+ // We close div and reopen for second column
+ print ' ';
+ print ' ';
+
+ print ' ';
+ print ' ';
+ }
+
+ $key = $mode_key . '_' . $field_key;
+ $value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
+
+ print '';
+ if (!empty($field_info['help'])) {
+ print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
+ } else {
+ if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 1) {
+ print showValueWithClipboardCPButton($value, 0, $langs->transnoentitiesnoconv($field_info['label']));
+ } else {
+ print $langs->trans($field_info['label']);
+ }
+ }
+ print '';
+ print '| ';
+ if (in_array($field_info['type'], array('text', 'html'))) {
+ print ' ';
+ }
+ if ($field_key == 'lang') {
+ $langs->load("languages");
+ $labellang = ($value ? $langs->trans('Language_' . $value) : '');
+ print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
+ print $labellang;
+ } else {
+ if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
+ $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+ print showValueWithClipboardCPButton($out, 0, $out);
+ } else {
+ print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+ }
+ }
+ if (in_array($field_info['type'], array('text', 'html'))) {
+ print ' ';
+ }
+ print ' | ';
+ print ' ';
+ }
+ print ' ';
+ print ' ';
+ print ' ';
+ echo '| '.$langs->trans("Asset");
+ if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
+ print ' ';
+ echo ' | '.$objectlink->getNomUrl(1).' | ';
+ echo ''.$objectlink->label.' | ';
+ echo ''.dol_print_date($objectlink->date_start, 'day').' | ';
+ echo '';
+ if ($user->rights->asset->read) {
+ $total = $total + $objectlink->acquisition_value_ht;
+ echo price($objectlink->acquisition_value_ht);
+ }
+ echo ' | ';
+ echo ''.$objectlink->getLibStatut(3).' | ';
+ echo '';
+ echo ''.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'';
+ echo ' | ';
+ echo " \n";
+}
+if (count($linkedObjectBlock) > 1) {
+ echo '';
+ echo '| '.$langs->trans("Total").' | ';
+ echo ' | ';
+ echo ' | ';
+ echo ' | ';
+ echo ''.price($total).' | ';
+ echo ' | ';
+ echo ' | ';
+ echo " \n";
+}
+
+echo "\n";
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
deleted file mode 100644
index cd802c1c4fd..00000000000
--- a/htdocs/asset/type.php
+++ /dev/null
@@ -1,608 +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 3 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, see .
- */
-
-/**
- * \file htdocs/asset/type.php
- * \ingroup asset
- * \brief Asset's type setup
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
-require_once DOL_DOCUMENT_ROOT.'/asset/class/asset_type.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->accounting->enabled)) {
- require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-}
-if (!empty($conf->accounting->enabled)) {
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-}
-if (!empty($conf->accounting->enabled)) {
- require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-}
-
-// Load translation files required by the page
-$langs->load("assets");
-
-$rowid = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-$type = GETPOST('type', 'alpha');
-
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) {
- $page = 0;
-} // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (!$sortorder) {
- $sortorder = "DESC";
-}
-if (!$sortfield) {
- $sortfield = "a.label";
-}
-
-$label = GETPOST("label", "alpha");
-$accountancy_code_asset = GETPOST('accountancy_code_asset', 'string');
-$accountancy_code_depreciation_asset = GETPOST('accountancy_code_depreciation_asset', 'string');
-$accountancy_code_depreciation_expense = GETPOST('accountancy_code_depreciation_expense', 'string');
-$comment = GETPOST('comment', 'string');
-
-// Security check
-$result = restrictedArea($user, 'asset', $rowid, 'asset_type');
-
-$object = new AssetType($db);
-
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
- $type = "";
- $sall = "";
-}
-
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('assettypecard', 'globalcard'));
-
-$permissiontoadd = $user->rights->asset->setup_advance;
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
- $action = '';
-
- if (!empty($backtopage)) {
- header("Location: ".$backtopage);
- exit;
- }
-}
-
-if ($action == 'add' && $user->rights->asset->write) {
- $object->label = trim($label);
- $object->accountancy_code_asset = trim($accountancy_code_asset);
- $object->accountancy_code_depreciation_asset = trim($accountancy_code_depreciation_asset);
- $object->accountancy_code_depreciation_expense = trim($accountancy_code_depreciation_expense);
- $object->note = trim($comment);
-
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost(null, $object);
- if ($ret < 0) {
- $error++;
- }
-
- if (empty($object->label)) {
- $error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
- } else {
- $sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
- $result = $db->query($sql);
- if ($result) {
- $num = $db->num_rows($result);
- }
- if ($num) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorLabelAlreadyExists", $login), null, 'errors');
- }
- }
-
- if (!$error) {
- $id = $object->create($user);
- if ($id > 0) {
- header("Location: ".$_SERVER["PHP_SELF"]);
- exit;
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
- $action = 'create';
- }
- } else {
- $action = 'create';
- }
-}
-
-if ($action == 'update' && $user->rights->asset->write) {
- $object->fetch($rowid);
-
- $object->oldcopy = clone $object;
-
- $object->label = trim($label);
- $object->accountancy_code_asset = trim($accountancy_code_asset);
- $object->accountancy_code_depreciation_asset = trim($accountancy_code_depreciation_asset);
- $object->accountancy_code_depreciation_expense = trim($accountancy_code_depreciation_expense);
- $object->note = trim($comment);
-
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
- if ($ret < 0) {
- $error++;
- }
-
- $ret = $object->update($user);
-
- if ($ret >= 0 && !count($object->errors)) {
- setEventMessages($langs->trans("AssetTypeModified"), null, 'mesgs');
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
- }
-
- header("Location: ".$_SERVER["PHP_SELF"]."?rowid=".$object->id);
- exit;
-}
-
-if ($action == 'confirm_delete' && $user->rights->asset->write) {
- $object->fetch($rowid);
- $res = $object->delete();
-
- if ($res > 0) {
- setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
- header("Location: ".$_SERVER["PHP_SELF"]);
- exit;
- } else {
- setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
- $action = '';
- }
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$help_url = '';
-
-llxHeader('', $langs->trans("AssetsTypeSetup"), $help_url);
-
-
-// List of asset type
-if (!$rowid && $action != 'create' && $action != 'edit') {
- //print dol_get_fiche_head('');
-
- $sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
- $sql .= " FROM ".MAIN_DB_PREFIX."asset_type as d";
- $sql .= " WHERE d.entity IN (".getEntity('asset_type').")";
-
- $result = $db->query($sql);
- if ($result) {
- $num = $db->num_rows($result);
- $nbtotalofrecords = $num;
-
- $i = 0;
-
- $param = '';
-
- print '';
- } else {
- dol_print_error($db);
- }
-}
-
-
-/* ************************************************************************** */
-/* */
-/* Creation mode */
-/* */
-/* ************************************************************************** */
-if ($action == 'create') {
- $object = new AssetType($db);
- if (!empty($conf->accounting->enabled)) {
- $formaccounting = new FormAccounting($db);
- }
-
- print load_fiche_titre($langs->trans("NewAssetType"), '', $object->picto);
-
- print '\n";
-}
-
-/* ************************************************************************** */
-/* */
-/* View mode */
-/* */
-/* ************************************************************************** */
-if ($rowid > 0) {
- if ($action != 'edit') {
- $object = new AssetType($db);
- $object->fetch($rowid);
- $object->fetch_optionals();
-
- /*
- * Confirmation suppression
- */
- if ($action == 'delete') {
- print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAnAssetType"), $langs->trans("ConfirmDeleteAssetType", $object->label), "confirm_delete", '', 0, 1);
- }
-
- $head = asset_type_prepare_head($object);
-
- print dol_get_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'asset');
-
- $linkback = ''.$langs->trans("BackToList").'';
-
- $morehtmlref = '';
- // Ref asset type
- $morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', 0, 1);
- $morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', null, null, '', 1);
- $morehtmlref .= ' ';
-
- dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
-
- print '';
- print ' ';
-
- print ' ';
-
- print '';
- print '| ';
- print $langs->trans("AccountancyCodeAsset");
- print ' | ';
- if (!empty($conf->accounting->enabled)) {
- $accountingaccount = new AccountingAccount($db);
- $accountingaccount->fetch('', $object->accountancy_code_asset, 1);
-
- print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
- } else {
- print $object->accountancy_code_asset;
- }
- print ' | ';
- print ' ';
-
- print '';
- print '| ';
- print $langs->trans("AccountancyCodeDepreciationAsset");
- print ' | ';
- if (!empty($conf->accounting->enabled)) {
- $accountingaccount2 = new AccountingAccount($db);
- $accountingaccount2->fetch('', $object->accountancy_code_depreciation_asset, 1);
-
- print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
- } else {
- print $object->accountancy_code_depreciation_asset;
- }
- print ' | ';
- print ' ';
-
- print '';
- print '| ';
- print $langs->trans("AccountancyCodeDepreciationExpense");
- print ' | ';
- if (!empty($conf->accounting->enabled)) {
- $accountingaccount3 = new AccountingAccount($db);
- $accountingaccount3->fetch('', $object->accountancy_code_depreciation_expense, 1);
-
- print $accountingaccount3->getNomUrl(0, 1, 1, '', 1);
- } else {
- print $object->accountancy_code_depreciation_expense;
- }
- print ' | ';
- print ' ';
-
- print '| '.$langs->trans("Description").' | ';
- print nl2br($object->note)." | ";
-
- // Other attributes
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
- print ' ';
- print ' ';
-
- // Edit
- if ($user->rights->asset->write) {
- print ' ';
- }
-
- // Delete
- if ($user->rights->asset->write) {
- print ' ';
- }
-
- print " ';
- print '| '.$langs->trans("BookmarkTitle").' | | '.$langs->trans("SetHereATitleForLink").' | ';
+ print '| '.$langs->trans("BookmarkTitle").' | | '.$langs->trans("SetHereATitleForLink").' | ';
dol_set_focus('#titlebookmark');
// Url
@@ -230,9 +230,9 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
print '';
if ($action == 'edit') {
- print 'title).'">';
+ print 'title).'">';
} else {
- print $object->title;
+ print dol_escape_htmltag($object->title);
}
print ' | ';
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 2b3ffc95c41..518889b85b3 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -178,7 +178,9 @@ print '';
// Parent category
print '| '.$langs->trans("In").' | ';
+print img_picto('', 'category', 'class="pictofixedwidth"');
print $form->select_all_categories($type, $object->fk_parent, 'parent', 64, $object->id);
+print ajax_combobox('parent');
print ' | ';
$parameters = array();
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 32c2345a657..8dd6b008045 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -186,35 +186,55 @@ class CActionComm
$qualified = 1;
- // $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
+ // $obj->type can be 'system', 'systemauto', 'module', 'moduleauto', 'xxx', 'xxxauto'
+ // Note: type = system... than type of event is added among other standard events.
+ // type = module... then type of event is grouped into module defined into module = myobject@mymodule. Example: Event organization or external modules
+ // type = xxx... then type of event is added into list as a new flat value (not grouped). Example: Agefod external module
if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) {
$qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
}
if ($qualified && !empty($obj->module)) {
- if ($obj->module == 'invoice' && empty($conf->facture->enabled) && empty($user->facture->lire)) {
- $qualified = 0;
+ //var_dump($obj->type.' '.$obj->module.' '); var_dump($user->rights->facture->lire);
+ $qualified = 0;
+ // Special cases
+ if ($obj->module == 'invoice' && !empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
+ $qualified = 1;
}
- if ($obj->module == 'order' && empty($conf->commande->enabled) && empty($user->commande->lire)) {
- $qualified = 0;
+ if ($obj->module == 'order' && !empty($conf->commande->enabled) && empty($user->rights->commande->lire)) {
+ $qualified = 1;
}
- if ($obj->module == 'propal' && empty($conf->propal->enabled) && empty($user->propale->lire)) {
- $qualified = 0;
+ if ($obj->module == 'propal' && !empty($conf->propal->enabled) && !empty($user->rights->propale->lire)) {
+ $qualified = 1;
}
- if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && empty($user->fournisseur->facture->lire)) || (!empty($conf->supplier_invoice->enabled) && empty($user->supplier_invoice->lire)))) {
- $qualified = 0;
+ if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && !empty($user->rights->fournisseur->facture->lire)) || (!empty($conf->rights->supplier_invoice->enabled) && !empty($user->rights->supplier_invoice->lire)))) {
+ $qualified = 1;
}
- if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && empty($user->fournisseur->commande->lire)) || (empty($conf->supplier_order->enabled) && empty($user->supplier_order->lire)))) {
- $qualified = 0;
+ if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && !empty($user->rights->fournisseur->commande->lire)) || (empty($conf->rights->supplier_order->enabled) && !empty($user->rights->supplier_order->lire)))) {
+ $qualified = 1;
}
- if ($obj->module == 'shipping' && empty($conf->expedition->enabled) && empty($user->expedition->lire)) {
- $qualified = 0;
+ if ($obj->module == 'shipping' && !empty($conf->expedition->enabled) && !empty($user->rights->expedition->lire)) {
+ $qualified = 1;
}
- if (preg_match('/@eventorganization/', $obj->module) && empty($conf->eventorganization->enabled) && empty($user->eventorganization->read)) {
- $qualified = 0;
+ // For the generic case with type = 'module...' and module = 'myobject@mymodule'
+ $regs = array();
+ if (preg_match('/^module/', $obj->type)) {
+ if (preg_match('/^(.+)@(.+)$/', $obj->module, $regs)) {
+ $tmpobject = $regs[1];
+ $tmpmodule = $regs[2];
+ //var_dump($user->$tmpmodule);
+ if ($tmpmodule && isset($conf->$tmpmodule) && !empty($conf->$tmpmodule->enabled) && (!empty($user->rights->$tmpmodule->read) || !empty($user->rights->$tmpmodule->lire) || !empty($user->rights->$tmpmodule->$tmpobject->read) || !empty($user->rights->$tmpmodule->$tmpobject->lire))) {
+ $qualified = 1;
+ }
+ }
}
- if (!preg_match('/^system/', $obj->type) && isset($conf->{$obj->module}) && empty($conf->{$obj->module}->enabled)) {
- $qualified = 0;
+ // For the case type is not 'system...' neither 'module', we just check module is on
+ if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
+ $tmpmodule = $obj->module;
+ //var_dump($tmpmodule);
+ if ($tmpmodule && isset($conf->$tmpmodule) && !empty($conf->$tmpmodule->enabled)) {
+ $qualified = 1;
+ }
}
}
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index e8060bc314d..4142ff9a958 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -49,10 +49,11 @@ if (empty($conf->global->AGENDA_EXT_NB)) {
}
$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
-$filter = GETPOST("search_filter", 'alpha', 3) ?GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
-$filtert = GETPOST("search_filtert", "int", 3) ?GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
-$usergroup = GETPOST("search_usergroup", "int", 3) ?GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
-$showbirthday = empty($conf->use_javascript_ajax) ?GETPOST("showbirthday", "int") : 1;
+$check_holiday = GETPOST('check_holiday', 'int');
+$filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
+$filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
+$usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
+$showbirthday = empty($conf->use_javascript_ajax) ? GETPOST("showbirthday", "int") : 1;
// If not choice done on calendar owner (like on left menu link "Agenda"), we filter on user.
if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
@@ -207,16 +208,16 @@ if (GETPOST("viewperuser", 'alpha') || $mode == 'show_peruser') {
}
/*
-if ($action == 'delete_action' && $user->rights->agenda->delete) {
- $event = new ActionComm($db);
- $event->fetch($actionid);
- $event->fetch_optionals();
- $event->fetch_userassigned();
- $event->oldcopy = clone $event;
+ if ($action == 'delete_action' && $user->rights->agenda->delete) {
+ $event = new ActionComm($db);
+ $event->fetch($actionid);
+ $event->fetch_optionals();
+ $event->fetch_userassigned();
+ $event->oldcopy = clone $event;
- $result = $event->delete();
-}
-*/
+ $result = $event->delete();
+ }
+ */
/*
@@ -579,10 +580,10 @@ if (!empty($conf->use_javascript_ajax)) { // If javascript on
$s .= ''."\n";
// Local calendar
- $s .= ' '.$langs->trans("LocalAgenda").' ';
+ $s .= ' '.$langs->trans("LocalAgenda").' ';
// Holiday calendar
- $s .= ' ';
+ $s .= ' ';
// External calendars
if (is_array($showextcals) && count($showextcals) > 0) {
@@ -607,13 +608,13 @@ if (!empty($conf->use_javascript_ajax)) { // If javascript on
foreach ($showextcals as $val) {
$htmlname = md5($val['name']);
- if (!empty($val['default'])) {
+ if (!empty($val['default']) || GETPOST('check_ext'.$htmlname, 'int')) {
$default = "checked";
} else {
$default = '';
}
- $s .= ' ';
+ $s .= ' ';
}
}
@@ -848,6 +849,7 @@ if ($resql) {
$event->fk_project = $obj->fk_project;
$event->socid = $obj->fk_soc;
+ $event->thirdparty_id = $obj->fk_soc;
$event->contact_id = $obj->fk_contact;
// Defined date_start_in_calendar and date_end_in_calendar property
@@ -890,13 +892,13 @@ if ($resql) {
$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt'); // $mois, $jour, $annee has been set for user tz
$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt'); // $moisend, $jourend, $anneeend has been set for user tz
/*
- print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'
';
- print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'
';
- print 'TZUSERREL '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel').'
';
- print 'GMT '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'gmt').'
';
- print 'TZSERVER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzserver').'
';
- print 'TZUSER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel').'
';
- */
+ print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'
';
+ print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'
';
+ print 'TZUSERREL '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel').'
';
+ print 'GMT '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'gmt').'
';
+ print 'TZSERVER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzserver').'
';
+ print 'TZUSER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel').'
';
+ */
do {
//if ($event->id==408)
//print 'daykey='.$daykey.' daykeyend='.$daykeyend.' '.dol_print_date($daykey, 'dayhour', 'gmt').' - '.dol_print_date($event->datep, 'dayhour', 'gmt').' '.dol_print_date($event->datef, 'dayhour', 'gmt').'
';
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 90d3ed128f7..eabcb1a55bf 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -214,7 +214,7 @@ if (empty($reshook)) {
// assujetissement a la TVA
if ($action == 'setassujtva' && $user->rights->societe->creer) {
$object->fetch($id);
- $object->tva_assuj = $_POST['assujtva_value'];
+ $object->tva_assuj = GETPOST('assujtva_value');
$result = $object->update($object->id);
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 79faf4b2cd2..f82df06313b 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -745,7 +745,7 @@ if ($action == 'create') {
print '';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 45a4d2fdb57..61ecb966359 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -302,7 +302,7 @@ if (empty($reshook)) {
}
}
} elseif ($action == 'setdate' && $usercancreate) {
- $datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+ $datep = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
if (empty($datep)) {
$error++;
@@ -316,7 +316,7 @@ if (empty($reshook)) {
}
}
} elseif ($action == 'setecheance' && $usercancreate) {
- $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
+ $result = $object->set_echeance($user, dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int')));
if ($result >= 0) {
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
$outputlangs = $langs;
@@ -339,7 +339,7 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors');
}
} elseif ($action == 'setdate_livraison' && $usercancreate) {
- $result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
+ $result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth', 'int'), GETPOST('date_livraisonday', 'int'), GETPOST('date_livraisonyear', 'int')));
if ($result < 0) {
dol_print_error($db, $object->error);
}
@@ -1955,7 +1955,7 @@ if ($action == 'create') {
// We verify whether the object is provisionally numbering
$ref = substr($object->ref, 1, 4);
- if ($ref == 'PROV') {
+ if ($ref == 'PROV' || $ref == '') {
$numref = $object->getNextNumRef($soc);
if (empty($numref)) {
$error++;
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 029706dfb5d..6a6031c3a99 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -554,10 +554,11 @@ class Propal extends CommonObject
* @param int $origin_id Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
* @param double $pu_ht_devise Unit price in currency
* @param int $fk_remise_except Id discount if line is from a discount
+ * @param int $noupdateafterinsertline No update after insert of line
* @return int >0 if OK, <0 if KO
* @see add_product()
*/
- public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0)
+ public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0, $noupdateafterinsertline = 0)
{
global $mysoc, $conf, $langs;
@@ -746,7 +747,9 @@ class Propal extends CommonObject
}
// Mise a jour informations denormalisees au niveau de la propale meme
- $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+ if (empty($noupdateafterinsertline)) {
+ $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+ }
if ($result > 0) {
$this->db->commit();
@@ -1009,7 +1012,7 @@ class Propal extends CommonObject
*/
public function create($user, $notrigger = 0)
{
- global $conf, $hookmanager;
+ global $conf, $hookmanager, $mysoc;
$error = 0;
$now = dol_now();
@@ -1238,7 +1241,10 @@ class Propal extends CommonObject
$line->array_options,
$line->fk_unit,
$origintype,
- $originid
+ $originid,
+ 0,
+ 0,
+ 1
);
if ($result < 0) {
@@ -1267,7 +1273,7 @@ class Propal extends CommonObject
if (!$error) {
// Mise a jour infos denormalisees
- $resql = $this->update_price(1);
+ $resql = $this->update_price(1, 'auto', 0, $mysoc);
if ($resql) {
$action = 'update';
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index fedf6a6233d..989dcfe7098 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -107,12 +107,6 @@ if ($action == 'addcontact' && $user->rights->propale->creer) {
dol_print_error($db);
}
}
-/*
-elseif ($action == 'setaddress' && $user->rights->propale->creer)
-{
- $result=$object->setDeliveryAddress($_POST['fk_address']);
- if ($result < 0) dol_print_error($db,$object->error);
-}*/
/*
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index adc9de9339e..613f06a6feb 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -30,7 +30,7 @@ if (empty($conf) || !is_object($conf)) {
}
-print "\n";
+print "\n";
global $user;
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 4404f9758a6..d44093dbab5 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -160,7 +160,7 @@ if ($action == 'setremise' && $user->rights->societe->creer) {
$amount_ht = price2num(GETPOST('amount_ht', 'alpha'));
$desc = GETPOST('desc', 'alpha');
$tva_tx = GETPOST('tva_tx', 'alpha');
- $discount_type = !empty($_POST['discount_type']) ?GETPOST('discount_type', 'alpha') : 0;
+ $discount_type = GETPOSTISSET('discount_type') ? GETPOST('discount_type', 'alpha') : 0;
if ($amount_ht > 0) {
$error = 0;
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 72851c3943a..471363f74ec 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -533,7 +533,6 @@ if (empty($reshook)) {
}
}
} elseif ($action == 'setdate' && $usercancreate) {
- // print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$date = dol_mktime(0, 0, 0, GETPOST('order_month', 'int'), GETPOST('order_day', 'int'), GETPOST('order_year', 'int'));
$result = $object->set_date($user, $date);
@@ -541,7 +540,6 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors');
}
} elseif ($action == 'setdate_livraison' && $usercancreate) {
- // print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
$object->fetch($id);
@@ -1371,7 +1369,7 @@ if (empty($reshook)) {
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
// Actions to build doc
- $upload_dir = !empty($conf->propal->multidir_output[$object->entity])?$conf->propal->multidir_output[$object->entity]:$conf->propal->dir_output;
+ $upload_dir = !empty($conf->commande->multidir_output[$object->entity])?$conf->commande->multidir_output[$object->entity]:$conf->commande->dir_output;
$permissiontoadd = $usercancreate;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
@@ -1902,8 +1900,12 @@ if ($action == 'create' && $usercancreate) {
if ($action == 'validate') {
// We check that object has a temporary ref
$ref = substr($object->ref, 1, 4);
- if ($ref == 'PROV') {
+ if ($ref == 'PROV' || $ref == '') {
$numref = $object->getNextNumRef($soc);
+ if (empty($numref)) {
+ $error++;
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
} else {
$numref = $object->ref;
}
@@ -1954,8 +1956,9 @@ if ($action == 'create' && $usercancreate) {
if ($nbMandated > 0 ) $text .= ''.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").' ';
-
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
+ if (!$error) {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
+ }
}
// Confirm back to draft status
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a9ff2e09cf3..0c43cc4ad2d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -877,7 +877,7 @@ class Commande extends CommonOrder
*/
public function create($user, $notrigger = 0)
{
- global $conf, $langs;
+ global $conf, $langs, $mysoc;
$error = 0;
// Clean parameters
@@ -1044,7 +1044,8 @@ class Commande extends CommonOrder
$origintype,
$originid,
0,
- $line->ref_ext
+ $line->ref_ext,
+ 1
);
if ($result < 0) {
if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER) {
@@ -1061,6 +1062,8 @@ class Commande extends CommonOrder
}
}
+ $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+
// update ref
$initialref = '(PROV'.$this->id.')';
if (!empty($this->ref)) {
@@ -1438,6 +1441,7 @@ class Commande extends CommonOrder
* @param int $origin_id Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
* @param double $pu_ht_devise Unit price in currency
* @param string $ref_ext line external reference
+ * @param int $noupdateafterinsertline No update after insert of line
* @return int >0 if OK, <0 if KO
*
* @see add_product()
@@ -1447,7 +1451,7 @@ class Commande extends CommonOrder
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
*/
- public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $ref_ext = '')
+ public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $ref_ext = '', $noupdateafterinsertline = 0)
{
global $mysoc, $conf, $langs, $user;
@@ -1658,7 +1662,10 @@ class Commande extends CommonOrder
}
// Mise a jour informations denormalisees au niveau de la commande meme
- $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+ if (empty($noupdateafterinsertline)) {
+ $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+ }
+
if ($result > 0) {
$this->db->commit();
return $this->line->id;
@@ -3659,9 +3666,10 @@ class Commande extends CommonOrder
* @param int $notooltip 1=Disable tooltip
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @param int $addlinktonotes Add link to notes
+ * @param string $target attribute target for link
* @return string String with URL
*/
- public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
+ public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0, $target = '')
{
global $conf, $langs, $user, $hookmanager;
@@ -3730,6 +3738,11 @@ class Commande extends CommonOrder
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
$linkclose .= ' class="classfortooltip"';
+
+ $target_value=array('_self', '_blank', '_parent', '_top');
+ if (in_array($target, $target_value)) {
+ $linkclose .= ' target="'.dol_escape_htmltag($target).'"';
+ }
}
$linkstart = 'rights->commande->creer) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
-/*
-elseif ($action == 'setaddress' && $user->rights->commande->creer)
-{
- $object->fetch($id);
- $result=$object->setDeliveryAddress($_POST['fk_address']);
- if ($result < 0) dol_print_error($db,$object->error);
-}*/
/*
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 2a6140aaeed..8c1df906ab7 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
exit;
}
-print "\n";
+print "\n";
global $user;
global $noMoreLinkedObjectBlockAfter;
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index bdeeb072e97..0332a925f9d 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -47,10 +47,10 @@ $langs->load('compta');
//init var
$invoice_type = GETPOST('invoice_type', 'int');
-$amountPayment = $_POST['amountPayment'];
-$amounts = $_POST['amounts']; // from text inputs : invoice amount payment (check required)
-$remains = $_POST['remains']; // from dolibarr's object (no need to check)
-$currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invoice id)
+$amountPayment = GETPOST('amountPayment');
+$amounts = GETPOST('amounts'); // from text inputs : invoice amount payment (check required)
+$remains = GETPOST('remains'); // from dolibarr's object (no need to check)
+$currentInvId = GETPOST('imgClicked'); // from DOM elements : imgId (equals invoice id)
// Getting the posted keys=>values, sanitize the ones who are from text inputs
$amountPayment = $amountPayment != '' ? (is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '') : ''; // keep void if not a valid entry
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 8430d9e7440..f8cc88e1be4 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -124,6 +124,7 @@ if (empty($reshook)) {
$object->bic = trim(GETPOST("bic"));
$object->iban = trim(GETPOST("iban"));
$object->domiciliation = trim(GETPOST("domiciliation", "nohtml"));
+ $object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
@@ -224,6 +225,7 @@ if (empty($reshook)) {
$object->bic = trim(GETPOST("bic"));
$object->iban = trim(GETPOST("iban"));
$object->domiciliation = trim(GETPOST("domiciliation", "nohtml"));
+ $object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
@@ -283,7 +285,7 @@ if (empty($reshook)) {
$categories = GETPOST('categories', 'array');
$object->setCategories($categories);
- $_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
+ $_GET["id"] = GETPOST("id", 'int'); // Force chargement page en mode visu
} else {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
@@ -537,6 +539,13 @@ if ($action == 'create') {
print '| '.$langs->trans($bickey).' | ';
print ' | ';
+ if ($conf->paymentbybanktransfer->enabled) {
+ print '| '.$langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation").' | ';
+ print ' ';
+ print img_picto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp"), 'info');
+ print ' | ';
+ }
+
print '| '.$langs->trans("BankAccountDomiciliation").' | ';
print '';
@@ -257,9 +264,12 @@ class DolEditor
$out .= ''."\n";
- }
+ if (!empty($conf->use_javascript_ajax)) {
+ $out .= ''."\n";
+ $out .= ''."\n";
}
+ } else {
+ $this->expand_display[$collapse_group] = 1;
}
return $out;
@@ -1960,17 +1972,17 @@ class ExtraFields
$enabled = 1;
if (isset($this->attributes[$object->table_element]['enabled'][$key])) { // 'enabled' is often a condition on module enabled or not
- $enabled = dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1);
+ $enabled = dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1, 1, '1');
}
$visibility = 1;
if (isset($this->attributes[$object->table_element]['list'][$key])) { // 'list' is option for visibility
- $visibility = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+ $visibility = dol_eval($this->attributes[$object->table_element]['list'][$key], 1, 1, '1');
}
$perms = 1;
if (isset($this->attributes[$object->table_element]['perms'][$key])) {
- $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+ $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1, 1, '1');
}
if (empty($enabled)) {
continue;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8f112b9aa98..428de442786 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -141,7 +141,7 @@ class Form
}
}
} else {
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+ if (empty($notabletag) && $perm) {
$ret .= '| ';
}
if ($fieldrequired) {
@@ -158,10 +158,10 @@ class Form
if (!empty($notabletag)) {
$ret .= ' ';
}
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+ if (empty($notabletag) && $perm) {
$ret .= ' | ';
}
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+ if (empty($notabletag) && $perm) {
$ret .= '';
}
if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
@@ -173,10 +173,10 @@ class Form
if (!empty($notabletag) && $notabletag == 3) {
$ret .= ' ';
}
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+ if (empty($notabletag) && $perm) {
$ret .= ' | ';
}
- if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+ if (empty($notabletag) && $perm) {
$ret .= '
';
}
}
@@ -791,7 +791,7 @@ class Form
// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
$ret .= ''; // Hidden button BEFORE so it is the one used when we submit with ENTER.
- $ret .= 'use_javascript_ajax) ? '' : ' style="display: none"').' class="button small'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+ $ret .= 'use_javascript_ajax) ? '' : ' style="display: none"').' class="button smallpaddingimp'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
$ret .= '';
if (!empty($conf->use_javascript_ajax)) {
@@ -1599,7 +1599,7 @@ class Form
* @param string $exclude List of contacts id to exclude
* @param string $limitto Disable answers that are not id in this array list
* @param integer $showfunction Add function into label
- * @param string $moreclass Add more class to class style
+ * @param string $morecss Add more class to class style
* @param integer $showsoc Add company into label
* @param int $forcecombo Force to use combo box
* @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
@@ -1609,10 +1609,10 @@ class Form
* @return int <0 if KO, Nb of contact in list if OK
* @deprecated You can use selectcontacts directly (warning order of param was changed)
*/
- public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
+ public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
{
// phpcs:enable
- print $this->selectcontacts($socid, $selected, $htmlname, $showempty, $exclude, $limitto, $showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);
+ print $this->selectcontacts($socid, $selected, $htmlname, $showempty, $exclude, $limitto, $showfunction, $morecss, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);
return $this->num;
}
@@ -1629,7 +1629,7 @@ class Form
* @param string $exclude List of contacts id to exclude
* @param string $limitto Disable answers that are not id in this array list
* @param integer $showfunction Add function into label
- * @param string $moreclass Add more class to class style
+ * @param string $morecss Add more class to class style
* @param bool $options_only Return options only (for ajax treatment)
* @param integer $showsoc Add company into label
* @param int $forcecombo Force to use combo box (so no ajax beautify effect)
@@ -1640,7 +1640,7 @@ class Form
* @param integer $disableifempty Set tag 'disabled' on select if there is no choice
* @return int|string <0 if KO, HTML with select string if OK.
*/
- public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
+ public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
{
global $conf, $langs, $hookmanager, $action;
@@ -1687,7 +1687,7 @@ class Form
$num = $this->db->num_rows($resql);
if ($htmlname != 'none' && !$options_only) {
- $out .= ' | '."\n";
@@ -5199,6 +5202,7 @@ class Form
$out .= '';
$out .= '';
} else {
+ $out .= '';
if ($selected) {
$projet = new Project($this->db);
$projet->fetch($selected);
@@ -5206,6 +5210,7 @@ class Form
} else {
$out .= " ";
}
+ $out .= '';
}
if (empty($nooutput)) {
@@ -6675,7 +6680,7 @@ class Form
// phpcs:enable
global $langs;
- $retstring = '';
+ $retstring = '';
$hourSelected = 0;
$minSelected = 0;
@@ -6707,7 +6712,7 @@ class Form
if ($typehour != 'text') {
$retstring .= ' '.$langs->trans('HourShort');
} else {
- $retstring .= ':';
+ $retstring .= ':';
}
// Minutes
@@ -6735,7 +6740,7 @@ class Form
$retstring .= ' '.$langs->trans('MinuteShort');
}
- //$retstring.=" ";
+ $retstring.="";
if (!empty($nooutput)) {
return $retstring;
@@ -7522,7 +7527,7 @@ class Form
if (!empty($objecttmp->fields)) { // For object that declare it, it is better to use declared fields (like societe, contact, ...)
$tmpfieldstoshow = '';
foreach ($objecttmp->fields as $key => $val) {
- if (!dol_eval($val['enabled'], 1, 1)) {
+ if (!dol_eval($val['enabled'], 1, 1, 1, '1')) {
continue;
}
if (!empty($val['showoncombobox'])) {
@@ -8123,12 +8128,9 @@ class Form
$out .= "\n".'';
+ }
return $out;
}
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 518a8f93290..1a2c02deb54 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -49,13 +49,13 @@ class FormCategory extends Form
$categoryArray = $this->select_all_categories($type, "", "", 64, 0, 1);
$categoryArray[-2] = "- ".$langs->trans('NotCategorized')." -";
- $tmptitle = $langs->trans("Category");
+ $tmptitle = $langs->transnoentitiesnoconv("Category");
$filter = '';
$filter .= '';
$filter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
//$filter .= $langs->trans('Categories').": ";
- $filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300", 0, 0, '', '', $tmptitle);
+ $filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300 widthcentpercentminusx", 0, 0, '', '', $tmptitle);
$filter .= " ";
return $filter;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 217bba55330..d8801d00dc7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -360,8 +360,8 @@ class FormFile
* This also set the property $this->numoffiles
*
* @param string $modulepart Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:MyObject', 'mymodule_temp', ...)
- * @param string $modulesubdir Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
- * @param string $filedir Directory to scan
+ * @param string $modulesubdir Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into a subdir of module.
+ * @param string $filedir Directory to scan (must not end with a /). Example: '/mydolibarrdocuments/facture/FAYYMM-1234'
* @param string $urlsource Url of origin page (for return)
* @param int|string[] $genallowed Generation is allowed (1/0 or array list of templates)
* @param int $delallowed Remove is allowed (1/0)
@@ -1283,12 +1283,22 @@ class FormFile
}
print ' | ';
print ' | ';
- if (!$disablemove) {
+ if (empty($disablemove) && count($filearray) > 1) {
print ' | ';
}
print "\n";
}
+ // Get list of files stored into database for same relative directory
+ if ($relativedir) {
+ completeFileArrayWithDatabaseInfo($filearray, $relativedir);
+
+ //var_dump($sortfield.' - '.$sortorder);
+ if ($sortfield && $sortorder) { // If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+ $filearray = dol_sort_array($filearray, $sortfield, $sortorder);
+ }
+ }
+
print '';
//print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
print_liste_field_titre('Documents2', $url, "name", "", $param, '', $sortfield, $sortorder, 'left ');
@@ -1301,21 +1311,11 @@ class FormFile
print_liste_field_titre('');
// Action button
print_liste_field_titre('');
- if (!$disablemove) {
+ if (empty($disablemove) && count($filearray) > 1) {
print_liste_field_titre('');
}
print " \n";
- // Get list of files stored into database for same relative directory
- if ($relativedir) {
- completeFileArrayWithDatabaseInfo($filearray, $relativedir);
-
- //var_dump($sortfield.' - '.$sortorder);
- if ($sortfield && $sortorder) { // If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
- $filearray = dol_sort_array($filearray, $sortfield, $sortorder);
- }
- }
-
$nboffiles = count($filearray);
if ($nboffiles > 0) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -1510,18 +1510,18 @@ class FormFile
}
print "";
- if (empty($disablemove)) {
+ if (empty($disablemove) && count($filearray) > 1) {
if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
print '';
if ($i > 0) {
print 'id.'">'.img_up('default', 0, 'imgupforline').'';
}
- if ($i < $nboffiles - 1) {
+ if ($i < ($nboffiles - 1)) {
print 'id.'">'.img_down('default', 0, 'imgdownforline').'';
}
print ' | ';
} else {
- print 'browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
+ print 'browser->layout != 'phone') ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
print '';
}
}
@@ -1531,7 +1531,7 @@ class FormFile
print '';
print '';
print '';
- if (empty($disablemove)) {
+ if (empty($disablemove) && count($filearray) > 1) {
print ' | ';
}
}
@@ -1542,7 +1542,7 @@ class FormFile
}
if ($nboffiles == 0) {
$colspan = '6';
- if (empty($disablemove)) {
+ if (empty($disablemove) && count($filearray) > 1) {
$colspan++; // 6 columns or 7
}
print '| ';
@@ -2032,7 +2032,7 @@ class FormFile
print ' | ";
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 3f728d99567..e9ec8accf30 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf)) {
}
-print "\n";
+print "\n";
global $user;
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index f8f484f0cc9..1f421230bbb 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -108,9 +108,9 @@ if ($action == 'confirm_validate' && $confirm == 'yes' &&
}
}
-if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
+if ($action == 'setnum_paiement' && GETPOST('num_paiement')) {
$object->fetch($id);
- $res = $object->update_num($_POST['num_paiement']);
+ $res = $object->update_num(GETPOST('num_paiement'));
if ($res === 0) {
setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
} else {
@@ -118,7 +118,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
}
}
-if ($action == 'setdatep' && !empty($_POST['datepday'])) {
+if ($action == 'setdatep' && GETPOST('datepday')) {
$object->fetch($id);
$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
$res = $object->update_date($datepaye);
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index fb53811aeaf..a9bfe8ab4f2 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -112,7 +112,7 @@ if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write &&
if ($user->socid) {
$socid = $user->socid;
}
-$result = restrictedArea($user, 'holiday', $object->id, 'holiday');
+$result = restrictedArea($user, 'holiday', $object->id, 'holiday', '', '', 'rowid', $object->statut);
/*
@@ -654,7 +654,7 @@ if (empty($reshook)) {
}
if ($action == 'confirm_refuse' && GETPOST('confirm', 'alpha') == 'yes') {
- if (!empty($_POST['detail_refuse'])) {
+ if (GETPOST('detail_refuse')) {
$object->fetch($id);
// If status pending validation and validator = user
@@ -1083,7 +1083,9 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
if (empty($include_users)) {
print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
} else {
- $defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
+ // Defined default approver (the forced approved of user or the supervisor if no forced value defined)
+ // Note: This use will be set only if the deinfed approvr has permission to approve so is inside include_users
+ $defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator);
if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) {
$defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
}
@@ -1414,7 +1416,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
// Confirmation messages
if ($action == 'delete') {
- if ($user->rights->holiday->delete) {
+ if ($candelete) {
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleDeleteCP"), $langs->trans("ConfirmDeleteCP"), "confirm_delete", '', 0, 1);
}
}
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 621443fb408..12a32ba3f50 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -145,7 +145,8 @@ if (empty($reshook)) {
}
//If the user set a comment, we add it to the log comment
- $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+ $note_holiday = GETPOST('note_holiday');
+ $comment = ((isset($note_holiday[$userID]) && !empty($note_holiday[$userID])) ? ' ('.$note_holiday[$userID].')' : '');
//print 'holiday: '.$val['rowid'].'-'.$userValue;
if ($userValue != '') {
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 5e8124fe09a..8050eb08ec9 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -1067,79 +1067,4 @@ class Evaluation extends CommonObject
return $error;
}
-
- /**
- * @param string $action
- * @param int $selected
- */
- // public function printObjectLines($action, $selected = 0)
- // {
- // global $conf, $hookmanager, $langs, $user, $extrafields, $object;
- // // TODO We should not use global var for this
- // global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
- //
- // // Define usemargins
- //// $usemargins = 0;
- //// if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) {
- //// $usemargins = 1;
- //// }
- //
- // $num = count($this->lines);
- //
- // // Line extrafield
- // if (!is_object($extrafields)) {
- // require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
- // $extrafields = new ExtraFields($this->db);
- // }
- // $extrafields->fetch_name_optionals_label($this->table_element_line);
- //
- // $parameters = array('num'=>$num, 'selected'=>$selected, 'table_element_line'=>$this->table_element_line);
- // $reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- // if (empty($reshook)) {
- // // Output template part (modules that overwrite templates must declare this into descriptor)
- // // Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook.
- // include dol_buildpath('hrm/core/tpl/objectline_title.tpl.php');
- // }
- //
- // $i = 0;
- //
- // print " \n";
- // foreach ($this->lines as $line) {
- // //Line extrafield
- // $line->fetch_optionals();
- //
- // //if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
- // if (is_object($hookmanager)) { // Old code is commented on preceding line.
- // if (empty($line->fk_parent_line)) {
- // $parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
- // $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- // } else {
- // $parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
- // $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- // }
- // }
- // if (empty($reshook)) {
- // $this->printObjectLine($action, $line);
- // }
- //
- // $i++;
- // }
- // print "\n";
- // }
-
- // public function printObjectLine($action, $line)
- // {
- // global $conf, $langs, $user, $object, $hookmanager;
- // global $form;
- // global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
- //
- // $object_rights = $this->getRights();
- //
- // $element = $this->element;
- //
- // $text = '';
- // $description = '';
- //
- // include dol_buildpath('hrm/tpl/objectline_view.tpl.php');
- // }
}
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 0ce7d793003..1fe67dd0bd1 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -135,14 +135,14 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
$result = $object->update($user);
if ($result > 0) {
- header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
+ header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
exit;
} else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
} else {
- header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
+ header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
exit;
}
}
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 8aeadeaa18c..7b0b7bcfd7d 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -269,9 +269,6 @@ if ($action == 'create') {
print dol_get_fiche_head(array(), '');
- // Set some default values
- //if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
print ''."\n";
// Common attributes
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 35189f11b87..ad99573b096 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1);
+ $visible = (int) dol_eval($val['visible'], 1, 1, '1');
$arrayfields['t.'.$key] = array(
'label'=>$val['label'],
'checked'=>(($visible < 0) ? 0 : 1),
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
'position'=>$val['position'],
'help'=> isset($val['help']) ? $val['help'] : ''
);
diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php
index d4501c8e685..906eb83b945 100644
--- a/htdocs/hrm/job_card.php
+++ b/htdocs/hrm/job_card.php
@@ -195,9 +195,6 @@ if ($action == 'create') {
print dol_get_fiche_head(array(), '');
- // Set some default values
- //if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
print '' . "\n";
// Common attributes
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 55363d729b5..7644ea1fd0f 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1);
+ $visible = (int) dol_eval($val['visible'], 1, 1, '1');
$arrayfields['t.'.$key] = array(
'label'=>$val['label'],
'checked'=>(($visible < 0) ? 0 : 1),
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
'position'=>$val['position'],
'help'=> isset($val['help']) ? $val['help'] : ''
);
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index d36d352e895..86167ef4024 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -357,11 +357,11 @@ function DisplayPositionList()
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1);
+ $visible = (int) dol_eval($val['visible'], 1, 1, '1');
$arrayfields['t.' . $key] = array(
'label' => $val['label'],
'checked' => (($visible < 0) ? 0 : 1),
- 'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
'position' => $val['position'],
'help' => isset($val['help']) ? $val['help'] : ''
);
@@ -915,9 +915,6 @@ if ($action == 'create') {
print dol_get_fiche_head(array(), '');
- // Set some default values
- //if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
print '' . "\n";
// Common attributes
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 1585ed1e03f..13315a2a9bc 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1);
+ $visible = (int) dol_eval($val['visible'], 1, 1, '1');
$arrayfields['t.'.$key] = array(
'label'=>$val['label'],
'checked'=>(($visible < 0) ? 0 : 1),
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
'position'=>$val['position'],
'help'=> isset($val['help']) ? $val['help'] : ''
);
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index a06cf40952a..e1144f75866 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -196,9 +196,6 @@ if ($action == 'create') {
print dol_get_fiche_head(array(), '');
- // Set some default values
- //if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
print '' . "\n";
// Common attributes
@@ -538,11 +535,11 @@ if ($action != "create" && $action != "edit") {
foreach ($objectline->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1);
+ $visible = (int) dol_eval($val['visible'], 1, 1, '1');
$arrayfields['t.' . $key] = array(
'label' => $val['label'],
'checked' => (($visible < 0) ? 0 : 1),
- 'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
'position' => $val['position'],
'help' => isset($val['help']) ? $val['help'] : ''
);
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 1fc5440e589..8ef800b3ffc 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1);
+ $visible = (int) dol_eval($val['visible'], 1, 1, '1');
$arrayfields['t.'.$key] = array(
'label'=>$val['label'],
'checked'=>(($visible < 0) ? 0 : 1),
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
'position'=>$val['position'],
'help'=> isset($val['help']) ? $val['help'] : ''
);
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
index 7e12c501403..5fc00e57f75 100644
--- a/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
+++ b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
@@ -108,17 +108,17 @@
*/
// TCPDF configuration
-require_once(dirname(__FILE__).'/tcpdf_autoconfig.php');
+require_once dirname(__FILE__).'/tcpdf_autoconfig.php';
// TCPDF static font methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_font_data.php');
+require_once dirname(__FILE__).'/include/tcpdf_font_data.php';
// TCPDF static font methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_fonts.php');
+require_once dirname(__FILE__).'/include/tcpdf_fonts.php';
// TCPDF static color methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_colors.php');
+require_once dirname(__FILE__).'/include/tcpdf_colors.php';
// TCPDF static image methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_images.php');
+require_once dirname(__FILE__).'/include/tcpdf_images.php';
// TCPDF static methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_static.php');
+require_once dirname(__FILE__).'/include/tcpdf_static.php';
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -134,7 +134,8 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
* @IgnoreAnnotation("public")
* @IgnoreAnnotation("pre")
*/
-class TCPDF {
+class TCPDF
+{
// Protected properties
@@ -1852,7 +1853,8 @@ class TCPDF {
* @public
* @see getPageSizeFromFormat(), setPageFormat()
*/
- public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false, $pdfa=false) {
+ public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8', $diskcache = false, $pdfa = false)
+ {
/* Set internal character encoding to ASCII */
if (function_exists('mb_internal_encoding') AND mb_internal_encoding()) {
$this->internal_encoding = mb_internal_encoding();
@@ -1869,8 +1871,7 @@ class TCPDF {
if ($pdfa != false) {
$this->pdfa_mode = true;
$this->pdfa_version = $pdfa; // 1 or 3
- } else
- $this->pdfa_mode = false;
+ } else $this->pdfa_mode = false;
$this->force_srgb = false;
// set language direction
@@ -2017,7 +2018,8 @@ class TCPDF {
* @public
* @since 1.53.0.TC016
*/
- public function __destruct() {
+ public function __destruct()
+ {
// cleanup
$this->_destroy(true);
}
@@ -2028,7 +2030,8 @@ class TCPDF {
* @public
* @since 3.0.015 (2008-06-06)
*/
- public function setPageUnit($unit) {
+ public function setPageUnit($unit)
+ {
$unit = strtolower($unit);
//Set scale factor
switch ($unit) {
@@ -2068,59 +2071,60 @@ class TCPDF {
/**
* Change the format of the current page
* @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numbers (width, height) or an array containing the following measures and options:
- * - ['format'] = page format name (one of the above);
- * - ['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
- * - ['PZ'] : The page's preferred zoom (magnification) factor.
- * - ['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed:
- * - ['MediaBox']['llx'] : lower-left x coordinate
- * - ['MediaBox']['lly'] : lower-left y coordinate
- * - ['MediaBox']['urx'] : upper-right x coordinate
- * - ['MediaBox']['ury'] : upper-right y coordinate
- * - ['CropBox'] : the visible region of default user space:
- * - ['CropBox']['llx'] : lower-left x coordinate
- * - ['CropBox']['lly'] : lower-left y coordinate
- * - ['CropBox']['urx'] : upper-right x coordinate
- * - ['CropBox']['ury'] : upper-right y coordinate
- * - ['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment:
- * - ['BleedBox']['llx'] : lower-left x coordinate
- * - ['BleedBox']['lly'] : lower-left y coordinate
- * - ['BleedBox']['urx'] : upper-right x coordinate
- * - ['BleedBox']['ury'] : upper-right y coordinate
- * - ['TrimBox'] : the intended dimensions of the finished page after trimming:
- * - ['TrimBox']['llx'] : lower-left x coordinate
- * - ['TrimBox']['lly'] : lower-left y coordinate
- * - ['TrimBox']['urx'] : upper-right x coordinate
- * - ['TrimBox']['ury'] : upper-right y coordinate
- * - ['ArtBox'] : the extent of the page's meaningful content:
- * - ['ArtBox']['llx'] : lower-left x coordinate
- * - ['ArtBox']['lly'] : lower-left y coordinate
- * - ['ArtBox']['urx'] : upper-right x coordinate
- * - ['ArtBox']['ury'] : upper-right y coordinate
- * - ['BoxColorInfo'] :specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for each of the possible page boundaries other than the MediaBox:
- * - ['BoxColorInfo'][BOXTYPE]['C'] : an array of three numbers in the range 0-255, representing the components in the DeviceRGB colour space.
- * - ['BoxColorInfo'][BOXTYPE]['W'] : the guideline width in default user units
- * - ['BoxColorInfo'][BOXTYPE]['S'] : the guideline style: S = Solid; D = Dashed
- * - ['BoxColorInfo'][BOXTYPE]['D'] : dash array defining a pattern of dashes and gaps to be used in drawing dashed guidelines
- * - ['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation
- * - ['trans']['Dur'] : The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.
- * - ['trans']['S'] : transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade
- * - ['trans']['D'] : The duration of the transition effect, in seconds.
- * - ['trans']['Dm'] : (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.
- * - ['trans']['M'] : (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.
- * - ['trans']['Di'] : (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.
- * - ['trans']['SS'] : (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.
- * - ['trans']['B'] : (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.
- *
+ * ['format'] = page format name (one of the above);
+ * ['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
+ * ['PZ'] : The page's preferred zoom (magnification) factor.
+ * ['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed:
+ * ['MediaBox']['llx'] : lower-left x coordinate
+ * ['MediaBox']['lly'] : lower-left y coordinate
+ * ['MediaBox']['urx'] : upper-right x coordinate
+ * ['MediaBox']['ury'] : upper-right y coordinate
+ * ['CropBox'] : the visible region of default user space:
+ * ['CropBox']['llx'] : lower-left x coordinate
+ * ['CropBox']['lly'] : lower-left y coordinate
+ * ['CropBox']['urx'] : upper-right x coordinate
+ * ['CropBox']['ury'] : upper-right y coordinate
+ * ['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment:
+ * ['BleedBox']['llx'] : lower-left x coordinate
+ * ['BleedBox']['lly'] : lower-left y coordinate
+ * ['BleedBox']['urx'] : upper-right x coordinate
+ * ['BleedBox']['ury'] : upper-right y coordinate
+ * ['TrimBox'] : the intended dimensions of the finished page after trimming:
+ * ['TrimBox']['llx'] : lower-left x coordinate
+ * ['TrimBox']['lly'] : lower-left y coordinate
+ * ['TrimBox']['urx'] : upper-right x coordinate
+ * ['TrimBox']['ury'] : upper-right y coordinate
+ * ['ArtBox'] : the extent of the page's meaningful content:
+ * ['ArtBox']['llx'] : lower-left x coordinate
+ * ['ArtBox']['lly'] : lower-left y coordinate
+ * ['ArtBox']['urx'] : upper-right x coordinate
+ * ['ArtBox']['ury'] : upper-right y coordinate
+ * ['BoxColorInfo'] :specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for each of the possible page boundaries other than the MediaBox:
+ * ['BoxColorInfo'][BOXTYPE]['C'] : an array of three numbers in the range 0-255, representing the components in the DeviceRGB colour space.
+ * ['BoxColorInfo'][BOXTYPE]['W'] : the guideline width in default user units
+ * ['BoxColorInfo'][BOXTYPE]['S'] : the guideline style: S = Solid; D = Dashed
+ * ['BoxColorInfo'][BOXTYPE]['D'] : dash array defining a pattern of dashes and gaps to be used in drawing dashed guidelines
+ * ['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation
+ * ['trans']['Dur'] : The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.
+ * ['trans']['S'] : transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade
+ * ['trans']['D'] : The duration of the transition effect, in seconds.
+ * ['trans']['Dm'] : (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.
+ * ['trans']['M'] : (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.
+ * ['trans']['Di'] : (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.
+ * ['trans']['SS'] : (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.
+ * ['trans']['B'] : (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.
+ *
* @param $orientation (string) page orientation. Possible values are (case insensitive):
- * - P or Portrait (default)
- * - L or Landscape
- * - '' (empty string) for automatic orientation
- *
+ * P or Portrait (default)
+ * L or Landscape
+ * '' (empty string) for automatic orientation
+ *
* @protected
* @since 3.0.015 (2008-06-06)
* @see getPageSizeFromFormat()
*/
- protected function setPageFormat($format, $orientation='P') {
+ protected function setPageFormat($format, $orientation = 'P')
+ {
if (!empty($format) AND isset($this->pagedim[$this->page])) {
// remove inherited values
unset($this->pagedim[$this->page]);
@@ -2234,7 +2238,8 @@ class TCPDF {
* @public
* @since 3.0.015 (2008-06-06)
*/
- public function setPageOrientation($orientation, $autopagebreak='', $bottommargin='') {
+ public function setPageOrientation($orientation, $autopagebreak = '', $bottommargin = '')
+ {
if (!isset($this->pagedim[$this->page]['MediaBox'])) {
// the boundaries of the physical medium on which the page shall be displayed or printed
$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'MediaBox', 0, 0, $this->fwPt, $this->fhPt, true, $this->k, $this->pagedim);
@@ -2285,7 +2290,7 @@ class TCPDF {
$this->wPt = $this->fwPt;
$this->hPt = $this->fhPt;
}
- if ((abs($this->pagedim[$this->page]['MediaBox']['urx'] - $this->hPt) < $this->feps) AND (abs($this->pagedim[$this->page]['MediaBox']['ury'] - $this->wPt) < $this->feps)){
+ if ((abs($this->pagedim[$this->page]['MediaBox']['urx'] - $this->hPt) < $this->feps) AND (abs($this->pagedim[$this->page]['MediaBox']['ury'] - $this->wPt) < $this->feps)) {
// swap X and Y coordinates (change page orientation)
$this->pagedim = TCPDF_STATIC::swapPageBoxCoordinates($this->page, $this->pagedim);
}
@@ -2340,7 +2345,8 @@ class TCPDF {
* @public
* @since 4.6.016 (2009-06-15)
*/
- public function setSpacesRE($re='/[^\S\xa0]/') {
+ public function setSpacesRE($re = '/[^\S\xa0]/')
+ {
$this->re_spaces = $re;
$re_parts = explode('/', $re);
// get pattern parts
@@ -2365,7 +2371,8 @@ class TCPDF {
* @public
* @since 2.0.000 (2008-01-03)
*/
- public function setRTL($enable, $resetx=true) {
+ public function setRTL($enable, $resetx = true)
+ {
$enable = $enable ? true : false;
$resetx = ($resetx AND ($enable != $this->rtl));
$this->rtl = $enable;
@@ -2381,7 +2388,8 @@ class TCPDF {
* @public
* @since 4.0.012 (2008-07-24)
*/
- public function getRTL() {
+ public function getRTL()
+ {
return $this->rtl;
}
@@ -2391,7 +2399,8 @@ class TCPDF {
* @public
* @since 2.1.000 (2008-01-09)
*/
- public function setTempRTL($mode) {
+ public function setTempRTL($mode)
+ {
$newmode = false;
switch (strtoupper($mode)) {
case 'LTR':
@@ -2423,7 +2432,8 @@ class TCPDF {
* @public
* @since 4.8.014 (2009-11-04)
*/
- public function isRTLTextDir() {
+ public function isRTLTextDir()
+ {
return ($this->rtl OR ($this->tmprtl == 'R'));
}
@@ -2434,7 +2444,8 @@ class TCPDF {
* @public
* @since 1.53.0.TC034
*/
- public function setLastH($h) {
+ public function setLastH($h)
+ {
$this->lasth = $h;
}
@@ -2444,7 +2455,8 @@ class TCPDF {
* @param $padding (boolean) If true add cell padding
* @public
*/
- public function getCellHeight($fontsize, $padding=TRUE) {
+ public function getCellHeight($fontsize, $padding = true)
+ {
$height = ($fontsize * $this->cell_height_ratio);
if ($padding) {
$height += ($this->cell_padding['T'] + $this->cell_padding['B']);
@@ -2457,7 +2469,8 @@ class TCPDF {
* @public
* @since 5.9.000 (2010-10-03)
*/
- public function resetLastH() {
+ public function resetLastH()
+ {
$this->lasth = $this->getCellHeight($this->FontSize);
}
@@ -2467,7 +2480,8 @@ class TCPDF {
* @public
* @since 4.0.017 (2008-08-05)
*/
- public function getLastH() {
+ public function getLastH()
+ {
return $this->lasth;
}
@@ -2478,7 +2492,8 @@ class TCPDF {
* @public
* @since 1.5.2
*/
- public function setImageScale($scale) {
+ public function setImageScale($scale)
+ {
$this->imgscale = $scale;
}
@@ -2489,7 +2504,8 @@ class TCPDF {
* @public
* @since 1.5.2
*/
- public function getImageScale() {
+ public function getImageScale()
+ {
return $this->imgscale;
}
@@ -2502,7 +2518,8 @@ class TCPDF {
* @public
* @since 4.5.027 (2009-03-16)
*/
- public function getPageDimensions($pagenum='') {
+ public function getPageDimensions($pagenum = '')
+ {
if (empty($pagenum)) {
$pagenum = $this->page;
}
@@ -2518,7 +2535,8 @@ class TCPDF {
* @since 1.5.2
* @see getPageDimensions()
*/
- public function getPageWidth($pagenum='') {
+ public function getPageWidth($pagenum = '')
+ {
if (empty($pagenum)) {
return $this->w;
}
@@ -2534,7 +2552,8 @@ class TCPDF {
* @since 1.5.2
* @see getPageDimensions()
*/
- public function getPageHeight($pagenum='') {
+ public function getPageHeight($pagenum = '')
+ {
if (empty($pagenum)) {
return $this->h;
}
@@ -2550,7 +2569,8 @@ class TCPDF {
* @since 1.5.2
* @see getPageDimensions()
*/
- public function getBreakMargin($pagenum='') {
+ public function getBreakMargin($pagenum = '')
+ {
if (empty($pagenum)) {
return $this->bMargin;
}
@@ -2564,7 +2584,8 @@ class TCPDF {
* @public
* @since 1.5.2
*/
- public function getScaleFactor() {
+ public function getScaleFactor()
+ {
return $this->k;
}
@@ -2578,7 +2599,8 @@ class TCPDF {
* @since 1.0
* @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
*/
- public function SetMargins($left, $top, $right=-1, $keepmargins=false) {
+ public function SetMargins($left, $top, $right = -1, $keepmargins = false)
+ {
//Set left, top and right margins
$this->lMargin = $left;
$this->tMargin = $top;
@@ -2600,7 +2622,8 @@ class TCPDF {
* @since 1.4
* @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
*/
- public function SetLeftMargin($margin) {
+ public function SetLeftMargin($margin)
+ {
//Set left margin
$this->lMargin = $margin;
if (($this->page > 0) AND ($this->x < $margin)) {
@@ -2615,7 +2638,8 @@ class TCPDF {
* @since 1.5
* @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
*/
- public function SetTopMargin($margin) {
+ public function SetTopMargin($margin)
+ {
//Set top margin
$this->tMargin = $margin;
if (($this->page > 0) AND ($this->y < $margin)) {
@@ -2630,7 +2654,8 @@ class TCPDF {
* @since 1.5
* @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
*/
- public function SetRightMargin($margin) {
+ public function SetRightMargin($margin)
+ {
$this->rMargin = $margin;
if (($this->page > 0) AND ($this->x > ($this->w - $margin))) {
$this->x = $this->w - $margin;
@@ -2644,7 +2669,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-09)
* @see getCellPaddings(), setCellPaddings()
*/
- public function SetCellPadding($pad) {
+ public function SetCellPadding($pad)
+ {
if ($pad >= 0) {
$this->cell_padding['L'] = $pad;
$this->cell_padding['T'] = $pad;
@@ -2663,7 +2689,8 @@ class TCPDF {
* @since 5.9.000 (2010-10-03)
* @see getCellPaddings(), SetCellPadding()
*/
- public function setCellPaddings($left='', $top='', $right='', $bottom='') {
+ public function setCellPaddings($left = '', $top = '', $right = '', $bottom = '')
+ {
if (($left !== '') AND ($left >= 0)) {
$this->cell_padding['L'] = $left;
}
@@ -2685,7 +2712,8 @@ class TCPDF {
* @since 5.9.000 (2010-10-03)
* @see setCellPaddings(), SetCellPadding()
*/
- public function getCellPaddings() {
+ public function getCellPaddings()
+ {
return $this->cell_padding;
}
@@ -2699,7 +2727,8 @@ class TCPDF {
* @since 5.9.000 (2010-10-03)
* @see getCellMargins()
*/
- public function setCellMargins($left='', $top='', $right='', $bottom='') {
+ public function setCellMargins($left = '', $top = '', $right = '', $bottom = '')
+ {
if (($left !== '') AND ($left >= 0)) {
$this->cell_margin['L'] = $left;
}
@@ -2721,7 +2750,8 @@ class TCPDF {
* @since 5.9.000 (2010-10-03)
* @see setCellMargins()
*/
- public function getCellMargins() {
+ public function getCellMargins()
+ {
return $this->cell_margin;
}
@@ -2732,7 +2762,8 @@ class TCPDF {
* @public
* @since 5.9.000 (2010-10-03)
*/
- protected function adjustCellPadding($brd=0) {
+ protected function adjustCellPadding($brd = 0)
+ {
if (empty($brd)) {
return;
}
@@ -2783,16 +2814,16 @@ class TCPDF {
}
}
// correct internal cell padding if required to avoid overlap between text and lines
- if ((strpos($border,'T') !== false) AND ($this->cell_padding['T'] < $adj)) {
+ if ((strpos($border, 'T') !== false) AND ($this->cell_padding['T'] < $adj)) {
$this->cell_padding['T'] = $adj;
}
- if ((strpos($border,'R') !== false) AND ($this->cell_padding['R'] < $adj)) {
+ if ((strpos($border, 'R') !== false) AND ($this->cell_padding['R'] < $adj)) {
$this->cell_padding['R'] = $adj;
}
- if ((strpos($border,'B') !== false) AND ($this->cell_padding['B'] < $adj)) {
+ if ((strpos($border, 'B') !== false) AND ($this->cell_padding['B'] < $adj)) {
$this->cell_padding['B'] = $adj;
}
- if ((strpos($border,'L') !== false) AND ($this->cell_padding['L'] < $adj)) {
+ if ((strpos($border, 'L') !== false) AND ($this->cell_padding['L'] < $adj)) {
$this->cell_padding['L'] = $adj;
}
}
@@ -2807,7 +2838,8 @@ class TCPDF {
* @since 1.0
* @see Cell(), MultiCell(), AcceptPageBreak()
*/
- public function SetAutoPageBreak($auto, $margin=0) {
+ public function SetAutoPageBreak($auto, $margin = 0)
+ {
$this->AutoPageBreak = $auto ? true : false;
$this->bMargin = $margin;
$this->PageBreakTrigger = $this->h - $margin;
@@ -2819,7 +2851,8 @@ class TCPDF {
* @public
* @since 5.9.088
*/
- public function getAutoPageBreak() {
+ public function getAutoPageBreak()
+ {
return $this->AutoPageBreak;
}
@@ -2831,7 +2864,8 @@ class TCPDF {
* @public
* @since 1.2
*/
- public function SetDisplayMode($zoom, $layout='SinglePage', $mode='UseNone') {
+ public function SetDisplayMode($zoom, $layout = 'SinglePage', $mode = 'UseNone')
+ {
if (($zoom == 'fullpage') OR ($zoom == 'fullwidth') OR ($zoom == 'real') OR ($zoom == 'default') OR (!is_string($zoom))) {
$this->ZoomMode = $zoom;
} else {
@@ -2848,7 +2882,8 @@ class TCPDF {
* @public
* @since 1.4
*/
- public function SetCompression($compress=true) {
+ public function SetCompression($compress = true)
+ {
$this->compress = false;
if (function_exists('gzcompress')) {
if ($compress) {
@@ -2865,7 +2900,8 @@ class TCPDF {
* @public
* @since 5.9.121 (2011-09-28)
*/
- public function setSRGBmode($mode=false) {
+ public function setSRGBmode($mode = false)
+ {
$this->force_srgb = $mode ? true : false;
}
@@ -2876,7 +2912,8 @@ class TCPDF {
* @since 5.9.027 (2010-12-01)
* @public
*/
- public function SetDocInfoUnicode($unicode=true) {
+ public function SetDocInfoUnicode($unicode = true)
+ {
$this->docinfounicode = $unicode ? true : false;
}
@@ -2887,7 +2924,8 @@ class TCPDF {
* @since 1.2
* @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
*/
- public function SetTitle($title) {
+ public function SetTitle($title)
+ {
$this->title = $title;
}
@@ -2898,7 +2936,8 @@ class TCPDF {
* @since 1.2
* @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
*/
- public function SetSubject($subject) {
+ public function SetSubject($subject)
+ {
$this->subject = $subject;
}
@@ -2909,7 +2948,8 @@ class TCPDF {
* @since 1.2
* @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
*/
- public function SetAuthor($author) {
+ public function SetAuthor($author)
+ {
$this->author = $author;
}
@@ -2920,7 +2960,8 @@ class TCPDF {
* @since 1.2
* @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
*/
- public function SetKeywords($keywords) {
+ public function SetKeywords($keywords)
+ {
$this->keywords = $keywords;
}
@@ -2931,7 +2972,8 @@ class TCPDF {
* @since 1.2
* @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
*/
- public function SetCreator($creator) {
+ public function SetCreator($creator)
+ {
$this->creator = $creator;
}
@@ -2941,7 +2983,8 @@ class TCPDF {
* @public
* @since 1.0
*/
- public function Error($msg) {
+ public function Error($msg)
+ {
// unset all class variables
$this->_destroy(true);
if (defined('K_TCPDF_THROW_EXCEPTION_ERROR') AND !K_TCPDF_THROW_EXCEPTION_ERROR) {
@@ -2959,7 +3002,8 @@ class TCPDF {
* @since 1.0
* @see AddPage(), Close()
*/
- public function Open() {
+ public function Open()
+ {
$this->state = 1;
}
@@ -2971,7 +3015,8 @@ class TCPDF {
* @since 1.0
* @see Open(), Output()
*/
- public function Close() {
+ public function Close()
+ {
if ($this->state == 3) {
return;
}
@@ -3015,7 +3060,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see getPage(), lastpage(), getNumPages()
*/
- public function setPage($pnum, $resetmargins=false) {
+ public function setPage($pnum, $resetmargins = false)
+ {
if (($pnum == $this->page) AND ($this->state == 2)) {
return;
}
@@ -3062,7 +3108,8 @@ class TCPDF {
* @since 2.0.000 (2008-01-04)
* @see setPage(), getPage(), getNumPages()
*/
- public function lastPage($resetmargins=false) {
+ public function lastPage($resetmargins = false)
+ {
$this->setPage($this->getNumPages(), $resetmargins);
}
@@ -3073,7 +3120,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see setPage(), lastpage(), getNumPages()
*/
- public function getPage() {
+ public function getPage()
+ {
return $this->page;
}
@@ -3084,7 +3132,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see setPage(), getPage(), lastpage()
*/
- public function getNumPages() {
+ public function getNumPages()
+ {
return $this->numpages;
}
@@ -3097,7 +3146,8 @@ class TCPDF {
* @since 5.0.001 (2010-05-06)
* @see AddPage(), startPage(), endPage(), endTOCPage()
*/
- public function addTOCPage($orientation='', $format='', $keepmargins=false) {
+ public function addTOCPage($orientation = '', $format = '', $keepmargins = false)
+ {
$this->AddPage($orientation, $format, $keepmargins, true);
}
@@ -3107,7 +3157,8 @@ class TCPDF {
* @since 5.0.001 (2010-05-06)
* @see AddPage(), startPage(), endPage(), addTOCPage()
*/
- public function endTOCPage() {
+ public function endTOCPage()
+ {
$this->endPage(true);
}
@@ -3122,7 +3173,8 @@ class TCPDF {
* @since 1.0
* @see startPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
*/
- public function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) {
+ public function AddPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false)
+ {
if ($this->inxobj) {
// we are inside an XObject template
return;
@@ -3146,7 +3198,8 @@ class TCPDF {
* @since 4.2.010 (2008-11-14)
* @see AddPage(), startPage(), addTOCPage(), endTOCPage()
*/
- public function endPage($tocpage=false) {
+ public function endPage($tocpage = false)
+ {
// check if page is already closed
if (($this->page == 0) OR ($this->numpages > $this->page) OR (!$this->pageopen[$this->page])) {
return;
@@ -3172,7 +3225,8 @@ class TCPDF {
* @see AddPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
* @public
*/
- public function startPage($orientation='', $format='', $tocpage=false) {
+ public function startPage($orientation = '', $format = '', $tocpage = false)
+ {
if ($tocpage) {
$this->tocpage = true;
}
@@ -3243,7 +3297,8 @@ class TCPDF {
* @public
* @since 4.0.016 (2008-07-30)
*/
- public function setPageMark() {
+ public function setPageMark()
+ {
$this->intmrk[$this->page] = $this->pagelen[$this->page];
$this->bordermrk[$this->page] = $this->intmrk[$this->page];
$this->setContentMark();
@@ -3256,7 +3311,8 @@ class TCPDF {
* @protected
* @since 4.6.021 (2009-07-20)
*/
- protected function setContentMark($page=0) {
+ protected function setContentMark($page = 0)
+ {
if ($page <= 0) {
$page = $this->page;
}
@@ -3277,7 +3333,8 @@ class TCPDF {
* @param $lc (array) RGB array color for line.
* @public
*/
- public function setHeaderData($ln='', $lw=0, $ht='', $hs='', $tc=array(0,0,0), $lc=array(0,0,0)) {
+ public function setHeaderData($ln = '', $lw = 0, $ht = '', $hs = '', $tc = array(0,0,0), $lc = array(0,0,0))
+ {
$this->header_logo = $ln;
$this->header_logo_width = $lw;
$this->header_title = $ht;
@@ -3292,7 +3349,8 @@ class TCPDF {
* @param $lc (array) RGB array color for line.
* @public
*/
- public function setFooterData($tc=array(0,0,0), $lc=array(0,0,0)) {
+ public function setFooterData($tc = array(0,0,0), $lc = array(0,0,0))
+ {
$this->footer_text_color = $tc;
$this->footer_line_color = $lc;
}
@@ -3304,7 +3362,8 @@ class TCPDF {
* @public
* @since 4.0.012 (2008-07-24)
*/
- public function getHeaderData() {
+ public function getHeaderData()
+ {
$ret = array();
$ret['logo'] = $this->header_logo;
$ret['logo_width'] = $this->header_logo_width;
@@ -3321,7 +3380,8 @@ class TCPDF {
* @param $hm (int) distance in user units
* @public
*/
- public function setHeaderMargin($hm=10) {
+ public function setHeaderMargin($hm = 10)
+ {
$this->header_margin = $hm;
}
@@ -3331,7 +3391,8 @@ class TCPDF {
* @since 4.0.012 (2008-07-24)
* @public
*/
- public function getHeaderMargin() {
+ public function getHeaderMargin()
+ {
return $this->header_margin;
}
@@ -3341,7 +3402,8 @@ class TCPDF {
* @param $fm (int) distance in user units
* @public
*/
- public function setFooterMargin($fm=10) {
+ public function setFooterMargin($fm = 10)
+ {
$this->footer_margin = $fm;
}
@@ -3351,7 +3413,8 @@ class TCPDF {
* @since 4.0.012 (2008-07-24)
* @public
*/
- public function getFooterMargin() {
+ public function getFooterMargin()
+ {
return $this->footer_margin;
}
/**
@@ -3359,7 +3422,8 @@ class TCPDF {
* @param $val (boolean) set to true to print the page header (default), false otherwise.
* @public
*/
- public function setPrintHeader($val=true) {
+ public function setPrintHeader($val = true)
+ {
$this->print_header = $val ? true : false;
}
@@ -3368,7 +3432,8 @@ class TCPDF {
* @param $val (boolean) set to true to print the page footer (default), false otherwise.
* @public
*/
- public function setPrintFooter($val=true) {
+ public function setPrintFooter($val = true)
+ {
$this->print_footer = $val ? true : false;
}
@@ -3377,7 +3442,8 @@ class TCPDF {
* @return float
* @public
*/
- public function getImageRBX() {
+ public function getImageRBX()
+ {
return $this->img_rb_x;
}
@@ -3386,7 +3452,8 @@ class TCPDF {
* @return float
* @public
*/
- public function getImageRBY() {
+ public function getImageRBY()
+ {
return $this->img_rb_y;
}
@@ -3394,7 +3461,8 @@ class TCPDF {
* Reset the xobject template used by Header() method.
* @public
*/
- public function resetHeaderTemplate() {
+ public function resetHeaderTemplate()
+ {
$this->header_xobjid = false;
}
@@ -3403,7 +3471,8 @@ class TCPDF {
* @param $val (boolean) set to true to reset Header xobject template at each page, false otherwise.
* @public
*/
- public function setHeaderTemplateAutoreset($val=true) {
+ public function setHeaderTemplateAutoreset($val = true)
+ {
$this->header_xobj_autoreset = $val ? true : false;
}
@@ -3412,7 +3481,8 @@ class TCPDF {
* It is automatically called by AddPage() and could be overwritten in your own inherited class.
* @public
*/
- public function Header() {
+ public function Header()
+ {
if ($this->header_xobjid === false) {
// start a new XObject Template
$this->header_xobjid = $this->startTemplate($this->w, $this->tMargin);
@@ -3489,7 +3559,8 @@ class TCPDF {
* It is automatically called by AddPage() and could be overwritten in your own inherited class.
* @public
*/
- public function Footer() {
+ public function Footer()
+ {
$cur_y = $this->y;
$this->SetTextColorArray($this->footer_text_color);
//set style for cell border
@@ -3536,7 +3607,8 @@ class TCPDF {
* @protected
* @since 4.0.012 (2008-07-24)
*/
- protected function setHeader() {
+ protected function setHeader()
+ {
if (!$this->print_header OR ($this->state != 2)) {
return;
}
@@ -3577,7 +3649,8 @@ class TCPDF {
* @protected
* @since 4.0.012 (2008-07-24)
*/
- protected function setFooter() {
+ protected function setFooter()
+ {
if ($this->state != 2) {
return;
}
@@ -3633,7 +3706,8 @@ class TCPDF {
* @protected
* @since 5.9.091 (2011-06-15)
*/
- protected function inPageBody() {
+ protected function inPageBody()
+ {
return (($this->InHeader === false) AND ($this->InFooter === false));
}
@@ -3642,7 +3716,8 @@ class TCPDF {
* @protected
* @since 4.5.030 (2009-03-25)
*/
- protected function setTableHeader() {
+ protected function setTableHeader()
+ {
if ($this->num_columns > 1) {
// multi column mode
return;
@@ -3709,7 +3784,8 @@ class TCPDF {
* @since 1.0
* @see getAliasNbPages()
*/
- public function PageNo() {
+ public function PageNo()
+ {
return $this->page;
}
@@ -3719,7 +3795,8 @@ class TCPDF {
* @public
* @since 6.0.038 (2013-09-30)
*/
- public function getAllSpotColors() {
+ public function getAllSpotColors()
+ {
return $this->spot_colors;
}
@@ -3736,7 +3813,8 @@ class TCPDF {
* @since 4.0.024 (2008-09-12)
* @see SetDrawSpotColor(), SetFillSpotColor(), SetTextSpotColor()
*/
- public function AddSpotColor($name, $c, $m, $y, $k) {
+ public function AddSpotColor($name, $c, $m, $y, $k)
+ {
if (!isset($this->spot_colors[$name])) {
$i = (1 + count($this->spot_colors));
$this->spot_colors[$name] = array('C' => $c, 'M' => $m, 'Y' => $y, 'K' => $k, 'name' => $name, 'i' => $i);
@@ -3752,7 +3830,8 @@ class TCPDF {
* @public
* @since 5.9.125 (2011-10-03)
*/
- public function setSpotColor($type, $name, $tint=100) {
+ public function setSpotColor($type, $name, $tint = 100)
+ {
$spotcolor = TCPDF_COLORS::getSpotColor($name, $this->spot_colors);
if ($spotcolor === false) {
$this->Error('Undefined spot color: '.$name.', you must add it using the AddSpotColor() method.');
@@ -3798,7 +3877,8 @@ class TCPDF {
* @since 4.0.024 (2008-09-12)
* @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
*/
- public function SetDrawSpotColor($name, $tint=100) {
+ public function SetDrawSpotColor($name, $tint = 100)
+ {
$this->setSpotColor('draw', $name, $tint);
}
@@ -3810,7 +3890,8 @@ class TCPDF {
* @since 4.0.024 (2008-09-12)
* @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
*/
- public function SetFillSpotColor($name, $tint=100) {
+ public function SetFillSpotColor($name, $tint = 100)
+ {
$this->setSpotColor('fill', $name, $tint);
}
@@ -3822,7 +3903,8 @@ class TCPDF {
* @since 4.0.024 (2008-09-12)
* @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
*/
- public function SetTextSpotColor($name, $tint=100) {
+ public function SetTextSpotColor($name, $tint = 100)
+ {
$this->setSpotColor('text', $name, $tint);
}
@@ -3837,7 +3919,8 @@ class TCPDF {
* @public
* @since 3.1.000 (2008-06-11)
*/
- public function setColorArray($type, $color, $ret=false) {
+ public function setColorArray($type, $color, $ret = false)
+ {
if (is_array($color)) {
$color = array_values($color);
// component: grey, RGB red or CMYK cyan
@@ -3868,7 +3951,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-11)
* @see SetDrawColor()
*/
- public function SetDrawColorArray($color, $ret=false) {
+ public function SetDrawColorArray($color, $ret = false)
+ {
return $this->setColorArray('draw', $color, $ret);
}
@@ -3882,7 +3966,8 @@ class TCPDF {
* @since 3.1.000 (2008-6-11)
* @see SetFillColor()
*/
- public function SetFillColorArray($color, $ret=false) {
+ public function SetFillColorArray($color, $ret = false)
+ {
return $this->setColorArray('fill', $color, $ret);
}
@@ -3895,7 +3980,8 @@ class TCPDF {
* @since 3.1.000 (2008-6-11)
* @see SetFillColor()
*/
- public function SetTextColorArray($color, $ret=false) {
+ public function SetTextColorArray($color, $ret = false)
+ {
return $this->setColorArray('text', $color, $ret);
}
@@ -3912,7 +3998,8 @@ class TCPDF {
* @public
* @since 5.9.125 (2011-10-03)
*/
- public function setColor($type, $col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+ public function setColor($type, $col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+ {
// set default values
if (!is_numeric($col1)) {
$col1 = 0;
@@ -4002,7 +4089,8 @@ class TCPDF {
* @since 1.3
* @see SetDrawColorArray(), SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
*/
- public function SetDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+ public function SetDrawColor($col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+ {
return $this->setColor('draw', $col1, $col2, $col3, $col4, $ret, $name);
}
@@ -4019,7 +4107,8 @@ class TCPDF {
* @since 1.3
* @see SetFillColorArray(), SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
*/
- public function SetFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+ public function SetFillColor($col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+ {
return $this->setColor('fill', $col1, $col2, $col3, $col4, $ret, $name);
}
@@ -4036,7 +4125,8 @@ class TCPDF {
* @since 1.3
* @see SetTextColorArray(), SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
*/
- public function SetTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+ public function SetTextColor($col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+ {
return $this->setColor('text', $col1, $col2, $col3, $col4, $ret, $name);
}
@@ -4052,7 +4142,8 @@ class TCPDF {
* @public
* @since 1.2
*/
- public function GetStringWidth($s, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
+ public function GetStringWidth($s, $fontname = '', $fontstyle = '', $fontsize = 0, $getarray = false)
+ {
return $this->GetArrStringWidth(TCPDF_FONTS::utf8Bidi(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont), $s, $this->tmprtl, $this->isunicode, $this->CurrentFont), $fontname, $fontstyle, $fontsize, $getarray);
}
@@ -4068,7 +4159,8 @@ class TCPDF {
* @public
* @since 2.4.000 (2008-03-06)
*/
- public function GetArrStringWidth($sa, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
+ public function GetArrStringWidth($sa, $fontname = '', $fontstyle = '', $fontsize = 0, $getarray = false)
+ {
// store current values
if (!TCPDF_STATIC::empty_string($fontname)) {
$prev_FontFamily = $this->FontFamily;
@@ -4107,7 +4199,8 @@ class TCPDF {
* @public
* @since 2.4.000 (2008-03-06)
*/
- public function GetCharWidth($char, $notlast=true) {
+ public function GetCharWidth($char, $notlast = true)
+ {
// get raw width
$chw = $this->getRawCharWidth($char);
if (($this->font_spacing < 0) OR (($this->font_spacing > 0) AND $notlast)) {
@@ -4129,7 +4222,8 @@ class TCPDF {
* @public
* @since 5.9.000 (2010-09-28)
*/
- public function getRawCharWidth($char) {
+ public function getRawCharWidth($char)
+ {
if ($char == 173) {
// SHY character will not be printed
return (0);
@@ -4155,7 +4249,8 @@ class TCPDF {
* @public
* @since 2.0.0001 (2008-01-07)
*/
- public function GetNumChars($s) {
+ public function GetNumChars($s)
+ {
if ($this->isUnicodeFont()) {
return count(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont));
}
@@ -4167,7 +4262,8 @@ class TCPDF {
* @protected
* @since 4.0.013 (2008-07-28)
*/
- protected function getFontsList() {
+ protected function getFontsList()
+ {
if (($fontsdir = opendir(TCPDF_FONTS::_getfontpath())) !== false) {
while (($file = readdir($fontsdir)) !== false) {
if (substr($file, -4) == '.php') {
@@ -4191,7 +4287,8 @@ class TCPDF {
* @since 1.5
* @see SetFont(), setFontSubsetting()
*/
- public function AddFont($family, $style='', $fontfile='', $subset='default') {
+ public function AddFont($family, $style = '', $fontfile = '', $subset = 'default')
+ {
if ($subset === 'default') {
$subset = $this->font_subsetting;
}
@@ -4293,7 +4390,7 @@ class TCPDF {
}
// include font file
if (!TCPDF_STATIC::empty_string($fontfile) AND (@TCPDF_STATIC::file_exists($fontfile))) {
- include($fontfile);
+ include $fontfile;
} else {
$this->Error('Could not include font definition file: '.$family.'');
}
@@ -4414,7 +4511,7 @@ class TCPDF {
}
if (!TCPDF_STATIC::empty_string($file)) {
if (!isset($this->FontFiles[$file])) {
- if ((strcasecmp($type,'TrueType') == 0) OR (strcasecmp($type, 'TrueTypeUnicode') == 0)) {
+ if ((strcasecmp($type, 'TrueType') == 0) OR (strcasecmp($type, 'TrueTypeUnicode') == 0)) {
$this->FontFiles[$file] = array('length1' => $originalsize, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
} elseif ($type != 'core') {
$this->FontFiles[$file] = array('length1' => $size1, 'length2' => $size2, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
@@ -4447,7 +4544,8 @@ class TCPDF {
* @since 1.0
* @see AddFont(), SetFontSize()
*/
- public function SetFont($family, $style='', $size=null, $fontfile='', $subset='default', $out=true) {
+ public function SetFont($family, $style = '', $size = null, $fontfile = '', $subset = 'default', $out = true)
+ {
//Select a font; size given in points
if ($size === null) {
$size = $this->FontSizePt;
@@ -4475,8 +4573,9 @@ class TCPDF {
* @since 1.0
* @see SetFont()
*/
- public function SetFontSize($size, $out=true) {
- $size = (float)$size;
+ public function SetFontSize($size, $out = true)
+ {
+ $size = (float) $size;
// font size in points
$this->FontSizePt = $size;
// font size in user units
@@ -4516,7 +4615,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function getFontBBox() {
+ public function getFontBBox()
+ {
$fbbox = array();
if (isset($this->CurrentFont['desc']['FontBBox'])) {
$tmpbbox = explode(' ', substr($this->CurrentFont['desc']['FontBBox'], 1, -1));
@@ -4555,7 +4655,8 @@ class TCPDF {
* @return float Absolute measure.
* @since 5.9.186 (2012-09-13)
*/
- public function getAbsFontMeasure($s) {
+ public function getAbsFontMeasure($s)
+ {
return ($s * $this->FontSize / 1000);
}
@@ -4565,7 +4666,8 @@ class TCPDF {
* @return mixed array(xMin, yMin, xMax, yMax) or FALSE if not defined.
* @since 5.9.186 (2012-09-13)
*/
- public function getCharBBox($char) {
+ public function getCharBBox($char)
+ {
$c = intval($char);
if (isset($this->CurrentFont['cw'][$c])) {
// glyph is defined ... use zero width & height for glyphs without outlines
@@ -4588,7 +4690,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.9.003 (2010-03-30)
*/
- public function getFontDescent($font, $style='', $size=0) {
+ public function getFontDescent($font, $style = '', $size = 0)
+ {
$fontdata = $this->AddFont($font, $style);
$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
if (isset($fontinfo['desc']['Descent']) AND ($fontinfo['desc']['Descent'] <= 0)) {
@@ -4609,7 +4712,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.9.003 (2010-03-30)
*/
- public function getFontAscent($font, $style='', $size=0) {
+ public function getFontAscent($font, $style = '', $size = 0)
+ {
$fontdata = $this->AddFont($font, $style);
$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
if (isset($fontinfo['desc']['Ascent']) AND ($fontinfo['desc']['Ascent'] > 0)) {
@@ -4629,7 +4733,8 @@ class TCPDF {
* @public
* @since 5.9.153 (2012-03-28)
*/
- public function isCharDefined($char, $font='', $style='') {
+ public function isCharDefined($char, $font = '', $style = '')
+ {
if (is_string($char)) {
// get character code
$char = TCPDF_FONTS::UTF8StringToArray($char, $this->isunicode, $this->CurrentFont);
@@ -4656,7 +4761,8 @@ class TCPDF {
* @public
* @since 5.9.153 (2012-03-28)
*/
- public function replaceMissingChars($text, $font='', $style='', $subs=array()) {
+ public function replaceMissingChars($text, $font = '', $style = '', $subs = array())
+ {
if (empty($subs)) {
return $text;
}
@@ -4672,7 +4778,7 @@ class TCPDF {
if (isset($subs[$chr])) {
// we have available substitutions
if (is_array($subs[$chr])) {
- foreach($subs[$chr] as $s) {
+ foreach ($subs[$chr] as $s) {
if (isset($fontinfo['cw'][$s])) {
$uniarr[$k] = $s;
break;
@@ -4693,7 +4799,8 @@ class TCPDF {
* @public
* @since 4.5.025
*/
- public function SetDefaultMonospacedFont($font) {
+ public function SetDefaultMonospacedFont($font)
+ {
$this->default_monospaced_font = $font;
}
@@ -4704,7 +4811,8 @@ class TCPDF {
* @since 1.5
* @see Cell(), Write(), Image(), Link(), SetLink()
*/
- public function AddLink() {
+ public function AddLink()
+ {
// create a new internal link
$n = count($this->links) + 1;
$this->links[$n] = array('p' => 0, 'y' => 0, 'f' => false);
@@ -4720,7 +4828,8 @@ class TCPDF {
* @since 1.5
* @see AddLink()
*/
- public function SetLink($link, $y=0, $page=-1) {
+ public function SetLink($link, $y = 0, $page = -1)
+ {
$fixed = false;
if (!empty($page) AND ($page[0] == '*')) {
$page = intval(substr($page, 1));
@@ -4749,7 +4858,8 @@ class TCPDF {
* @since 1.5
* @see AddLink(), Annotation(), Cell(), Write(), Image()
*/
- public function Link($x, $y, $w, $h, $link, $spaces=0) {
+ public function Link($x, $y, $w, $h, $link, $spaces = 0)
+ {
$this->Annotation($x, $y, $w, $h, $link, array('Subtype'=>'Link'), $spaces);
}
@@ -4766,7 +4876,8 @@ class TCPDF {
* @public
* @since 4.0.018 (2008-08-06)
*/
- public function Annotation($x, $y, $w, $h, $text, $opt=array('Subtype'=>'Text'), $spaces=0) {
+ public function Annotation($x, $y, $w, $h, $text, $opt = array('Subtype'=>'Text'), $spaces = 0)
+ {
if ($this->inxobj) {
// store parameters for later use on template
$this->xobjects[$this->xobjid]['annotations'][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'text' => $text, 'opt' => $opt, 'spaces' => $spaces);
@@ -4856,15 +4967,16 @@ class TCPDF {
* @protected
* @see Annotation()
*/
- protected function _putEmbeddedFiles() {
- if ($this->pdfa_mode && $this->pdfa_version != 3) {
+ protected function _putEmbeddedFiles()
+ {
+ if ($this->pdfa_mode && $this->pdfa_version != 3) {
// embedded files are not allowed in PDF/A mode version 1 and 2
return;
}
reset($this->embeddedfiles);
foreach ($this->embeddedfiles as $filename => $filedata) {
$data = TCPDF_STATIC::fileGetContents($filedata['file']);
- if ($data !== FALSE) {
+ if ($data !== false) {
$rawsize = strlen($data);
if ($rawsize > 0) {
// update name tree
@@ -4922,7 +5034,8 @@ class TCPDF {
* @since 1.0
* @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell()
*/
- public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
+ public function Text($x, $y, $txt, $fstroke = false, $fclip = false, $ffill = true, $border = 0, $ln = 0, $align = '', $fill = false, $link = '', $stretch = 0, $ignore_min_height = false, $calign = 'T', $valign = 'M', $rtloff = false)
+ {
$textrendermode = $this->textrendermode;
$textstrokewidth = $this->textstrokewidth;
$this->setTextRenderingMode($fstroke, $ffill, $fclip);
@@ -4942,7 +5055,8 @@ class TCPDF {
* @since 1.4
* @see SetAutoPageBreak()
*/
- public function AcceptPageBreak() {
+ public function AcceptPageBreak()
+ {
if ($this->num_columns > 1) {
// multi column mode
if ($this->current_column < ($this->num_columns - 1)) {
@@ -4969,7 +5083,8 @@ class TCPDF {
* @since 3.2.000 (2008-07-01)
* @protected
*/
- protected function checkPageBreak($h=0, $y='', $addpage=true) {
+ protected function checkPageBreak($h = 0, $y = '', $addpage = true)
+ {
if (TCPDF_STATIC::empty_string($y)) {
$y = $this->y;
}
@@ -5023,7 +5138,8 @@ class TCPDF {
* @since 1.0
* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
*/
- public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
+ public function Cell($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '', $stretch = 0, $ignore_min_height = false, $calign = 'T', $valign = 'M')
+ {
$prev_cell_margin = $this->cell_margin;
$prev_cell_padding = $this->cell_padding;
$this->adjustCellPadding($border);
@@ -5092,7 +5208,8 @@ class TCPDF {
* @since 1.0
* @see Cell()
*/
- protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
+ protected function getCellCode($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '', $stretch = 0, $ignore_min_height = false, $calign = 'T', $valign = 'M')
+ {
// replace 'NO-BREAK SPACE' (U+00A0) character with a simple space
$txt = str_replace(TCPDF_FONTS::unichr(160, $this->isunicode), ' ', $txt);
$prev_cell_margin = $this->cell_margin;
@@ -5560,7 +5677,8 @@ class TCPDF {
* @protected
* @since 5.9.167 (2012-06-22)
*/
- protected function replaceChar($oldchar, $newchar) {
+ protected function replaceChar($oldchar, $newchar)
+ {
if ($this->isCharDefined($newchar)) {
// add the new char on the subset list
$this->CurrentFont['subsetchars'][$newchar] = true;
@@ -5583,7 +5701,8 @@ class TCPDF {
* @see SetLineStyle()
* @since 5.7.000 (2010-08-02)
*/
- protected function getCellBorder($x, $y, $w, $h, $brd) {
+ protected function getCellBorder($x, $y, $w, $h, $brd)
+ {
$s = ''; // string to be returned
if (empty($brd)) {
return $s;
@@ -5673,25 +5792,25 @@ class TCPDF {
if (strlen($border) == 4) {
$s .= sprintf('%F %F %F %F re S ', $xT, $yT, ($w * $k), (-$h * $k));
} elseif (strlen($border) == 3) {
- if (strpos($border,'B') === false) { // LTR
+ if (strpos($border, 'B') === false) { // LTR
$s .= sprintf('%F %F m ', $xL, $yL);
$s .= sprintf('%F %F l ', $xT, $yT);
$s .= sprintf('%F %F l ', $xR, $yR);
$s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
- } elseif (strpos($border,'L') === false) { // TRB
+ } elseif (strpos($border, 'L') === false) { // TRB
$s .= sprintf('%F %F m ', $xT, $yT);
$s .= sprintf('%F %F l ', $xR, $yR);
$s .= sprintf('%F %F l ', $xB, $yB);
$s .= sprintf('%F %F l ', $xL, $yL);
$s .= 'S ';
- } elseif (strpos($border,'T') === false) { // RBL
+ } elseif (strpos($border, 'T') === false) { // RBL
$s .= sprintf('%F %F m ', $xR, $yR);
$s .= sprintf('%F %F l ', $xB, $yB);
$s .= sprintf('%F %F l ', $xL, $yL);
$s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
- } elseif (strpos($border,'R') === false) { // BLT
+ } elseif (strpos($border, 'R') === false) { // BLT
$s .= sprintf('%F %F m ', $xB, $yB);
$s .= sprintf('%F %F l ', $xL, $yL);
$s .= sprintf('%F %F l ', $xT, $yT);
@@ -5699,34 +5818,34 @@ class TCPDF {
$s .= 'S ';
}
} elseif (strlen($border) == 2) {
- if ((strpos($border,'L') !== false) AND (strpos($border,'T') !== false)) { // LT
+ if ((strpos($border, 'L') !== false) AND (strpos($border, 'T') !== false)) { // LT
$s .= sprintf('%F %F m ', $xL, $yL);
$s .= sprintf('%F %F l ', $xT, $yT);
$s .= sprintf('%F %F l ', $xR, $yR);
$s .= 'S ';
- } elseif ((strpos($border,'T') !== false) AND (strpos($border,'R') !== false)) { // TR
+ } elseif ((strpos($border, 'T') !== false) AND (strpos($border, 'R') !== false)) { // TR
$s .= sprintf('%F %F m ', $xT, $yT);
$s .= sprintf('%F %F l ', $xR, $yR);
$s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
- } elseif ((strpos($border,'R') !== false) AND (strpos($border,'B') !== false)) { // RB
+ } elseif ((strpos($border, 'R') !== false) AND (strpos($border, 'B') !== false)) { // RB
$s .= sprintf('%F %F m ', $xR, $yR);
$s .= sprintf('%F %F l ', $xB, $yB);
$s .= sprintf('%F %F l ', $xL, $yL);
$s .= 'S ';
- } elseif ((strpos($border,'B') !== false) AND (strpos($border,'L') !== false)) { // BL
+ } elseif ((strpos($border, 'B') !== false) AND (strpos($border, 'L') !== false)) { // BL
$s .= sprintf('%F %F m ', $xB, $yB);
$s .= sprintf('%F %F l ', $xL, $yL);
$s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
- } elseif ((strpos($border,'L') !== false) AND (strpos($border,'R') !== false)) { // LR
+ } elseif ((strpos($border, 'L') !== false) AND (strpos($border, 'R') !== false)) { // LR
$s .= sprintf('%F %F m ', $xL, $yL);
$s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
$s .= sprintf('%F %F m ', $xR, $yR);
$s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
- } elseif ((strpos($border,'T') !== false) AND (strpos($border,'B') !== false)) { // TB
+ } elseif ((strpos($border, 'T') !== false) AND (strpos($border, 'B') !== false)) { // TB
$s .= sprintf('%F %F m ', $xT, $yT);
$s .= sprintf('%F %F l ', $xR, $yR);
$s .= 'S ';
@@ -5735,19 +5854,19 @@ class TCPDF {
$s .= 'S ';
}
} else { // strlen($border) == 1
- if (strpos($border,'L') !== false) { // L
+ if (strpos($border, 'L') !== false) { // L
$s .= sprintf('%F %F m ', $xL, $yL);
$s .= sprintf('%F %F l ', $xT, $yT);
$s .= 'S ';
- } elseif (strpos($border,'T') !== false) { // T
+ } elseif (strpos($border, 'T') !== false) { // T
$s .= sprintf('%F %F m ', $xT, $yT);
$s .= sprintf('%F %F l ', $xR, $yR);
$s .= 'S ';
- } elseif (strpos($border,'R') !== false) { // R
+ } elseif (strpos($border, 'R') !== false) { // R
$s .= sprintf('%F %F m ', $xR, $yR);
$s .= sprintf('%F %F l ', $xB, $yB);
$s .= 'S ';
- } elseif (strpos($border,'B') !== false) { // B
+ } elseif (strpos($border, 'B') !== false) { // B
$s .= sprintf('%F %F m ', $xB, $yB);
$s .= sprintf('%F %F l ', $xL, $yL);
$s .= 'S ';
@@ -5786,7 +5905,8 @@ class TCPDF {
* @since 1.3
* @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
*/
- public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
+ public function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = false, $ln = 1, $x = '', $y = '', $reseth = true, $stretch = 0, $ishtml = false, $autopadding = true, $maxh = 0, $valign = 'T', $fitcell = false)
+ {
$prev_cell_margin = $this->cell_margin;
$prev_cell_padding = $this->cell_padding;
// adjust internal padding
@@ -6154,8 +6274,9 @@ class TCPDF {
* @public
* @since 4.5.011
*/
- public function getNumLines($txt, $w=0, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
- if ($txt === NULL) {
+ public function getNumLines($txt, $w = 0, $reseth = false, $autopadding = true, $cellpadding = '', $border = 0)
+ {
+ if ($txt === null) {
return 0;
}
if ($txt === '') {
@@ -6273,7 +6394,8 @@ class TCPDF {
* @author Nicola Asuni, Alexander Escalona Fern\E1ndez
* @public
*/
- public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
+ public function getStringHeight($w, $txt, $reseth = false, $autopadding = true, $cellpadding = '', $border = 0)
+ {
// adjust internal padding
$prev_cell_padding = $this->cell_padding;
$prev_lasth = $this->lasth;
@@ -6306,7 +6428,8 @@ class TCPDF {
* @public
* @since 1.5
*/
- public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0, $wadj=0, $margin='') {
+ public function Write($h, $txt, $link = '', $fill = false, $align = '', $ln = false, $stretch = 0, $firstline = false, $firstblock = false, $maxh = 0, $wadj = 0, $margin = '')
+ {
// check page for no-write regions and adapt page margins if necessary
list($this->x, $this->y) = $this->checkPageRegions($h, $this->x, $this->y);
if (strlen($txt) == 0) {
@@ -6737,7 +6860,8 @@ class TCPDF {
* @return int Return the remaining width
* @protected
*/
- protected function getRemainingWidth() {
+ protected function getRemainingWidth()
+ {
list($this->x, $this->y) = $this->checkPageRegions(0, $this->x, $this->y);
if ($this->rtl) {
return ($this->x - $this->lMargin);
@@ -6757,7 +6881,8 @@ class TCPDF {
* @protected
* @since 5.5.009 (2010-07-05)
*/
- protected function fitBlock($w, $h, $x, $y, $fitonpage=false) {
+ protected function fitBlock($w, $h, $x, $y, $fitonpage = false)
+ {
if ($w <= 0) {
// set maximum width
$w = ($this->w - $this->lMargin - $this->rMargin);
@@ -6852,7 +6977,8 @@ class TCPDF {
* @public
* @since 1.1
*/
- public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false, $alt=false, $altimgs=array()) {
+ public function Image($file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false, $dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false, $hidden = false, $fitonpage = false, $alt = false, $altimgs = array())
+ {
if ($this->state != 2) {
return;
}
@@ -6865,7 +6991,7 @@ class TCPDF {
// check page for no-write regions and adapt page margins if necessary
list($x, $y) = $this->checkPageRegions($h, $x, $y);
$exurl = ''; // external streams
- $imsize = FALSE;
+ $imsize = false;
// check if we are passing an image as file or string
if ($file[0] === '@') {
// image from string
@@ -6881,13 +7007,18 @@ class TCPDF {
// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
//return false;
+ // try to encode spaces on filename
+ $tfile = str_replace(' ', '%20', $file);
+ if (@TCPDF_STATIC::file_exists($tfile)) {
+ $file = $tfile;
+ }
}
- if (($imsize = @getimagesize($file)) === FALSE) {
+ if (($imsize = @getimagesize($file)) === false) {
if (in_array($file, $this->imagekeys)) {
// get existing image data
$info = $this->getImageBuffer($file);
$imsize = array($info['w'], $info['h']);
- } elseif (strpos($file, '__tcpdf_'.$this->file_id.'_img') === FALSE) {
+ } elseif (strpos($file, '__tcpdf_'.$this->file_id.'_img') === false) {
$imgdata = TCPDF_STATIC::fileGetContents($file);
}
}
@@ -6904,12 +7035,12 @@ class TCPDF {
fclose($fp);
unset($imgdata);
$imsize = @getimagesize($file);
- if ($imsize === FALSE) {
+ if ($imsize === false) {
unlink($file);
$file = $original_file;
}
}
- if ($imsize === FALSE) {
+ if ($imsize === false) {
if (($w > 0) AND ($h > 0)) {
// get measures from specified data
$pw = $this->getHTMLUnitToUnits($w, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
@@ -7010,14 +7141,14 @@ class TCPDF {
$newimage = false;
// get existing image data
$info = $this->getImageBuffer($file);
- if (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE) {
+ if (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === false) {
// check if the newer image is larger
$oldsize = ($info['w'] * $info['h']);
if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {
$newimage = true;
}
}
- } elseif (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE)) {
+ } elseif (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === false)) {
// create temp image file (without alpha channel)
$tempfile_plain = K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_imgmask_plain_'.$filehash;
// create temp alpha file
@@ -7057,7 +7188,7 @@ class TCPDF {
if ((method_exists('TCPDF_IMAGES', $mtd)) AND (!($resize AND (function_exists($gdfunction) OR extension_loaded('imagick'))))) {
// TCPDF image functions
$info = TCPDF_IMAGES::$mtd($file);
- if (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE)
+ if (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === false)
AND (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns'])))) {
return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash);
}
@@ -7081,7 +7212,7 @@ class TCPDF {
$info = TCPDF_IMAGES::_toJPEG($img, $this->jpeg_quality, TCPDF_STATIC::getObjFilename('img', $this->file_id));
}
}
- } catch(Exception $e) {
+ } catch (Exception $e) {
$info = false;
}
}
@@ -7097,7 +7228,7 @@ class TCPDF {
// get SVG file content
$svgimg = TCPDF_STATIC::fileGetContents($file);
}
- if ($svgimg !== FALSE) {
+ if ($svgimg !== false) {
// get width and height
$regs = array();
if (preg_match('/]*)>/si', $svgimg, $regs)) {
@@ -7142,7 +7273,7 @@ class TCPDF {
$info = TCPDF_IMAGES::_parsejpeg($tempname);
unlink($tempname);
$img->destroy();
- } catch(Exception $e) {
+ } catch (Exception $e) {
$info = false;
}
}
@@ -7217,7 +7348,7 @@ class TCPDF {
$this->Link($ximg, $y, $w, $h, $link, 0);
}
// set pointer to align the next text/objects
- switch($align) {
+ switch ($align) {
case 'T': {
$this->y = $y;
$this->x = $this->img_rb_x;
@@ -7270,7 +7401,8 @@ class TCPDF {
* @since 4.3.007 (2008-12-04)
* @see Image()
*/
- protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash='') {
+ protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash = '')
+ {
// create temp images
if (empty($filehash)) {
$filehash = md5($file);
@@ -7364,7 +7496,8 @@ class TCPDF {
* @protected
* @since 4.3.007 (2008-12-04)
*/
- protected function getGDgamma($img, $c) {
+ protected function getGDgamma($img, $c)
+ {
if (!isset($this->gdgammacache['#'.$c])) {
$colors = imagecolorsforindex($img, $c);
// GD alpha is only 7 bit (0 -> 127)
@@ -7389,7 +7522,8 @@ class TCPDF {
* @since 1.0
* @see Cell()
*/
- public function Ln($h='', $cell=false) {
+ public function Ln($h = '', $cell = false)
+ {
if (($this->num_columns > 1) AND ($this->y == $this->columns[$this->current_column]['y']) AND isset($this->columns[$this->current_column]['x']) AND ($this->x == $this->columns[$this->current_column]['x'])) {
// revove vertical space from the top of the column
return;
@@ -7423,7 +7557,8 @@ class TCPDF {
* @since 1.2
* @see SetX(), GetY(), SetY()
*/
- public function GetX() {
+ public function GetX()
+ {
//Get x position
if ($this->rtl) {
return ($this->w - $this->x);
@@ -7439,7 +7574,8 @@ class TCPDF {
* @since 1.2
* @see SetX(), GetY(), SetY()
*/
- public function GetAbsX() {
+ public function GetAbsX()
+ {
return $this->x;
}
@@ -7450,7 +7586,8 @@ class TCPDF {
* @since 1.0
* @see SetY(), GetX(), SetX()
*/
- public function GetY() {
+ public function GetY()
+ {
return $this->y;
}
@@ -7463,7 +7600,8 @@ class TCPDF {
* @since 1.2
* @see GetX(), GetY(), SetY(), SetXY()
*/
- public function SetX($x, $rtloff=false) {
+ public function SetX($x, $rtloff = false)
+ {
$x = floatval($x);
if (!$rtloff AND $this->rtl) {
if ($x >= 0) {
@@ -7496,7 +7634,8 @@ class TCPDF {
* @since 1.0
* @see GetX(), GetY(), SetY(), SetXY()
*/
- public function SetY($y, $resetx=true, $rtloff=false) {
+ public function SetY($y, $resetx = true, $rtloff = false)
+ {
$y = floatval($y);
if ($resetx) {
//reset x
@@ -7529,7 +7668,8 @@ class TCPDF {
* @since 1.2
* @see SetX(), SetY()
*/
- public function SetXY($x, $y, $rtloff=false) {
+ public function SetXY($x, $y, $rtloff = false)
+ {
$this->SetY($y, false, $rtloff);
$this->SetX($x, $rtloff);
}
@@ -7541,7 +7681,8 @@ class TCPDF {
* @since 5.9.186 (2012-09-13)
* @see setAbsX(), setAbsY(), SetAbsXY()
*/
- public function SetAbsX($x) {
+ public function SetAbsX($x)
+ {
$this->x = floatval($x);
}
@@ -7552,7 +7693,8 @@ class TCPDF {
* @since 5.9.186 (2012-09-13)
* @see setAbsX(), setAbsY(), SetAbsXY()
*/
- public function SetAbsY($y) {
+ public function SetAbsY($y)
+ {
$this->y = floatval($y);
}
@@ -7564,7 +7706,8 @@ class TCPDF {
* @since 5.9.186 (2012-09-13)
* @see setAbsX(), setAbsY(), SetAbsXY()
*/
- public function SetAbsXY($x, $y) {
+ public function SetAbsXY($x, $y)
+ {
$this->SetAbsX($x);
$this->SetAbsY($y);
}
@@ -7580,7 +7723,8 @@ class TCPDF {
* @since 1.0
* @see Close()
*/
- public function Output($name='doc.pdf', $dest='I') {
+ public function Output($name = 'doc.pdf', $dest = 'I')
+ {
//Output PDF to some destination
//Finish document if necessary
if ($this->state < 3) {
@@ -7648,7 +7792,7 @@ class TCPDF {
$this->buffer = substr($pdfdoc, 0, $byte_range[1]).'<'.$signature.'>'.substr($pdfdoc, $byte_range[1]);
$this->bufferlen = strlen($this->buffer);
}
- switch($dest) {
+ switch ($dest) {
case 'I': {
// Send PDF to the standard output
if (ob_get_contents()) {
@@ -7779,7 +7923,8 @@ class TCPDF {
* @public
* @since 4.5.016 (2009-02-24)
*/
- public function _destroy($destroyall=false, $preserve_objcopy=false) {
+ public function _destroy($destroyall = false, $preserve_objcopy = false)
+ {
// restore internal encoding
if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
mb_internal_encoding($this->internal_encoding);
@@ -7791,7 +7936,7 @@ class TCPDF {
self::$cleaned_ids[$this->file_id] = true;
// remove all temporary files
if ($handle = opendir(K_PATH_CACHE)) {
- while ( false !== ( $file_name = readdir( $handle ) ) ) {
+ while ( false !== ( $file_name = readdir($handle) ) ) {
if (strpos($file_name, '__tcpdf_'.$this->file_id.'_') === 0) {
unlink(K_PATH_CACHE.$file_name);
}
@@ -7799,9 +7944,9 @@ class TCPDF {
closedir($handle);
}
if (isset($this->imagekeys)) {
- foreach($this->imagekeys as $file) {
-//Â @CHANGE DOL
-// unlink($file);
+ foreach ($this->imagekeys as $file) {
+ //Â @CHANGE DOL
+ // unlink($file);
}
}
}
@@ -7812,8 +7957,8 @@ class TCPDF {
'bufferlen',
'buffer',
'cached_files',
-//Â @CHANGE DOL
-// 'imagekeys',
+ //Â @CHANGE DOL
+ // 'imagekeys',
'sign',
'signature_data',
'signature_max_length',
@@ -7834,7 +7979,8 @@ class TCPDF {
* Check for locale-related bug
* @protected
*/
- protected function _dochecks() {
+ protected function _dochecks()
+ {
//Check for locale-related bug
if (1.1 == 1) {
$this->Error('Don\'t alter the locale before including class file');
@@ -7851,7 +7997,8 @@ class TCPDF {
* @return array of page number aliases
* @protected
*/
- protected function getInternalPageNumberAliases($a= '') {
+ protected function getInternalPageNumberAliases($a = '')
+ {
$alias = array();
// build array of Unicode + ASCII variants (the order is important)
$alias = array('u' => array(), 'a' => array());
@@ -7872,10 +8019,11 @@ class TCPDF {
* @return array of page number aliases
* @protected
*/
- protected function getAllInternalPageNumberAliases() {
+ protected function getAllInternalPageNumberAliases()
+ {
$basic_alias = array(TCPDF_STATIC::$alias_tot_pages, TCPDF_STATIC::$alias_num_page, TCPDF_STATIC::$alias_group_tot_pages, TCPDF_STATIC::$alias_group_num_page, TCPDF_STATIC::$alias_right_shift);
$pnalias = array();
- foreach($basic_alias as $k => $a) {
+ foreach ($basic_alias as $k => $a) {
$pnalias[$k] = $this->getInternalPageNumberAliases($a);
}
return $pnalias;
@@ -7890,7 +8038,8 @@ class TCPDF {
* @return replaced page content.
* @protected
*/
- protected function replaceRightShiftPageNumAliases($page, $aliases, $diff) {
+ protected function replaceRightShiftPageNumAliases($page, $aliases, $diff)
+ {
foreach ($aliases as $type => $alias) {
foreach ($alias as $a) {
// find position of compensation factor
@@ -7925,7 +8074,8 @@ class TCPDF {
* @param $boxes (array) Array of page boxes to set on document: ('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox').
* @protected
*/
- protected function setPageBoxTypes($boxes) {
+ protected function setPageBoxTypes($boxes)
+ {
$this->page_boxes = array();
foreach ($boxes as $box) {
if (in_array($box, TCPDF_STATIC::$pageboxes)) {
@@ -7938,7 +8088,8 @@ class TCPDF {
* Output pages (and replace page number aliases).
* @protected
*/
- protected function _putpages() {
+ protected function _putpages()
+ {
$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
// get internal aliases for page numbers
$pnalias = $this->getAllInternalPageNumberAliases();
@@ -8084,7 +8235,7 @@ class TCPDF {
//Pages root
$out = $this->_getobj(1)."\n";
$out .= '<< /Type /Pages /Kids [';
- foreach($this->page_obj_id as $page_obj) {
+ foreach ($this->page_obj_id as $page_obj) {
$out .= ' '.$page_obj.' 0 R';
}
$out .= ' ] /Count '.$num_pages.' >>';
@@ -8100,7 +8251,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 5.0.010 (2010-05-17)
*/
- protected function _getannotsrefs($n) {
+ protected function _getannotsrefs($n)
+ {
if (!(isset($this->PageAnnots[$n]) OR ($this->sign AND isset($this->signature_data['cert_type'])))) {
return '';
}
@@ -8144,7 +8296,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.0.018 (2008-08-06)
*/
- protected function _putannotsobjs() {
+ protected function _putannotsobjs()
+ {
// reset object counter
for ($n=1; $n <= $this->numpages; ++$n) {
if (isset($this->PageAnnots[$n])) {
@@ -8664,7 +8817,7 @@ class TCPDF {
if (is_array($pl['opt']['ff'])) {
// array of bit settings
$flag = 0;
- foreach($pl['opt']['ff'] as $val) {
+ foreach ($pl['opt']['ff'] as $val) {
$flag += 1 << ($val - 1);
}
} else {
@@ -8728,7 +8881,7 @@ class TCPDF {
}
if (isset($pl['opt']['opt']) AND (is_array($pl['opt']['opt'])) AND !empty($pl['opt']['opt'])) {
$annots .= ' /Opt [';
- foreach($pl['opt']['opt'] AS $copt) {
+ foreach ($pl['opt']['opt'] AS $copt) {
if (is_array($copt)) {
$annots .= ' ['.$this->_textstring($copt[0], $annot_obj_id).' '.$this->_textstring($copt[1], $annot_obj_id).']';
} else {
@@ -8742,7 +8895,7 @@ class TCPDF {
}
if (isset($pl['opt']['i']) AND (is_array($pl['opt']['i'])) AND !empty($pl['opt']['i'])) {
$annots .= ' /I [';
- foreach($pl['opt']['i'] AS $copt) {
+ foreach ($pl['opt']['i'] AS $copt) {
$annots .= intval($copt).' ';
}
$annots .= ']';
@@ -8789,7 +8942,8 @@ class TCPDF {
* @protected
* @since 4.8.001 (2009-09-09)
*/
- protected function _putAPXObject($w=0, $h=0, $stream='') {
+ protected function _putAPXObject($w = 0, $h = 0, $stream = '')
+ {
$stream = trim($stream);
$out = $this->_getobj()."\n";
$this->xobjects['AX'.$this->n] = array('n' => $this->n);
@@ -8819,7 +8973,8 @@ class TCPDF {
* @author Nicola Asuni
* @protected
*/
- protected function _putfonts() {
+ protected function _putfonts()
+ {
$nf = $this->n;
foreach ($this->diffs as $diff) {
//Encodings
@@ -8971,7 +9126,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 1.52.0.TC005 (2005-01-05)
*/
- protected function _puttruetypeunicode($font) {
+ protected function _puttruetypeunicode($font)
+ {
$fontname = '';
if ($font['subset']) {
// change name for font subsetting
@@ -9075,7 +9231,8 @@ class TCPDF {
* @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
* @since 3.2.000 (2008-06-23)
*/
- protected function _putcidfont0($font) {
+ protected function _putcidfont0($font)
+ {
$cidoffset = 0;
if (!isset($font['cw'][1])) {
$cidoffset = 31;
@@ -9145,7 +9302,8 @@ class TCPDF {
* Output images.
* @protected
*/
- protected function _putimages() {
+ protected function _putimages()
+ {
$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
foreach ($this->imagekeys as $file) {
$info = $this->getImageBuffer($file);
@@ -9274,7 +9432,8 @@ class TCPDF {
* @protected
* @see startTemplate(), endTemplate(), printTemplate()
*/
- protected function _putxobjects() {
+ protected function _putxobjects()
+ {
foreach ($this->xobjects as $key => $data) {
if (isset($data['outdata'])) {
$stream = str_replace($this->epsmarker, '', trim($data['outdata']));
@@ -9377,7 +9536,8 @@ class TCPDF {
* @protected
* @since 4.0.024 (2008-09-12)
*/
- protected function _putspotcolors() {
+ protected function _putspotcolors()
+ {
foreach ($this->spot_colors as $name => $color) {
$this->_newobj();
$this->spot_colors[$name]['n'] = $this->n;
@@ -9397,7 +9557,8 @@ class TCPDF {
* @protected
* @since 5.8.014 (2010-08-23)
*/
- protected function _getxobjectdict() {
+ protected function _getxobjectdict()
+ {
$out = '';
foreach ($this->xobjects as $id => $objid) {
$out .= ' /'.$id.' '.$objid['n'].' 0 R';
@@ -9409,7 +9570,8 @@ class TCPDF {
* Output Resources Dictionary.
* @protected
*/
- protected function _putresourcedict() {
+ protected function _putresourcedict()
+ {
$out = $this->_getobj(2)."\n";
$out .= '<< /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
$out .= ' /Font <<';
@@ -9473,7 +9635,8 @@ class TCPDF {
* Output Resources.
* @protected
*/
- protected function _putresources() {
+ protected function _putresources()
+ {
$this->_putextgstates();
$this->_putocg();
$this->_putfonts();
@@ -9496,7 +9659,8 @@ class TCPDF {
* @return int object id
* @protected
*/
- protected function _putinfo() {
+ protected function _putinfo()
+ {
$oid = $this->_newobj();
$out = '<<';
// store current isunicode value
@@ -9547,7 +9711,8 @@ class TCPDF {
* @since 5.9.128 (2011-10-06)
* @public
*/
- public function setExtraXMP($xmp) {
+ public function setExtraXMP($xmp)
+ {
$this->custom_xmp = $xmp;
}
@@ -9558,7 +9723,8 @@ class TCPDF {
* @since 6.3.0 (2019-09-19)
* @public
*/
- public function setExtraXMPRDF($xmp) {
+ public function setExtraXMPRDF($xmp)
+ {
$this->custom_xmp_rdf = $xmp;
}
@@ -9568,7 +9734,8 @@ class TCPDF {
* @since 5.9.121 (2011-09-28)
* @protected
*/
- protected function _putXMP() {
+ protected function _putXMP()
+ {
$oid = $this->_newobj();
// store current isunicode value
$prev_isunicode = $this->isunicode;
@@ -9707,7 +9874,8 @@ class TCPDF {
* @return int object id
* @protected
*/
- protected function _putcatalog() {
+ protected function _putcatalog()
+ {
// put XMP
$xmpobj = $this->_putXMP();
// if required, add standard sRGB ICC colour profile
@@ -9837,7 +10005,7 @@ class TCPDF {
}
}
if (!empty($this->form_obj_id)) {
- foreach($this->form_obj_id as $objid) {
+ foreach ($this->form_obj_id as $objid) {
$objrefs .= ' '.$objid.' 0 R';
}
}
@@ -9894,7 +10062,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @protected
*/
- protected function _putviewerpreferences() {
+ protected function _putviewerpreferences()
+ {
$vp = $this->viewer_preferences;
$out = ' /ViewerPreferences <<';
if ($this->rtl) {
@@ -9953,7 +10122,7 @@ class TCPDF {
foreach ($vp['PrintPageRange'] as $k => $v) {
$PrintPageRangeNum .= ' '.($v - 1).'';
}
- $out .= ' /PrintPageRange ['.substr($PrintPageRangeNum,1).']';
+ $out .= ' /PrintPageRange ['.substr($PrintPageRangeNum, 1).']';
}
if (isset($vp['NumCopies'])) {
$out .= ' /NumCopies '.intval($vp['NumCopies']);
@@ -9966,7 +10135,8 @@ class TCPDF {
* Output PDF File Header (7.5.2).
* @protected
*/
- protected function _putheader() {
+ protected function _putheader()
+ {
$this->_out('%PDF-'.$this->PDFVersion);
$this->_out('%'.chr(0xe2).chr(0xe3).chr(0xcf).chr(0xd3));
}
@@ -9975,7 +10145,8 @@ class TCPDF {
* Output end of document (EOF).
* @protected
*/
- protected function _enddoc() {
+ protected function _enddoc()
+ {
if (isset($this->CurrentFont['fontkey']) AND isset($this->CurrentFont['subsetchars'])) {
// save subset chars of the previous font
$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
@@ -10066,7 +10237,8 @@ class TCPDF {
* @protected
* @see getPageSizeFromFormat(), setPageFormat()
*/
- protected function _beginpage($orientation='', $format='') {
+ protected function _beginpage($orientation = '', $format = '')
+ {
++$this->page;
$this->pageobjects[$this->page] = array();
$this->setPageBuffer($this->page, '');
@@ -10109,7 +10281,8 @@ class TCPDF {
* Mark end of page.
* @protected
*/
- protected function _endpage() {
+ protected function _endpage()
+ {
$this->setVisibility('all');
$this->state = 1;
}
@@ -10119,7 +10292,8 @@ class TCPDF {
* @return int object number
* @protected
*/
- protected function _newobj() {
+ protected function _newobj()
+ {
$this->_out($this->_getobj());
return $this->n;
}
@@ -10131,7 +10305,8 @@ class TCPDF {
* @protected
* @since 5.8.009 (2010-08-20)
*/
- protected function _getobj($objid='') {
+ protected function _getobj($objid = '')
+ {
if ($objid === '') {
++$this->n;
$objid = $this->n;
@@ -10148,7 +10323,8 @@ class TCPDF {
* @param $txt (string) text to underline
* @protected
*/
- protected function _dounderline($x, $y, $txt) {
+ protected function _dounderline($x, $y, $txt)
+ {
$w = $this->GetStringWidth($txt);
return $this->_dounderlinew($x, $y, $w);
}
@@ -10161,7 +10337,8 @@ class TCPDF {
* @protected
* @since 4.8.008 (2009-09-29)
*/
- protected function _dounderlinew($x, $y, $w) {
+ protected function _dounderlinew($x, $y, $w)
+ {
$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew), $w * $this->k, $linew);
}
@@ -10173,7 +10350,8 @@ class TCPDF {
* @param $txt (string) text to linethrough
* @protected
*/
- protected function _dolinethrough($x, $y, $txt) {
+ protected function _dolinethrough($x, $y, $txt)
+ {
$w = $this->GetStringWidth($txt);
return $this->_dolinethroughw($x, $y, $w);
}
@@ -10186,7 +10364,8 @@ class TCPDF {
* @protected
* @since 4.9.008 (2009-09-29)
*/
- protected function _dolinethroughw($x, $y, $w) {
+ protected function _dolinethroughw($x, $y, $w)
+ {
$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew + ($this->FontSizePt / 3)), $w * $this->k, $linew);
}
@@ -10199,7 +10378,8 @@ class TCPDF {
* @protected
* @since 4.9.015 (2010-04-19)
*/
- protected function _dooverline($x, $y, $txt) {
+ protected function _dooverline($x, $y, $txt)
+ {
$w = $this->GetStringWidth($txt);
return $this->_dooverlinew($x, $y, $w);
}
@@ -10212,10 +10392,10 @@ class TCPDF {
* @protected
* @since 4.9.015 (2010-04-19)
*/
- protected function _dooverlinew($x, $y, $w) {
+ protected function _dooverlinew($x, $y, $w)
+ {
$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
return sprintf('%F %F %F %F re f', $x * $this->k, (($this->h - $y + $this->FontAscent) * $this->k) - $linew, $w * $this->k, $linew);
-
}
/**
@@ -10225,7 +10405,8 @@ class TCPDF {
* @return string escaped string.
* @protected
*/
- protected function _datastring($s, $n=0) {
+ protected function _datastring($s, $n = 0)
+ {
if ($n == 0) {
$n = $this->n;
}
@@ -10239,7 +10420,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function setDocCreationTimestamp($time) {
+ public function setDocCreationTimestamp($time)
+ {
if (is_string($time)) {
$time = TCPDF_STATIC::getTimestamp($time);
}
@@ -10252,7 +10434,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function setDocModificationTimestamp($time) {
+ public function setDocModificationTimestamp($time)
+ {
if (is_string($time)) {
$time = TCPDF_STATIC::getTimestamp($time);
}
@@ -10265,7 +10448,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function getDocCreationTimestamp() {
+ public function getDocCreationTimestamp()
+ {
return $this->doc_creation_timestamp;
}
@@ -10275,7 +10459,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function getDocModificationTimestamp() {
+ public function getDocModificationTimestamp()
+ {
return $this->doc_modification_timestamp;
}
@@ -10287,7 +10472,8 @@ class TCPDF {
* @protected
* @since 4.6.028 (2009-08-25)
*/
- protected function _datestring($n=0, $timestamp=0) {
+ protected function _datestring($n = 0, $timestamp = 0)
+ {
if ((empty($timestamp)) OR ($timestamp < 0)) {
$timestamp = $this->doc_creation_timestamp;
}
@@ -10301,7 +10487,8 @@ class TCPDF {
* @return string escaped string.
* @protected
*/
- protected function _textstring($s, $n=0) {
+ protected function _textstring($s, $n = 0)
+ {
if ($this->isunicode) {
//Convert string to UTF-16BE
$s = TCPDF_FONTS::UTF8ToUTF16BE($s, true, $this->isunicode, $this->CurrentFont);
@@ -10317,7 +10504,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 5.5.000 (2010-06-22)
*/
- protected function _getrawstream($s, $n=0) {
+ protected function _getrawstream($s, $n = 0)
+ {
if ($n <= 0) {
// default to current object
$n = $this->n;
@@ -10330,7 +10518,8 @@ class TCPDF {
* @param $s (string) string to output.
* @protected
*/
- protected function _out($s) {
+ protected function _out($s)
+ {
if ($this->state == 2) {
if ($this->inxobj) {
// we are inside an XObject template
@@ -10359,7 +10548,8 @@ class TCPDF {
* @public
* @since 1.1
*/
- public function setHeaderFont($font) {
+ public function setHeaderFont($font)
+ {
$this->header_font = $font;
}
@@ -10369,7 +10559,8 @@ class TCPDF {
* @public
* @since 4.0.012 (2008-07-24)
*/
- public function getHeaderFont() {
+ public function getHeaderFont()
+ {
return $this->header_font;
}
@@ -10379,7 +10570,8 @@ class TCPDF {
* @public
* @since 1.1
*/
- public function setFooterFont($font) {
+ public function setFooterFont($font)
+ {
$this->footer_font = $font;
}
@@ -10389,7 +10581,8 @@ class TCPDF {
* @public
* @since 4.0.012 (2008-07-24)
*/
- public function getFooterFont() {
+ public function getFooterFont()
+ {
return $this->footer_font;
}
@@ -10399,7 +10592,8 @@ class TCPDF {
* @public
* @since 1.1
*/
- public function setLanguageArray($language) {
+ public function setLanguageArray($language)
+ {
$this->l = $language;
if (isset($this->l['a_meta_dir'])) {
$this->rtl = $this->l['a_meta_dir']=='rtl' ? true : false;
@@ -10412,7 +10606,8 @@ class TCPDF {
* Returns the PDF data.
* @public
*/
- public function getPDFData() {
+ public function getPDFData()
+ {
if ($this->state < 3) {
$this->Close();
}
@@ -10431,7 +10626,8 @@ class TCPDF {
* @return the number of cells used or the remaining text if $firstline = true;
* @public
*/
- public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
+ public function addHtmlLink($url, $name, $fill = false, $firstline = false, $color = '', $style = -1, $firstblock = false)
+ {
if (isset($url[1]) AND ($url[0] == '#') AND is_numeric($url[1])) {
// convert url to internal link
$lnkdata = explode(',', $url);
@@ -10473,7 +10669,8 @@ class TCPDF {
* @public
* @see setImageScale(), getImageScale()
*/
- public function pixelsToUnits($px) {
+ public function pixelsToUnits($px)
+ {
return ($px / ($this->imgscale * $this->k));
}
@@ -10484,7 +10681,8 @@ class TCPDF {
* @return string converted text string
* @public
*/
- public function unhtmlentities($text_to_convert) {
+ public function unhtmlentities($text_to_convert)
+ {
return @html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
}
@@ -10499,7 +10697,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 2.0.000 (2008-01-02)
*/
- protected function _objectkey($n) {
+ protected function _objectkey($n)
+ {
$objkey = $this->encryptdata['key'].pack('VXxx', $n);
if ($this->encryptdata['mode'] == 2) { // AES-128
// AES padding
@@ -10519,7 +10718,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 5.0.005 (2010-05-11)
*/
- protected function _encrypt_data($n, $s) {
+ protected function _encrypt_data($n, $s)
+ {
if (!$this->encrypted) {
return $s;
}
@@ -10547,7 +10747,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 2.0.000 (2008-01-02)
*/
- protected function _putencryption() {
+ protected function _putencryption()
+ {
if (!$this->encrypted) {
return;
}
@@ -10667,7 +10868,8 @@ class TCPDF {
* @since 2.0.000 (2008-01-02)
* @author Nicola Asuni
*/
- protected function _Uvalue() {
+ protected function _Uvalue()
+ {
if ($this->encryptdata['mode'] == 0) { // RC4-40
return TCPDF_STATIC::_RC4($this->encryptdata['key'], TCPDF_STATIC::$enc_padding, $this->last_enc_key, $this->last_enc_key_c);
} elseif ($this->encryptdata['mode'] < 3) { // RC4-128, AES-128
@@ -10700,7 +10902,8 @@ class TCPDF {
* @since 5.9.006 (2010-10-19)
* @author Nicola Asuni
*/
- protected function _UEvalue() {
+ protected function _UEvalue()
+ {
$hashkey = hash('sha256', $this->encryptdata['user_password'].$this->encryptdata['UKS'], true);
return TCPDF_STATIC::_AESnopad($hashkey, $this->encryptdata['key']);
}
@@ -10712,7 +10915,8 @@ class TCPDF {
* @since 2.0.000 (2008-01-02)
* @author Nicola Asuni
*/
- protected function _Ovalue() {
+ protected function _Ovalue()
+ {
if ($this->encryptdata['mode'] < 3) { // RC4-40, RC4-128, AES-128
$tmp = TCPDF_STATIC::_md5_16($this->encryptdata['owner_password']);
if ($this->encryptdata['mode'] > 0) {
@@ -10750,7 +10954,8 @@ class TCPDF {
* @since 5.9.006 (2010-10-19)
* @author Nicola Asuni
*/
- protected function _OEvalue() {
+ protected function _OEvalue()
+ {
$hashkey = hash('sha256', $this->encryptdata['owner_password'].$this->encryptdata['OKS'].$this->encryptdata['U'], true);
return TCPDF_STATIC::_AESnopad($hashkey, $this->encryptdata['key']);
}
@@ -10763,7 +10968,8 @@ class TCPDF {
* @since 5.9.006 (2010-10-19)
* @author Nicola Asuni
*/
- protected function _fixAES256Password($password) {
+ protected function _fixAES256Password($password)
+ {
$psw = ''; // password to be returned
$psw_array = TCPDF_FONTS::utf8Bidi(TCPDF_FONTS::UTF8StringToArray($password, $this->isunicode, $this->CurrentFont), $password, $this->rtl, $this->isunicode, $this->CurrentFont);
foreach ($psw_array as $c) {
@@ -10778,7 +10984,8 @@ class TCPDF {
* @since 2.0.000 (2008-01-02)
* @author Nicola Asuni
*/
- protected function _generateencryptionkey() {
+ protected function _generateencryptionkey()
+ {
$keybytelen = ($this->encryptdata['Length'] / 8);
if (!$this->encryptdata['pubkey']) { // standard mode
if ($this->encryptdata['mode'] == 3) { // AES-256
@@ -10896,7 +11103,8 @@ class TCPDF {
* @since 2.0.000 (2008-01-02)
* @author Nicola Asuni
*/
- public function SetProtection($permissions=array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass='', $owner_pass=null, $mode=0, $pubkeys=null) {
+ public function SetProtection($permissions = array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass = '', $owner_pass = null, $mode = 0, $pubkeys = null)
+ {
if ($this->pdfa_mode) {
// encryption is not allowed in PDF/A mode
return;
@@ -11002,7 +11210,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function StartTransform() {
+ public function StartTransform()
+ {
if ($this->state != 2) {
return;
}
@@ -11025,7 +11234,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function StopTransform() {
+ public function StopTransform()
+ {
if ($this->state != 2) {
return;
}
@@ -11050,7 +11260,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function ScaleX($s_x, $x='', $y='') {
+ public function ScaleX($s_x, $x = '', $y = '')
+ {
$this->Scale($s_x, 100, $x, $y);
}
@@ -11063,7 +11274,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function ScaleY($s_y, $x='', $y='') {
+ public function ScaleY($s_y, $x = '', $y = '')
+ {
$this->Scale(100, $s_y, $x, $y);
}
@@ -11076,7 +11288,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function ScaleXY($s, $x='', $y='') {
+ public function ScaleXY($s, $x = '', $y = '')
+ {
$this->Scale($s, $s, $x, $y);
}
@@ -11090,7 +11303,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function Scale($s_x, $s_y, $x='', $y='') {
+ public function Scale($s_x, $s_y, $x = '', $y = '')
+ {
if ($x === '') {
$x = $this->x;
}
@@ -11123,7 +11337,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function MirrorH($x='') {
+ public function MirrorH($x = '')
+ {
$this->Scale(-100, 100, $x);
}
@@ -11134,7 +11349,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function MirrorV($y='') {
+ public function MirrorV($y = '')
+ {
$this->Scale(100, -100, '', $y);
}
@@ -11146,7 +11362,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function MirrorP($x='',$y='') {
+ public function MirrorP($x = '', $y = '')
+ {
$this->Scale(-100, -100, $x, $y);
}
@@ -11159,7 +11376,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function MirrorL($angle=0, $x='',$y='') {
+ public function MirrorL($angle = 0, $x = '', $y = '')
+ {
$this->Scale(-100, 100, $x, $y);
$this->Rotate(-2*($angle-90), $x, $y);
}
@@ -11171,7 +11389,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function TranslateX($t_x) {
+ public function TranslateX($t_x)
+ {
$this->Translate($t_x, 0);
}
@@ -11182,7 +11401,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function TranslateY($t_y) {
+ public function TranslateY($t_y)
+ {
$this->Translate(0, $t_y);
}
@@ -11194,7 +11414,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function Translate($t_x, $t_y) {
+ public function Translate($t_x, $t_y)
+ {
//calculate elements of transformation matrix
$tm = array();
$tm[0] = 1;
@@ -11216,7 +11437,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function Rotate($angle, $x='', $y='') {
+ public function Rotate($angle, $x = '', $y = '')
+ {
if ($x === '') {
$x = $this->x;
}
@@ -11246,7 +11468,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function SkewX($angle_x, $x='', $y='') {
+ public function SkewX($angle_x, $x = '', $y = '')
+ {
$this->Skew($angle_x, 0, $x, $y);
}
@@ -11259,7 +11482,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function SkewY($angle_y, $x='', $y='') {
+ public function SkewY($angle_y, $x = '', $y = '')
+ {
$this->Skew(0, $angle_y, $x, $y);
}
@@ -11273,7 +11497,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- public function Skew($angle_x, $angle_y, $x='', $y='') {
+ public function Skew($angle_x, $angle_y, $x = '', $y = '')
+ {
if ($x === '') {
$x = $this->x;
}
@@ -11304,7 +11529,8 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see StartTransform(), StopTransform()
*/
- protected function Transform($tm) {
+ protected function Transform($tm)
+ {
if ($this->state != 2) {
return;
}
@@ -11336,7 +11562,8 @@ class TCPDF {
* @since 1.0
* @see Line(), Rect(), Cell(), MultiCell()
*/
- public function SetLineWidth($width) {
+ public function SetLineWidth($width)
+ {
//Set line width
$this->LineWidth = $width;
$this->linestyleWidth = sprintf('%F w', ($width * $this->k));
@@ -11352,34 +11579,36 @@ class TCPDF {
* @since 2.1.000 (2008-01-07)
* @see Line(), SetLineWidth()
*/
- public function GetLineWidth() {
+ public function GetLineWidth()
+ {
return $this->LineWidth;
}
/**
* Set line style.
* @param $style (array) Line style. Array with keys among the following:
- *
- * - width (float): Width of the line in user units.
- * - cap (string): Type of cap to put on the line. Possible values are:
- * butt, round, square. The difference between "square" and "butt" is that
- * "square" projects a flat end past the end of the line.
- * - join (string): Type of join. Possible values are: miter, round,
- * bevel.
- * - dash (mixed): Dash pattern. Is 0 (without dash) or string with
- * series of length values, which are the lengths of the on and off dashes.
- * For example: "2" represents 2 on, 2 off, 2 on, 2 off, ...; "2,1" is 2 on,
- * 1 off, 2 on, 1 off, ...
- * - phase (integer): Modifier on the dash pattern which is used to shift
- * the point at which the pattern starts.
- * - color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName).
- *
+ *
+ * - width (float): Width of the line in user units.
+ * - cap (string): Type of cap to put on the line. Possible values are:
+ * butt, round, square. The difference between "square" and "butt" is that
+ * "square" projects a flat end past the end of the line.
+ * - join (string): Type of join. Possible values are: miter, round,
+ * bevel.
+ * - dash (mixed): Dash pattern. Is 0 (without dash) or string with
+ * series of length values, which are the lengths of the on and off dashes.
+ * For example: "2" represents 2 on, 2 off, 2 on, 2 off, ...; "2,1" is 2 on,
+ * 1 off, 2 on, 1 off, ...
+ * - phase (integer): Modifier on the dash pattern which is used to shift
+ * the point at which the pattern starts.
+ * - color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName).
+ *
* @param $ret (boolean) if true do not send the command.
* @return string the PDF command
* @public
* @since 2.1.000 (2008-01-08)
*/
- public function SetLineStyle($style, $ret=false) {
+ public function SetLineStyle($style, $ret = false)
+ {
$s = ''; // string to be returned
if (!is_array($style)) {
return;
@@ -11441,7 +11670,8 @@ class TCPDF {
* @protected
* @since 2.1.000 (2008-01-08)
*/
- protected function _outPoint($x, $y) {
+ protected function _outPoint($x, $y)
+ {
if ($this->state == 2) {
$this->_out(sprintf('%F %F m', ($x * $this->k), (($this->h - $y) * $this->k)));
}
@@ -11455,7 +11685,8 @@ class TCPDF {
* @protected
* @since 2.1.000 (2008-01-08)
*/
- protected function _outLine($x, $y) {
+ protected function _outLine($x, $y)
+ {
if ($this->state == 2) {
$this->_out(sprintf('%F %F l', ($x * $this->k), (($this->h - $y) * $this->k)));
}
@@ -11471,7 +11702,8 @@ class TCPDF {
* @protected
* @since 2.1.000 (2008-01-08)
*/
- protected function _outRect($x, $y, $w, $h, $op) {
+ protected function _outRect($x, $y, $w, $h, $op)
+ {
if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F re %s', ($x * $this->k), (($this->h - $y) * $this->k), ($w * $this->k), (-$h * $this->k), $op));
}
@@ -11489,7 +11721,8 @@ class TCPDF {
* @protected
* @since 2.1.000 (2008-01-08)
*/
- protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) {
+ protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3)
+ {
if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F %F %F c', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
}
@@ -11505,7 +11738,8 @@ class TCPDF {
* @protected
* @since 4.9.019 (2010-04-26)
*/
- protected function _outCurveV($x2, $y2, $x3, $y3) {
+ protected function _outCurveV($x2, $y2, $x3, $y3)
+ {
if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F v', ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
}
@@ -11521,7 +11755,8 @@ class TCPDF {
* @protected
* @since 2.1.000 (2008-01-08)
*/
- protected function _outCurveY($x1, $y1, $x3, $y3) {
+ protected function _outCurveY($x1, $y1, $x3, $y3)
+ {
if ($this->state == 2) {
$this->_out(sprintf('%F %F %F %F y', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
}
@@ -11538,7 +11773,8 @@ class TCPDF {
* @since 1.0
* @see SetLineWidth(), SetDrawColor(), SetLineStyle()
*/
- public function Line($x1, $y1, $x2, $y2, $style=array()) {
+ public function Line($x1, $y1, $x2, $y2, $style = array())
+ {
if ($this->state != 2) {
return;
}
@@ -11558,17 +11794,18 @@ class TCPDF {
* @param $h (float) Height.
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
* @param $border_style (array) Border style of rectangle. Array with keys among the following:
- *
- * - all: Line style of all borders. Array like for SetLineStyle().
- * - L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for SetLineStyle().
- *
- * If a key is not present or is null, the correspondent border is not drawn. Default value: default line style (empty array).
+ *
+ * - all: Line style of all borders. Array like for SetLineStyle().
+ * - L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for SetLineStyle().
+ *
+ * If a key is not present or is null, the correspondent border is not drawn. Default value: default line style (empty array).
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
* @public
* @since 1.0
* @see SetLineStyle()
*/
- public function Rect($x, $y, $w, $h, $style='', $border_style=array(), $fill_color=array()) {
+ public function Rect($x, $y, $w, $h, $style = '', $border_style = array(), $fill_color = array())
+ {
if ($this->state != 2) {
return;
}
@@ -11639,7 +11876,8 @@ class TCPDF {
* @see SetLineStyle()
* @since 2.1.000 (2008-01-08)
*/
- public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style='', $line_style=array(), $fill_color=array()) {
+ public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style = '', $line_style = array(), $fill_color = array())
+ {
if ($this->state != 2) {
return;
}
@@ -11669,7 +11907,8 @@ class TCPDF {
* @see SetLineStyle()
* @since 3.0008 (2008-05-12)
*/
- public function Polycurve($x0, $y0, $segments, $style='', $line_style=array(), $fill_color=array()) {
+ public function Polycurve($x0, $y0, $segments, $style = '', $line_style = array(), $fill_color = array())
+ {
if ($this->state != 2) {
return;
}
@@ -11709,7 +11948,8 @@ class TCPDF {
* @public
* @since 2.1.000 (2008-01-08)
*/
- public function Ellipse($x0, $y0, $rx, $ry='', $angle=0, $astart=0, $afinish=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
+ public function Ellipse($x0, $y0, $rx, $ry = '', $angle = 0, $astart = 0, $afinish = 360, $style = '', $line_style = array(), $fill_color = array(), $nc = 2)
+ {
if ($this->state != 2) {
return;
}
@@ -11750,7 +11990,8 @@ class TCPDF {
* @protected
* @since 4.9.019 (2010-04-26)
*/
- protected function _outellipticalarc($xc, $yc, $rx, $ry, $xang=0, $angs=0, $angf=360, $pie=false, $nc=2, $startpoint=true, $ccw=true, $svg=false) {
+ protected function _outellipticalarc($xc, $yc, $rx, $ry, $xang = 0, $angs = 0, $angf = 360, $pie = false, $nc = 2, $startpoint = true, $ccw = true, $svg = false)
+ {
if (($rx <= 0) OR ($ry < 0)) {
return;
}
@@ -11881,7 +12122,8 @@ class TCPDF {
* @public
* @since 2.1.000 (2008-01-08)
*/
- public function Circle($x0, $y0, $r, $angstr=0, $angend=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
+ public function Circle($x0, $y0, $r, $angstr = 0, $angend = 360, $style = '', $line_style = array(), $fill_color = array(), $nc = 2)
+ {
$this->Ellipse($x0, $y0, $r, $r, 0, $angstr, $angend, $style, $line_style, $fill_color, $nc);
}
@@ -11890,16 +12132,17 @@ class TCPDF {
* @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
* @param $line_style (array) Line style of polygon. Array with keys among the following:
- *
- * - all: Line style of all lines. Array like for SetLineStyle().
- * - 0 to ($np - 1): Line style of each line. Array like for SetLineStyle().
- *
- * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
+ *
+ * - all: Line style of all lines. Array like for SetLineStyle().
+ * - 0 to ($np - 1): Line style of each line. Array like for SetLineStyle().
+ *
+ * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
* @since 4.8.003 (2009-09-15)
* @public
*/
- public function PolyLine($p, $style='', $line_style=array(), $fill_color=array()) {
+ public function PolyLine($p, $style = '', $line_style = array(), $fill_color = array())
+ {
$this->Polygon($p, $style, $line_style, $fill_color, false);
}
@@ -11908,17 +12151,18 @@ class TCPDF {
* @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
* @param $line_style (array) Line style of polygon. Array with keys among the following:
- *
- * - all: Line style of all lines. Array like for SetLineStyle().
- * - 0 to ($np - 1): Line style of each line. Array like for SetLineStyle().
- *
- * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
+ *
+ * - all: Line style of all lines. Array like for SetLineStyle().
+ * - 0 to ($np - 1): Line style of each line. Array like for SetLineStyle().
+ *
+ * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
* @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
* @param $closed (boolean) if true the polygon is closes, otherwise will remain open
* @public
* @since 2.1.000 (2008-01-08)
*/
- public function Polygon($p, $style='', $line_style=array(), $fill_color=array(), $closed=true) {
+ public function Polygon($p, $style = '', $line_style = array(), $fill_color = array(), $closed = true)
+ {
if ($this->state != 2) {
return;
}
@@ -12000,26 +12244,27 @@ class TCPDF {
* @param $draw_circle (boolean) Draw inscribed circle or not. Default value: false.
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
* @param $line_style (array) Line style of polygon sides. Array with keys among the following:
- *
- * - all: Line style of all sides. Array like for SetLineStyle().
- * - 0 to ($ns - 1): Line style of each side. Array like for SetLineStyle().
- *
- * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
+ *
+ * - all: Line style of all sides. Array like for SetLineStyle().
+ * - 0 to ($ns - 1): Line style of each side. Array like for SetLineStyle().
+ *
+ * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
* @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
* @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
- *
- * - D or empty string: Draw (default).
- * - F: Fill.
- * - DF or FD: Draw and fill.
- * - CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).
- * - CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).
- *
+ *
+ * - D or empty string: Draw (default).
+ * - F: Fill.
+ * - DF or FD: Draw and fill.
+ * - CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).
+ * - CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).
+ *
* @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
* @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
* @public
* @since 2.1.000 (2008-01-08)
*/
- public function RegularPolygon($x0, $y0, $r, $ns, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
+ public function RegularPolygon($x0, $y0, $r, $ns, $angle = 0, $draw_circle = false, $style = '', $line_style = array(), $fill_color = array(), $circle_style = '', $circle_outLine_style = array(), $circle_fill_color = array())
+ {
if (3 > $ns) {
$ns = 3;
}
@@ -12047,27 +12292,28 @@ class TCPDF {
* @param $draw_circle: (boolean) Draw inscribed circle or not. Default value is false.
* @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
* @param $line_style (array) Line style of polygon sides. Array with keys among the following:
- *
- * - all: Line style of all sides. Array like for
- * SetLineStyle().
- * - 0 to (n - 1): Line style of each side. Array like for SetLineStyle().
- *
- * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
+ *
+ * - all: Line style of all sides. Array like for
+ * SetLineStyle().
+ * - 0 to (n - 1): Line style of each side. Array like for SetLineStyle().
+ *
+ * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
* @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
* @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
- *
- * - D or empty string: Draw (default).
- * - F: Fill.
- * - DF or FD: Draw and fill.
- * - CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).
- * - CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).
- *
+ *
+ * - D or empty string: Draw (default).
+ * - F: Fill.
+ * - DF or FD: Draw and fill.
+ * - CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).
+ * - CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).
+ *
* @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
* @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
* @public
* @since 2.1.000 (2008-01-08)
*/
- public function StarPolygon($x0, $y0, $r, $nv, $ng, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
+ public function StarPolygon($x0, $y0, $r, $nv, $ng, $angle = 0, $draw_circle = false, $style = '', $line_style = array(), $fill_color = array(), $circle_style = '', $circle_outLine_style = array(), $circle_fill_color = array())
+ {
if ($nv < 2) {
$nv = 2;
}
@@ -12109,7 +12355,8 @@ class TCPDF {
* @public
* @since 2.1.000 (2008-01-08)
*/
- public function RoundedRect($x, $y, $w, $h, $r, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
+ public function RoundedRect($x, $y, $w, $h, $r, $round_corner = '1111', $style = '', $border_style = array(), $fill_color = array())
+ {
$this->RoundedRectXY($x, $y, $w, $h, $r, $r, $round_corner, $style, $border_style, $fill_color);
}
@@ -12128,7 +12375,8 @@ class TCPDF {
* @public
* @since 4.9.019 (2010-04-22)
*/
- public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
+ public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner = '1111', $style = '', $border_style = array(), $fill_color = array())
+ {
if ($this->state != 2) {
return;
}
@@ -12198,7 +12446,8 @@ class TCPDF {
* @author Piotr Galecki, Nicola Asuni, Andy Meier
* @since 4.6.018 (2009-07-10)
*/
- public function Arrow($x0, $y0, $x1, $y1, $head_style=0, $arm_size=5, $arm_angle=15) {
+ public function Arrow($x0, $y0, $x1, $y1, $head_style = 0, $arm_size = 5, $arm_angle = 15)
+ {
// getting arrow direction angle
// 0 deg angle is when both arms go along X axis. angle grows clockwise.
$dir_angle = atan2(($y0 - $y1), ($x0 - $x1));
@@ -12263,7 +12512,8 @@ class TCPDF {
* @author Christian Deligant, Nicola Asuni
* @since 5.9.097 (2011-06-23)
*/
- public function setDestination($name, $y=-1, $page='', $x=-1) {
+ public function setDestination($name, $y = -1, $page = '', $x = -1)
+ {
// remove unsupported characters
$name = TCPDF_STATIC::encodeNameObject($name);
if (TCPDF_STATIC::empty_string($name)) {
@@ -12306,7 +12556,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 5.9.097 (2011-06-23)
*/
- public function getDestination() {
+ public function getDestination()
+ {
return $this->dests;
}
@@ -12316,13 +12567,14 @@ class TCPDF {
* @author Johannes G\FCntert, Nicola Asuni
* @since 5.9.098 (2011-06-23)
*/
- protected function _putdests() {
+ protected function _putdests()
+ {
if (empty($this->dests)) {
return;
}
$this->n_dests = $this->_newobj();
$out = ' <<';
- foreach($this->dests as $name => $o) {
+ foreach ($this->dests as $name => $o) {
$out .= ' /'.$name.' '.sprintf('[%u 0 R /XYZ %F %F null]', $this->page_obj_id[($o['p'])], ($o['x'] * $this->k), ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
}
$out .= ' >>';
@@ -12342,7 +12594,8 @@ class TCPDF {
* @param $link (mixed) URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
* @public
*/
- public function setBookmark($txt, $level=0, $y=-1, $page='', $style='', $color=array(0,0,0), $x=-1, $link='') {
+ public function setBookmark($txt, $level = 0, $y = -1, $page = '', $style = '', $color = array(0,0,0), $x = -1, $link = '')
+ {
$this->Bookmark($txt, $level, $y, $page, $style, $color, $x, $link);
}
@@ -12359,7 +12612,8 @@ class TCPDF {
* @public
* @since 2.1.002 (2008-02-12)
*/
- public function Bookmark($txt, $level=0, $y=-1, $page='', $style='', $color=array(0,0,0), $x=-1, $link='') {
+ public function Bookmark($txt, $level = 0, $y = -1, $page = '', $style = '', $color = array(0,0,0), $x = -1, $link = '')
+ {
if ($level < 0) {
$level = 0;
}
@@ -12406,7 +12660,8 @@ class TCPDF {
* @protected
* @since 5.9.119 (2011-09-19)
*/
- protected function sortBookmarks() {
+ protected function sortBookmarks()
+ {
// get sorting columns
$outline_p = array();
$outline_y = array();
@@ -12424,7 +12679,8 @@ class TCPDF {
* @author Olivier Plathey, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
- protected function _putbookmarks() {
+ protected function _putbookmarks()
+ {
$nb = count($this->outlines);
if ($nb == 0) {
return;
@@ -12550,7 +12806,8 @@ class TCPDF {
* @author Johannes G\FCntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
- public function IncludeJS($script) {
+ public function IncludeJS($script)
+ {
$this->javascript .= $script;
}
@@ -12563,7 +12820,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
*/
- public function addJavascriptObject($script, $onload=false) {
+ public function addJavascriptObject($script, $onload = false)
+ {
if ($this->pdfa_mode) {
// javascript is not allowed in PDF/A mode
return false;
@@ -12579,7 +12837,8 @@ class TCPDF {
* @author Johannes G\FCntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
- protected function _putjavascript() {
+ protected function _putjavascript()
+ {
if ($this->pdfa_mode OR (empty($this->javascript) AND empty($this->js_objects))) {
return;
}
@@ -12637,7 +12896,8 @@ class TCPDF {
* @author Denis Van Nuffelen, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
- protected function _addfield($type, $name, $x, $y, $w, $h, $prop) {
+ protected function _addfield($type, $name, $x, $y, $w, $h, $prop)
+ {
if ($this->rtl) {
$x = $x - $w;
}
@@ -12646,7 +12906,7 @@ class TCPDF {
$k = $this->k;
$this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%u,[%F,%F,%F,%F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
$this->javascript .= 'f'.$name.'.textSize='.$this->FontSizePt.";\n";
- foreach($prop as $key => $val) {
+ foreach ($prop as $key => $val) {
if (strcmp(substr($key, -5), 'Color') == 0) {
$val = TCPDF_COLORS::_JScolor($val);
} else {
@@ -12673,7 +12933,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-06)
*/
- public function setFormDefaultProp($prop=array()) {
+ public function setFormDefaultProp($prop = array())
+ {
$this->default_form_prop = $prop;
}
@@ -12684,7 +12945,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-06)
*/
- public function getFormDefaultProp() {
+ public function getFormDefaultProp()
+ {
return $this->default_form_prop;
}
@@ -12702,7 +12964,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
*/
- public function TextField($name, $w, $h, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+ public function TextField($name, $w, $h, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+ {
if ($x === '') {
$x = $this->x;
}
@@ -12823,7 +13086,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
*/
- public function RadioButton($name, $w, $prop=array(), $opt=array(), $onvalue='On', $checked=false, $x='', $y='', $js=false) {
+ public function RadioButton($name, $w, $prop = array(), $opt = array(), $onvalue = 'On', $checked = false, $x = '', $y = '', $js = false)
+ {
if ($x === '') {
$x = $this->x;
}
@@ -12926,7 +13190,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
*/
- public function ListBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+ public function ListBox($name, $w, $h, $values, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+ {
if ($x === '') {
$x = $this->x;
}
@@ -12960,7 +13225,7 @@ class TCPDF {
$popt['ap'] = array();
$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
$text = '';
- foreach($values as $item) {
+ foreach ($values as $item) {
if (is_array($item)) {
$text .= $item[1]."\n";
} else {
@@ -13012,7 +13277,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
*/
- public function ComboBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+ public function ComboBox($name, $w, $h, $values, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+ {
if ($x === '') {
$x = $this->x;
}
@@ -13047,7 +13313,7 @@ class TCPDF {
$popt['ap'] = array();
$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
$text = '';
- foreach($values as $item) {
+ foreach ($values as $item) {
if (is_array($item)) {
$text .= $item[1]."\n";
} else {
@@ -13099,7 +13365,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
*/
- public function CheckBox($name, $w, $checked=false, $prop=array(), $opt=array(), $onvalue='Yes', $x='', $y='', $js=false) {
+ public function CheckBox($name, $w, $checked = false, $prop = array(), $opt = array(), $onvalue = 'Yes', $x = '', $y = '', $js = false)
+ {
if ($x === '') {
$x = $this->x;
}
@@ -13179,7 +13446,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.000 (2009-09-07)
*/
- public function Button($name, $w, $h, $caption, $action, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+ public function Button($name, $w, $h, $caption, $action, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+ {
if ($x === '') {
$x = $this->x;
}
@@ -13346,7 +13614,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.6.008 (2009-05-07)
*/
- protected function _putsignature() {
+ protected function _putsignature()
+ {
if ((!$this->sign) OR (!isset($this->signature_data['cert_type']))) {
return;
}
@@ -13428,20 +13697,21 @@ class TCPDF {
* @param $form (string) Names specifying additional form-field-related usage rights for the document. Valid names are: /Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate
* @param $signature (string) Names specifying additional signature-related usage rights for the document. The only defined value is /Modify, which permits a user to apply a digital signature to an existing signature form field or clear a signed signature form field.
* @param $ef (string) Names specifying additional usage rights for named embedded files in the document. Valid names are /Create/Delete/Modify/Import, which permit the user to perform the named operation on named embedded files
- Names specifying additional embedded-files-related usage rights for the document.
+ Names specifying additional embedded-files-related usage rights for the document.
* @param $formex (string) Names specifying additional form-field-related usage rights. The only valid name is BarcodePlaintext, which permits text form field data to be encoded as a plaintext two-dimensional barcode.
* @public
* @author Nicola Asuni
* @since 2.9.000 (2008-03-26)
*/
public function setUserRights(
- $enable=true,
- $document='/FullSave',
- $annots='/Create/Delete/Modify/Copy/Import/Export',
- $form='/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate',
- $signature='/Modify',
- $ef='/Create/Delete/Modify/Import',
- $formex='') {
+ $enable = true,
+ $document = '/FullSave',
+ $annots = '/Create/Delete/Modify/Copy/Import/Export',
+ $form = '/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate',
+ $signature = '/Modify',
+ $ef = '/Create/Delete/Modify/Import',
+ $formex = ''
+ ) {
$this->ur['enabled'] = $enable;
$this->ur['document'] = $document;
$this->ur['annots'] = $annots;
@@ -13471,7 +13741,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.6.005 (2009-04-24)
*/
- public function setSignature($signing_cert='', $private_key='', $private_key_password='', $extracerts='', $cert_type=2, $info=array(), $approval='') {
+ public function setSignature($signing_cert = '', $private_key = '', $private_key_password = '', $extracerts = '', $cert_type = 2, $info = array(), $approval = '')
+ {
// to create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
// to export crt to p12: openssl pkcs12 -export -in tcpdf.crt -out tcpdf.p12
// to convert pfx certificate to pem: openssl
@@ -13508,7 +13779,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 5.3.011 (2010-06-17)
*/
- public function setSignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
+ public function setSignatureAppearance($x = 0, $y = 0, $w = 0, $h = 0, $page = -1, $name = '')
+ {
$this->signature_appearance = $this->getSignatureAppearanceArray($x, $y, $w, $h, $page, $name);
}
@@ -13524,7 +13796,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 5.9.101 (2011-07-06)
*/
- public function addEmptySignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
+ public function addEmptySignatureAppearance($x = 0, $y = 0, $w = 0, $h = 0, $page = -1, $name = '')
+ {
++$this->n;
$this->empty_signature_appearance[] = array('objid' => $this->n) + $this->getSignatureAppearanceArray($x, $y, $w, $h, $page, $name);
}
@@ -13542,7 +13815,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 5.9.101 (2011-07-06)
*/
- protected function getSignatureAppearanceArray($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
+ protected function getSignatureAppearanceArray($x = 0, $y = 0, $w = 0, $h = 0, $page = -1, $name = '')
+ {
$sigapp = array();
if (($page < 1) OR ($page > $this->numpages)) {
$sigapp['page'] = $this->page;
@@ -13574,7 +13848,8 @@ class TCPDF {
* @author Richard Stockinger
* @since 6.0.090 (2014-06-16)
*/
- public function setTimeStamp($tsa_host='', $tsa_username='', $tsa_password='', $tsa_cert='') {
+ public function setTimeStamp($tsa_host = '', $tsa_username = '', $tsa_password = '', $tsa_cert = '')
+ {
$this->tsa_data = array();
if (!function_exists('curl_init')) {
$this->Error('Please enable cURL PHP extension!');
@@ -13602,7 +13877,8 @@ class TCPDF {
* @author Richard Stockinger
* @since 6.0.090 (2014-06-16)
*/
- protected function applyTSA($signature) {
+ protected function applyTSA($signature)
+ {
if (!$this->tsa_timestamp) {
return $signature;
}
@@ -13617,7 +13893,8 @@ class TCPDF {
* @public
* @since 3.0.000 (2008-03-27)
*/
- public function startPageGroup($page='') {
+ public function startPageGroup($page = '')
+ {
if (empty($page)) {
$page = $this->page + 1;
}
@@ -13630,7 +13907,8 @@ class TCPDF {
* @since 5.9.093 (2011-06-16)
* @public
*/
- public function setStartingPageNumber($num=1) {
+ public function setStartingPageNumber($num = 1)
+ {
$this->starting_page_number = max(0, intval($num));
}
@@ -13641,7 +13919,8 @@ class TCPDF {
* @since 5.9.099 (2011-06-27)
* @public
*/
- public function getAliasRightShift() {
+ public function getAliasRightShift()
+ {
// calculate aproximatively the ratio between widths of aliases and replacements.
$ref = '{'.TCPDF_STATIC::$alias_right_shift.'}{'.TCPDF_STATIC::$alias_tot_pages.'}{'.TCPDF_STATIC::$alias_num_page.'}';
$rep = str_repeat(' ', $this->GetNumChars($ref));
@@ -13667,7 +13946,8 @@ class TCPDF {
* @since 4.0.018 (2008-08-08)
* @public
*/
- public function getAliasNbPages() {
+ public function getAliasNbPages()
+ {
if ($this->isUnicodeFont()) {
return '{'.TCPDF_STATIC::$alias_tot_pages.'}';
}
@@ -13682,7 +13962,8 @@ class TCPDF {
* @since 4.5.000 (2009-01-02)
* @public
*/
- public function getAliasNumPage() {
+ public function getAliasNumPage()
+ {
if ($this->isUnicodeFont()) {
return '{'.TCPDF_STATIC::$alias_num_page.'}';
}
@@ -13697,7 +13978,8 @@ class TCPDF {
* @public
* @since 3.0.000 (2008-03-27)
*/
- public function getPageGroupAlias() {
+ public function getPageGroupAlias()
+ {
if ($this->isUnicodeFont()) {
return '{'.TCPDF_STATIC::$alias_group_tot_pages.'}';
}
@@ -13712,7 +13994,8 @@ class TCPDF {
* @public
* @since 4.5.000 (2009-01-02)
*/
- public function getPageNumGroupAlias() {
+ public function getPageNumGroupAlias()
+ {
if ($this->isUnicodeFont()) {
return '{'.TCPDF_STATIC::$alias_group_num_page.'}';
}
@@ -13725,7 +14008,8 @@ class TCPDF {
* @public
* @since 3.0.000 (2008-03-27)
*/
- public function getGroupPageNo() {
+ public function getGroupPageNo()
+ {
return $this->pagegroups[$this->currpagegroup];
}
@@ -13735,7 +14019,8 @@ class TCPDF {
* @since 4.3.003 (2008-11-18)
* @see PaneNo(), formatPageNumber()
*/
- public function getGroupPageNoFormatted() {
+ public function getGroupPageNoFormatted()
+ {
return TCPDF_STATIC::formatPageNumber($this->getGroupPageNo());
}
@@ -13745,7 +14030,8 @@ class TCPDF {
* @since 4.2.005 (2008-11-06)
* @see PaneNo(), formatPageNumber()
*/
- public function PageNoFormatted() {
+ public function PageNoFormatted()
+ {
return TCPDF_STATIC::formatPageNumber($this->PageNo());
}
@@ -13754,7 +14040,8 @@ class TCPDF {
* @protected
* @since 3.0.000 (2008-03-27)
*/
- protected function _putocg() {
+ protected function _putocg()
+ {
if (empty($this->pdflayers)) {
return;
}
@@ -13763,9 +14050,9 @@ class TCPDF {
$out = '<< /Type /OCG';
$out .= ' /Name '.$this->_textstring($layer['name'], $this->pdflayers[$key]['objid']);
$out .= ' /Usage <<';
- if (isset($layer['print']) AND ($layer['print'] !== NULL)) {
+ if (isset($layer['print']) AND ($layer['print'] !== null)) {
$out .= ' /Print <>';
- }
+ }
$out .= ' /View <>';
$out .= ' >> >>';
$out .= "\n".'endobj';
@@ -13782,7 +14069,8 @@ class TCPDF {
* @public
* @since 5.9.102 (2011-07-13)
*/
- public function startLayer($name='', $print=true, $view=true, $lock=true) {
+ public function startLayer($name = '', $print = true, $view = true, $lock = true)
+ {
if ($this->state != 2) {
return;
}
@@ -13802,7 +14090,8 @@ class TCPDF {
* @public
* @since 5.9.102 (2011-07-13)
*/
- public function endLayer() {
+ public function endLayer()
+ {
if ($this->state != 2) {
return;
}
@@ -13821,12 +14110,13 @@ class TCPDF {
* @public
* @since 3.0.000 (2008-03-27)
*/
- public function setVisibility($v) {
+ public function setVisibility($v)
+ {
if ($this->state != 2) {
return;
}
$this->endLayer();
- switch($v) {
+ switch ($v) {
case 'print': {
$this->startLayer('Print', true, false);
break;
@@ -13854,7 +14144,8 @@ class TCPDF {
* @protected
* @since 3.0.000 (2008-03-27)
*/
- protected function addExtGState($parms) {
+ protected function addExtGState($parms)
+ {
if ($this->pdfa_mode) {
// transparencies are not allowed in PDF/A mode
return;
@@ -13885,7 +14176,8 @@ class TCPDF {
* @protected
* @since 3.0.000 (2008-03-27)
*/
- protected function setExtGState($gs) {
+ protected function setExtGState($gs)
+ {
if ($this->pdfa_mode OR ($this->state != 2)) {
// transparency is not allowed in PDF/A mode
return;
@@ -13898,7 +14190,8 @@ class TCPDF {
* @protected
* @since 3.0.000 (2008-03-27)
*/
- protected function _putextgstates() {
+ protected function _putextgstates()
+ {
foreach ($this->extgstates as $i => $ext) {
$this->extgstates[$i]['n'] = $this->_newobj();
$out = '<< /Type /ExtGState';
@@ -13927,7 +14220,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function setOverprint($stroking=true, $nonstroking='', $mode=0) {
+ public function setOverprint($stroking = true, $nonstroking = '', $mode = 0)
+ {
if ($this->state != 2) {
return;
}
@@ -13953,7 +14247,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function getOverprint() {
+ public function getOverprint()
+ {
return $this->overprint;
}
@@ -13966,7 +14261,8 @@ class TCPDF {
* @public
* @since 3.0.000 (2008-03-27)
*/
- public function setAlpha($stroking=1, $bm='Normal', $nonstroking='', $ais=false) {
+ public function setAlpha($stroking = 1, $bm = 'Normal', $nonstroking = '', $ais = false)
+ {
if ($this->pdfa_mode) {
// transparency is not allowed in PDF/A mode
return;
@@ -13998,7 +14294,8 @@ class TCPDF {
* @public
* @since 5.9.152 (2012-03-23)
*/
- public function getAlpha() {
+ public function getAlpha()
+ {
return $this->alpha;
}
@@ -14008,7 +14305,8 @@ class TCPDF {
* @public
* @since 3.0.000 (2008-03-27)
*/
- public function setJPEGQuality($quality) {
+ public function setJPEGQuality($quality)
+ {
if (($quality < 1) OR ($quality > 100)) {
$quality = 75;
}
@@ -14021,7 +14319,8 @@ class TCPDF {
* @public
* @since 3.0.014 (2008-06-04)
*/
- public function setDefaultTableColumns($cols=4) {
+ public function setDefaultTableColumns($cols = 4)
+ {
$this->default_table_columns = intval($cols);
}
@@ -14031,7 +14330,8 @@ class TCPDF {
* @public
* @since 3.0.014 (2008-06-04)
*/
- public function setCellHeightRatio($h) {
+ public function setCellHeightRatio($h)
+ {
$this->cell_height_ratio = $h;
}
@@ -14040,7 +14340,8 @@ class TCPDF {
* @public
* @since 4.0.012 (2008-07-24)
*/
- public function getCellHeightRatio() {
+ public function getCellHeightRatio()
+ {
return $this->cell_height_ratio;
}
@@ -14050,7 +14351,8 @@ class TCPDF {
* @public
* @since 3.1.000 (2008-06-09)
*/
- public function setPDFVersion($version='1.7') {
+ public function setPDFVersion($version = '1.7')
+ {
if ($this->pdfa_mode && $this->pdfa_version == 1 ) {
// PDF/A mode
$this->PDFVersion = '1.4';
@@ -14068,7 +14370,8 @@ class TCPDF {
* @public
* @since 3.1.000 (2008-06-09)
*/
- public function setViewerPreferences($preferences) {
+ public function setViewerPreferences($preferences)
+ {
$this->viewer_preferences = $preferences;
}
@@ -14085,7 +14388,8 @@ class TCPDF {
* @since 4.9.000 (2010-03-26)
* @public
*/
- public function colorRegistrationBar($x, $y, $w, $h, $transition=true, $vertical=false, $colors='A,R,G,B,C,M,Y,K') {
+ public function colorRegistrationBar($x, $y, $w, $h, $transition = true, $vertical = false, $colors = 'A,R,G,B,C,M,Y,K')
+ {
if (strpos($colors, 'ALLSPOT') !== false) {
// expand spot colors
$spot_colors = '';
@@ -14225,7 +14529,8 @@ class TCPDF {
* @since 4.9.000 (2010-03-26)
* @public
*/
- public function cropMark($x, $y, $w, $h, $type='T,R,B,L', $color=array(100,100,100,100,'All')) {
+ public function cropMark($x, $y, $w, $h, $type = 'T,R,B,L', $color = array(100,100,100,100,'All'))
+ {
$this->SetLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
$type = strtoupper($type);
$type = preg_replace('/[^A-Z\-\,]*/', '', $type);
@@ -14296,8 +14601,9 @@ class TCPDF {
* @since 4.9.000 (2010-03-26)
* @public
*/
- public function registrationMark($x, $y, $r, $double=false, $cola=array(100,100,100,100,'All'), $colb=array(0,0,0,0,'None')) {
- $line_style = array('width' => max((0.5 / $this->k),($r / 30)), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
+ public function registrationMark($x, $y, $r, $double = false, $cola = array(100,100,100,100,'All'), $colb = array(0,0,0,0,'None'))
+ {
+ $line_style = array('width' => max((0.5 / $this->k), ($r / 30)), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
$this->SetFillColorArray($cola);
$this->PieSector($x, $y, $r, 90, 180, 'F');
$this->PieSector($x, $y, $r, 270, 360, 'F');
@@ -14323,9 +14629,10 @@ class TCPDF {
* @since 6.0.038 (2013-09-30)
* @public
*/
- public function registrationMarkCMYK($x, $y, $r) {
+ public function registrationMarkCMYK($x, $y, $r)
+ {
// line width
- $lw = max((0.5 / $this->k),($r / 8));
+ $lw = max((0.5 / $this->k), ($r / 8));
// internal radius
$ri = ($r * 0.6);
// external radius
@@ -14367,7 +14674,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function LinearGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0,0,1,0)) {
+ public function LinearGradient($x, $y, $w, $h, $col1 = array(), $col2 = array(), $coords = array(0,0,1,0))
+ {
$this->Clip($x, $y, $w, $h);
$this->Gradient(2, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
}
@@ -14385,7 +14693,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function RadialGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0.5,0.5,0.5,0.5,1)) {
+ public function RadialGradient($x, $y, $w, $h, $col1 = array(), $col2 = array(), $coords = array(0.5,0.5,0.5,0.5,1))
+ {
$this->Clip($x, $y, $w, $h);
$this->Gradient(3, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
}
@@ -14408,7 +14717,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function CoonsPatchMesh($x, $y, $w, $h, $col1=array(), $col2=array(), $col3=array(), $col4=array(), $coords=array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min=0, $coords_max=1, $antialias=false) {
+ public function CoonsPatchMesh($x, $y, $w, $h, $col1 = array(), $col2 = array(), $col3 = array(), $col4 = array(), $coords = array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min = 0, $coords_max = 1, $antialias = false)
+ {
if ($this->pdfa_mode OR ($this->state != 2)) {
return;
}
@@ -14500,7 +14810,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @protected
*/
- protected function Clip($x, $y, $w, $h) {
+ protected function Clip($x, $y, $w, $h)
+ {
if ($this->state != 2) {
return;
}
@@ -14527,7 +14838,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function Gradient($type, $coords, $stops, $background=array(), $antialias=false) {
+ public function Gradient($type, $coords, $stops, $background = array(), $antialias = false)
+ {
if ($this->pdfa_mode OR ($this->state != 2)) {
return;
}
@@ -14541,7 +14853,7 @@ class TCPDF {
// color space
$numcolspace = count($stops[0]['color']);
$bcolor = array_values($background);
- switch($numcolspace) {
+ switch ($numcolspace) {
case 5: // SPOT
case 4: { // CMYK
$this->gradients[$n]['colspace'] = 'DeviceCMYK';
@@ -14598,7 +14910,7 @@ class TCPDF {
}
// set colors
$color = array_values($stop['color']);
- switch($numcolspace) {
+ switch ($numcolspace) {
case 5: // SPOT
case 4: { // CMYK
$this->gradients[$n]['colors'][$key]['color'] = sprintf('%F %F %F %F', $color[0]/100, $color[1]/100, $color[2]/100, $color[3]/100);
@@ -14634,7 +14946,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @protected
*/
- function _putshaders() {
+ function _putshaders()
+ {
if ($this->pdfa_mode) {
return;
}
@@ -14826,7 +15139,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function PieSector($xc, $yc, $r, $a, $b, $style='FD', $cw=true, $o=90) {
+ public function PieSector($xc, $yc, $r, $a, $b, $style = 'FD', $cw = true, $o = 90)
+ {
$this->PieSectorXY($xc, $yc, $r, $r, $a, $b, $style, $cw, $o);
}
@@ -14847,7 +15161,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function PieSectorXY($xc, $yc, $rx, $ry, $a, $b, $style='FD', $cw=false, $o=0, $nc=2) {
+ public function PieSectorXY($xc, $yc, $rx, $ry, $a, $b, $style = 'FD', $cw = false, $o = 0, $nc = 2)
+ {
if ($this->state != 2) {
return;
}
@@ -14891,7 +15206,8 @@ class TCPDF {
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false, $fixoutvals=false) {
+ public function ImageEps($file, $x = '', $y = '', $w = 0, $h = 0, $link = '', $useBoundingBox = true, $align = '', $palign = '', $border = 0, $fitonpage = false, $fixoutvals = false)
+ {
if ($this->state != 2) {
return;
}
@@ -14913,17 +15229,17 @@ class TCPDF {
} else { // EPS/AI file
$data = TCPDF_STATIC::fileGetContents($file);
}
- if ($data === FALSE) {
+ if ($data === false) {
$this->Error('EPS file not found: '.$file);
}
$regs = array();
// EPS/AI compatibility check (only checks files created by Adobe Illustrator!)
- preg_match("/%%Creator:([^\r\n]+)/", $data, $regs); # find Creator
+ preg_match("/%%Creator:([^\r\n]+)/", $data, $regs); // find Creator
if (count($regs) > 1) {
- $version_str = trim($regs[1]); # e.g. "Adobe Illustrator(R) 8.0"
+ $version_str = trim($regs[1]); // e.g. "Adobe Illustrator(R) 8.0"
if (strpos($version_str, 'Adobe Illustrator') !== false) {
$versexp = explode(' ', $version_str);
- $version = (float)array_pop($versexp);
+ $version = (float) array_pop($versexp);
if ($version >= 9) {
$this->Error('This version of Adobe Illustrator file is not supported: '.$file);
}
@@ -15178,7 +15494,7 @@ class TCPDF {
$this->Link($ximg, $y, $w, $h, $link, 0);
}
// set pointer to align the next text/objects
- switch($align) {
+ switch ($align) {
case 'T':{
$this->y = $y;
$this->x = $this->img_rb_x;
@@ -15210,7 +15526,8 @@ class TCPDF {
* @param $bc (string) barcode
* @public
*/
- public function setBarcode($bc='') {
+ public function setBarcode($bc = '')
+ {
$this->barcode = $bc;
}
@@ -15220,7 +15537,8 @@ class TCPDF {
* @public
* @since 4.0.012 (2008-07-24)
*/
- public function getBarcode() {
+ public function getBarcode()
+ {
return $this->barcode;
}
@@ -15234,31 +15552,32 @@ class TCPDF {
* @param $h (int) height in user units (empty string = remaining page height)
* @param $xres (float) width of the smallest bar in user units (empty string = default value = 0.4mm)
* @param $style (array) array of options:
- * - boolean $style['border'] if true prints a border
- * - int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)
- * - int $style['hpadding'] horizontal padding in user units (set to 'auto' for automatic padding)
- * - int $style['vpadding'] vertical padding in user units (set to 'auto' for automatic padding)
- * - array $style['fgcolor'] color array for bars and text
- * - mixed $style['bgcolor'] color array for background (set to false for transparent)
- * - boolean $style['text'] if true prints text below the barcode
- * - string $style['label'] override default label
- * - string $style['font'] font name for text
- int $style['fontsize'] font size for text
- * - int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing.
- * - string $style['position'] horizontal position of the containing barcode cell on the page: L = left margin; C = center; R = right margin.
- * - string $style['align'] horizontal position of the barcode on the containing rectangle: L = left; C = center; R = right.
- * - string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.
- * - string $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.
- * - string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.
+ * boolean $style['border'] if true prints a border
+ * int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)
+ * int $style['hpadding'] horizontal padding in user units (set to 'auto' for automatic padding)
+ * int $style['vpadding'] vertical padding in user units (set to 'auto' for automatic padding)
+ * array $style['fgcolor'] color array for bars and text
+ * mixed $style['bgcolor'] color array for background (set to false for transparent)
+ * boolean $style['text'] if true prints text below the barcode
+ * string $style['label'] override default label
+ * string $style['font'] font name for textint $style['fontsize'] font size for text
+ * int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing.
+ * string $style['position'] horizontal position of the containing barcode cell on the page: L = left margin; C = center; R = right margin.
+ * string $style['align'] horizontal position of the barcode on the containing rectangle: L = left; C = center; R = right.
+ * string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.
+ * string $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.
+ * string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.
* @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:- T: top-right for LTR or top-left for RTL
- M: middle-right for LTR or middle-left for RTL
- B: bottom-right for LTR or bottom-left for RTL
- N: next line
* @author Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
- public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style=array(), $align='') {
+ public function write1DBarcode($code, $type, $x = '', $y = '', $w = '', $h = '', $xres = '', $style = array(), $align = '')
+ {
if (TCPDF_STATIC::empty_string(trim($code))) {
return;
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_1d.php');
+ require_once dirname(__FILE__).'/tcpdf_barcodes_1d.php';
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -15521,7 +15840,7 @@ class TCPDF {
// restore previous settings
$this->setGraphicVars($gvars);
// set pointer to align the next text/objects
- switch($align) {
+ switch ($align) {
case 'T':{
$this->y = $y;
$this->x = $this->img_rb_x;
@@ -15557,26 +15876,27 @@ class TCPDF {
* @param $w (int) width in user units
* @param $h (int) height in user units
* @param $style (array) array of options:
- * - boolean $style['border'] if true prints a border around the barcode
- * - int $style['padding'] padding to leave around the barcode in barcode units (set to 'auto' for automatic padding)
- * - int $style['hpadding'] horizontal padding in barcode units (set to 'auto' for automatic padding)
- * - int $style['vpadding'] vertical padding in barcode units (set to 'auto' for automatic padding)
- * - int $style['module_width'] width of a single module in points
- * - int $style['module_height'] height of a single module in points
- * - array $style['fgcolor'] color array for bars and text
- * - mixed $style['bgcolor'] color array for background or false for transparent
- * - string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch
+ * - boolean $style['border'] if true prints a border around the barcode
+ * - int $style['padding'] padding to leave around the barcode in barcode units (set to 'auto' for automatic padding)
+ * - int $style['hpadding'] horizontal padding in barcode units (set to 'auto' for automatic padding)
+ * - int $style['vpadding'] vertical padding in barcode units (set to 'auto' for automatic padding)
+ * - int $style['module_width'] width of a single module in points
+ * - int $style['module_height'] height of a single module in points
+ * - array $style['fgcolor'] color array for bars and text
+ * - mixed $style['bgcolor'] color array for background or false for transparent
+ * - string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch
* @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:- T: top-right for LTR or top-left for RTL
- M: middle-right for LTR or middle-left for RTL
- B: bottom-right for LTR or bottom-left for RTL
- N: next line
* @param $distort (boolean) if true distort the barcode to fit width and height, otherwise preserve aspect ratio
* @author Nicola Asuni
* @since 4.5.037 (2009-04-07)
* @public
*/
- public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style=array(), $align='', $distort=false) {
+ public function write2DBarcode($code, $type, $x = '', $y = '', $w = '', $h = '', $style = array(), $align = '', $distort = false)
+ {
if (TCPDF_STATIC::empty_string(trim($code))) {
return;
}
- require_once(dirname(__FILE__).'/tcpdf_barcodes_2d.php');
+ require_once dirname(__FILE__).'/tcpdf_barcodes_2d.php';
// save current graphic settings
$gvars = $this->getGraphicVars();
// create new barcode object
@@ -15634,7 +15954,7 @@ class TCPDF {
// number of barcode columns and rows
$rows = $arrcode['num_rows'];
$cols = $arrcode['num_cols'];
- if (($rows <= 0) || ($cols <= 0)){
+ if (($rows <= 0) || ($cols <= 0)) {
$this->Error('Error in 2D barcode string');
}
// module width and height
@@ -15755,7 +16075,7 @@ class TCPDF {
// restore previous settings
$this->setGraphicVars($gvars);
// set pointer to align the next text/objects
- switch($align) {
+ switch ($align) {
case 'T':{
$this->y = $y;
$this->x = $this->img_rb_x;
@@ -15801,7 +16121,8 @@ class TCPDF {
* @public
* @since 3.2.000 (2008-06-23)
*/
- public function getMargins() {
+ public function getMargins()
+ {
$ret = array(
'left' => $this->lMargin,
'right' => $this->rMargin,
@@ -15828,7 +16149,8 @@ class TCPDF {
* @public
* @since 4.0.012 (2008-07-24)
*/
- public function getOriginalMargins() {
+ public function getOriginalMargins()
+ {
$ret = array(
'left' => $this->original_lMargin,
'right' => $this->original_rMargin
@@ -15842,7 +16164,8 @@ class TCPDF {
* @public
* @since 3.2.000 (2008-06-23)
*/
- public function getFontSize() {
+ public function getFontSize()
+ {
return $this->FontSize;
}
@@ -15852,7 +16175,8 @@ class TCPDF {
* @public
* @since 3.2.000 (2008-06-23)
*/
- public function getFontSizePt() {
+ public function getFontSizePt()
+ {
return $this->FontSizePt;
}
@@ -15862,7 +16186,8 @@ class TCPDF {
* @public
* @since 4.3.008 (2008-12-05)
*/
- public function getFontFamily() {
+ public function getFontFamily()
+ {
return $this->FontFamily;
}
@@ -15872,7 +16197,8 @@ class TCPDF {
* @public
* @since 4.3.008 (2008-12-05)
*/
- public function getFontStyle() {
+ public function getFontStyle()
+ {
return $this->FontStyle;
}
@@ -15888,7 +16214,8 @@ class TCPDF {
* @since 5.9.017 (2010-11-16)
* @see setHtmlVSpace()
*/
- public function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='') {
+ public function fixHTMLCode($html, $default_css = '', $tagvs = '', $tidy_options = '')
+ {
return TCPDF_STATIC::fixHTMLCode($html, $default_css, $tagvs, $tidy_options, $this->tagvspaces);
}
@@ -15899,7 +16226,8 @@ class TCPDF {
* @protected
* @since 5.7.000 (2010-08-02)
*/
- protected function getCSSBorderWidth($width) {
+ protected function getCSSBorderWidth($width)
+ {
if ($width == 'thin') {
$width = (2 / $this->k);
} elseif ($width == 'medium') {
@@ -15919,7 +16247,8 @@ class TCPDF {
* @protected
* @since 5.7.000 (2010-08-02)
*/
- protected function getCSSBorderDashStyle($style) {
+ protected function getCSSBorderDashStyle($style)
+ {
switch (strtolower($style)) {
case 'none':
case 'hidden': {
@@ -15955,7 +16284,8 @@ class TCPDF {
* @protected
* @since 5.7.000 (2010-08-02)
*/
- protected function getCSSBorderStyle($cssborder) {
+ protected function getCSSBorderStyle($cssborder)
+ {
$bprop = preg_split('/[\s]+/', trim($cssborder));
$border = array(); // value to be returned
switch (count($bprop)) {
@@ -16006,7 +16336,8 @@ class TCPDF {
* @public
* @since 5.9.000 (2010-10-04)
*/
- public function getCSSPadding($csspadding, $width=0) {
+ public function getCSSPadding($csspadding, $width = 0)
+ {
$padding = preg_split('/[\s]+/', trim($csspadding));
$cell_padding = array(); // value to be returned
switch (count($padding)) {
@@ -16060,7 +16391,8 @@ class TCPDF {
* @public
* @since 5.9.000 (2010-10-04)
*/
- public function getCSSMargin($cssmargin, $width=0) {
+ public function getCSSMargin($cssmargin, $width = 0)
+ {
$margin = preg_split('/[\s]+/', trim($cssmargin));
$cell_margin = array(); // value to be returned
switch (count($margin)) {
@@ -16114,7 +16446,8 @@ class TCPDF {
* @public
* @since 5.9.010 (2010-10-27)
*/
- public function getCSSBorderMargin($cssbspace, $width=0) {
+ public function getCSSBorderMargin($cssbspace, $width = 0)
+ {
$space = preg_split('/[\s]+/', trim($cssbspace));
$border_spacing = array(); // value to be returned
switch (count($space)) {
@@ -16148,7 +16481,8 @@ class TCPDF {
* @protected
* @since 5.9.000 (2010-10-02)
*/
- protected function getCSSFontSpacing($spacing, $parent=0) {
+ protected function getCSSFontSpacing($spacing, $parent = 0)
+ {
$val = 0; // value to be returned
$spacing = trim($spacing);
switch ($spacing) {
@@ -16179,7 +16513,8 @@ class TCPDF {
* @protected
* @since 5.9.000 (2010-10-02)
*/
- protected function getCSSFontStretching($stretch, $parent=100) {
+ protected function getCSSFontStretching($stretch, $parent = 100)
+ {
$val = 100; // value to be returned
$stretch = trim($stretch);
switch ($stretch) {
@@ -16251,7 +16586,8 @@ class TCPDF {
* @return float value in points
* @public
*/
- public function getHTMLFontUnits($val, $refsize=12, $parent_size=12, $defaultunit='pt') {
+ public function getHTMLFontUnits($val, $refsize = 12, $parent_size = 12, $defaultunit = 'pt')
+ {
$refsize = TCPDF_FONTS::getFontRefSize($refsize);
$parent_size = TCPDF_FONTS::getFontRefSize($parent_size, $refsize);
switch ($val) {
@@ -16305,7 +16641,8 @@ class TCPDF {
* @protected
* @since 3.2.000 (2008-06-20)
*/
- protected function getHtmlDomArray($html) {
+ protected function getHtmlDomArray($html)
+ {
// array of CSS styles ( selector => properties).
$css = array();
// get CSS array defined at previous call
@@ -16331,7 +16668,7 @@ class TCPDF {
if (preg_match('/href[\s]*=[\s]*"([^"]*)"/', $link, $type) > 0) {
// read CSS data file
$cssdata = TCPDF_STATIC::fileGetContents(trim($type[1]));
- if (($cssdata !== FALSE) AND (strlen($cssdata) > 0)) {
+ if (($cssdata !== false) AND (strlen($cssdata) > 0)) {
$css = array_merge($css, TCPDF_STATIC::extractCSSproperties($cssdata));
}
}
@@ -16608,9 +16945,9 @@ class TCPDF {
// get attributes
preg_match_all('/([^=\s]*)[\s]*=[\s]*"([^"]*)"/', $element, $attr_array, PREG_PATTERN_ORDER);
$dom[$key]['attribute'] = array(); // reset attribute array
- foreach($attr_array[1] as $id => $name) {
- $dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
- }
+ foreach ($attr_array[1] as $id => $name) {
+ $dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
+ }
if (!empty($css)) {
// merge CSS style to current style
list($dom[$key]['csssel'], $dom[$key]['cssdata']) = TCPDF_STATIC::getCSSdataArray($dom, $key, $css);
@@ -16621,10 +16958,10 @@ class TCPDF {
// get style attributes
preg_match_all('/([^;:\s]*):([^;]*)/', $dom[$key]['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
$dom[$key]['style'] = array(); // reset style attribute array
- foreach($style_array[1] as $id => $name) {
- // in case of duplicate attribute the last replace the previous
- $dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
- }
+ foreach ($style_array[1] as $id => $name) {
+ // in case of duplicate attribute the last replace the previous
+ $dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
+ }
// --- get some style attributes ---
// text direction
if (isset($dom[$key]['style']['direction'])) {
@@ -17093,7 +17430,8 @@ class TCPDF {
* @author Nicola Asuni
* @since 4.8.024 (2010-01-15)
*/
- protected function getSpaceString() {
+ protected function getSpaceString()
+ {
$spacestr = chr(32);
if ($this->isUnicodeFont()) {
$spacestr = chr(0).chr(32);
@@ -17107,7 +17445,8 @@ class TCPDF {
* @return string
* @public static
*/
- protected function getHashForTCPDFtagParams($data) {
+ protected function getHashForTCPDFtagParams($data)
+ {
return md5(strlen($data).$this->file_id.$data);
}
@@ -17117,7 +17456,8 @@ class TCPDF {
* @return string containing serialized data
* @public static
*/
- public function serializeTCPDFtagParameters($data) {
+ public function serializeTCPDFtagParameters($data)
+ {
$encoded = urlencode(json_encode($data));
return $this->getHashForTCPDFtagParams($encoded).$encoded;
}
@@ -17128,7 +17468,8 @@ class TCPDF {
* @return array containing unserialized data
* @protected static
*/
- protected function unserializeTCPDFtagParameters($data) {
+ protected function unserializeTCPDFtagParameters($data)
+ {
$hash = substr($data, 0, 32);
$encoded = substr($data, 32);
if ($hash != $this->getHashForTCPDFtagParams($encoded)) {
@@ -17150,8 +17491,7 @@ class TCPDF {
* @param $y (float) upper-left corner Y coordinate
* @param $html (string) html text to print. Default value: empty string.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:- 0: no border (default)
- 1: frame
or a string containing some or all of the following characters (in any order):- L: left
- T: top
- R: right
- B: bottom
or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
- * @param $ln (int) Indicates where the current position should go after the call. Possible values are:- 0: to the right (or left for RTL language)
- 1: to the beginning of the next line
- 2: below
-Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
+ * @param $ln (int) Indicates where the current position should go after the call. Possible values are:- 0: to the right (or left for RTL language)
- 1: to the beginning of the next line
- 2: below
Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
* @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
* @param $reseth (boolean) if true reset the last cell height (default true).
* @param $align (string) Allows to center or align the text. Possible values are:- L : left align
- C : center
- R : right align
- '' : empty string : left for LTR or right for RTL
@@ -17159,7 +17499,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @see Multicell(), writeHTML()
* @public
*/
- public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
+ public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
+ {
return $this->MultiCell($w, $h, $html, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0, 'T', false);
}
@@ -17176,7 +17517,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @param $align (string) Allows to center or align the text. Possible values are:- L : left align
- C : center
- R : right align
- '' : empty string : left for LTR or right for RTL
* @public
*/
- public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
+ public function writeHTML($html, $ln = true, $fill = false, $reseth = false, $cell = false, $align = '')
+ {
$gvars = $this->getGraphicVars();
// store current values
$prev_cell_margin = $this->cell_margin;
@@ -17834,7 +18176,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
// justify block
if (preg_match('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x', $pmid, $pmatch) == 1) {
- $newpmid = sprintf('%F',(floatval($pmatch[1]) + $spacew)).' '.$pmatch[2].' x*#!#*x'.$pmatch[3].$pmatch[4];
+ $newpmid = sprintf('%F', (floatval($pmatch[1]) + $spacew)).' '.$pmatch[2].' x*#!#*x'.$pmatch[3].$pmatch[4];
$pmid = str_replace($pmatch[0], $newpmid, $pmid);
unset($pmatch, $newpmid);
}
@@ -17879,8 +18221,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
}
if (preg_match('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x', $pmid, $pmatch) == 1) {
- $newx = sprintf('%F',(floatval($pmatch[1]) + $x_diff));
- $neww = sprintf('%F',(floatval($pmatch[3]) + $w_diff));
+ $newx = sprintf('%F', (floatval($pmatch[1]) + $x_diff));
+ $neww = sprintf('%F', (floatval($pmatch[3]) + $w_diff));
$newpmid = $newx.' '.$pmatch[2].' '.$neww.' '.$pmatch[4].' x*#!#*x'.$pmatch[5].$pmatch[6];
$pmid = str_replace($pmatch[0], $newpmid, $pmid);
unset($pmatch, $newpmid, $newx, $neww);
@@ -17896,9 +18238,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$currentxpos = $xmatches[1];
// justify block
if (preg_match('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$xmatches[4].')[\s]('.$xmatches[5].')[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x', $pmid, $pmatch) == 1) {
- $newx1 = sprintf('%F',(floatval($pmatch[1]) + $spacew));
- $newx2 = sprintf('%F',(floatval($pmatch[3]) + $spacew));
- $newx3 = sprintf('%F',(floatval($pmatch[5]) + $spacew));
+ $newx1 = sprintf('%F', (floatval($pmatch[1]) + $spacew));
+ $newx2 = sprintf('%F', (floatval($pmatch[3]) + $spacew));
+ $newx3 = sprintf('%F', (floatval($pmatch[5]) + $spacew));
$newpmid = $newx1.' '.$pmatch[2].' '.$newx2.' '.$pmatch[4].' '.$newx3.' '.$pmatch[6].' x*#!#*x'.$pmatch[7].$pmatch[8];
$pmid = str_replace($pmatch[0], $newpmid, $pmid);
unset($pmatch, $newpmid, $newx1, $newx2, $newx3);
@@ -17950,13 +18292,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$pmid = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmid);
$pmid = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmid);
if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmid, $pamatch) > 0) {
- foreach($pamatch[0] as $pk => $pmatch) {
+ foreach ($pamatch[0] as $pk => $pmatch) {
$replace = $pamatch[1][$pk];
$replace = str_replace('#!#OP#!#', '(', $replace);
$replace = str_replace('#!#CP#!#', ')', $replace);
$newpmid = '[('.str_replace(chr(0).chr(32), ') '.sprintf('%F', $spacew).' (', $replace).')]';
$pos = strpos($pmid, $pmatch, $pos);
- if ($pos !== FALSE) {
+ if ($pos !== false) {
$pmid = substr_replace($pmid, $newpmid, $pos, strlen($pmatch));
}
++$pos;
@@ -18529,8 +18871,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} else {
$loop = 0;
// add the positive font spacing of the last character (if any)
- if ($this->font_spacing > 0) {
- if ($this->rtl) {
+ if ($this->font_spacing > 0) {
+ if ($this->rtl) {
$this->x -= $this->font_spacing;
} else {
$this->x += $this->font_spacing;
@@ -18734,7 +19076,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @return $dom array
* @protected
*/
- protected function openHTMLTagHandler($dom, $key, $cell) {
+ protected function openHTMLTagHandler($dom, $key, $cell)
+ {
$tag = $dom[$key];
$parent = $dom[($dom[$key]['parent'])];
$firsttag = ($key == 1);
@@ -18799,7 +19142,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
}
// Opening tag
- switch($tag['value']) {
+ switch ($tag['value']) {
case 'table': {
$cp = 0;
$cs = 0;
@@ -18900,8 +19243,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// convert URL to server path
$imgsrc = str_replace(K_PATH_MAIN, K_PATH_URL, $imgsrc);
}
- }
- elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
+ } elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
// fix image path
$findroot = strpos($imgsrc, $_SERVER['DOCUMENT_ROOT']);
if (($findroot === false) OR ($findroot > 1)) {
@@ -18936,7 +19278,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// further development is required for other modes.
$tag['attribute']['align'] = 'bottom';
//}
- switch($tag['attribute']['align']) {
+ switch ($tag['attribute']['align']) {
case 'top': {
$align = 'T';
break;
@@ -18997,7 +19339,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} else {
$this->Image($imgsrc, $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
}
- switch($align) {
+ switch ($align) {
case 'T': {
$this->y = $prevy;
break;
@@ -19440,7 +19782,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @return $dom array
* @protected
*/
- protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney=0) {
+ protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney = 0)
+ {
$tag = $dom[$key];
$parent = $dom[($dom[$key]['parent'])];
$lasttag = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker')));
@@ -19481,7 +19824,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
}
// Closing tag
- switch($tag['value']) {
+ switch ($tag['value']) {
case 'tr': {
$table_el = $dom[($dom[$key]['parent'])]['parent'];
if (!isset($parent['endy'])) {
@@ -19570,394 +19913,394 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// closing tag used for the thead part
$in_table_head = true;
$this->inthead = false;
- case 'table': {
- $table_el = $parent;
- // set default border
- if (isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0)) {
+ case 'table': {
+ $table_el = $parent;
// set default border
- $border = array('LTRB' => array('width' => $this->getCSSBorderWidth($table_el['attribute']['border']), 'cap'=>'square', 'join'=>'miter', 'dash'=> 0, 'color'=>array(0,0,0)));
- } else {
- $border = 0;
- }
- $default_border = $border;
- // fix bottom line alignment of last line before page break
- foreach ($dom[($dom[$key]['parent'])]['trids'] as $j => $trkey) {
- // update row-spanned cells
- if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
- foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
- if (isset($prevtrkey) AND ($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] > 0)) {
- $dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] = $trkey;
- }
- if ($dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] == $trkey) {
- $dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] -= 1;
- }
- }
+ if (isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0)) {
+ // set default border
+ $border = array('LTRB' => array('width' => $this->getCSSBorderWidth($table_el['attribute']['border']), 'cap'=>'square', 'join'=>'miter', 'dash'=> 0, 'color'=>array(0,0,0)));
+ } else {
+ $border = 0;
}
- if (isset($prevtrkey) AND ($dom[$trkey]['startpage'] > $dom[$prevtrkey]['endpage'])) {
- $pgendy = $this->pagedim[$dom[$prevtrkey]['endpage']]['hk'] - $this->pagedim[$dom[$prevtrkey]['endpage']]['bm'];
- $dom[$prevtrkey]['endy'] = $pgendy;
+ $default_border = $border;
+ // fix bottom line alignment of last line before page break
+ foreach ($dom[($dom[$key]['parent'])]['trids'] as $j => $trkey) {
// update row-spanned cells
if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
- if (($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
- $dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
- $dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
+ if (isset($prevtrkey) AND ($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] > 0)) {
+ $dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] = $trkey;
+ }
+ if ($dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] == $trkey) {
+ $dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] -= 1;
}
}
}
- }
- $prevtrkey = $trkey;
- $table_el = $dom[($dom[$key]['parent'])];
- }
- // for each row
- if (count($table_el['trids']) > 0) {
- unset($xmax);
- }
- foreach ($table_el['trids'] as $j => $trkey) {
- $parent = $dom[$trkey];
- if (!isset($xmax)) {
- $xmax = $parent['cellpos'][(count($parent['cellpos']) - 1)]['endx'];
- }
- // for each cell on the row
- foreach ($parent['cellpos'] as $k => $cellpos) {
- if (isset($cellpos['rowspanid']) AND ($cellpos['rowspanid'] >= 0)) {
- $cellpos['startx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['startx'];
- $cellpos['endx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['endx'];
- $endy = $table_el['rowspans'][($cellpos['rowspanid'])]['endy'];
- $startpage = $table_el['rowspans'][($cellpos['rowspanid'])]['startpage'];
- $endpage = $table_el['rowspans'][($cellpos['rowspanid'])]['endpage'];
- $startcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['startcolumn'];
- $endcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['endcolumn'];
- } else {
- $endy = $parent['endy'];
- $startpage = $parent['startpage'];
- $endpage = $parent['endpage'];
- $startcolumn = $parent['startcolumn'];
- $endcolumn = $parent['endcolumn'];
- }
- if ($this->num_columns == 0) {
- $this->num_columns = 1;
- }
- if (isset($cellpos['border'])) {
- $border = $cellpos['border'];
- }
- if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
- $this->SetFillColorArray($cellpos['bgcolor']);
- $fill = true;
- } else {
- $fill = false;
- }
- $x = $cellpos['startx'];
- $y = $parent['starty'];
- $starty = $y;
- $w = abs($cellpos['endx'] - $cellpos['startx']);
- // get border modes
- $border_start = TCPDF_STATIC::getBorderMode($border, $position='start', $this->opencell);
- $border_end = TCPDF_STATIC::getBorderMode($border, $position='end', $this->opencell);
- $border_middle = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
- // design borders around HTML cells.
- for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
- $ccode = '';
- $this->setPage($page);
- if ($this->num_columns < 2) {
- // single-column mode
- $this->x = $x;
- $this->y = $this->tMargin;
- }
- // account for margin changes
- if ($page > $startpage) {
- if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
- $this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
- } elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
- $this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
+ if (isset($prevtrkey) AND ($dom[$trkey]['startpage'] > $dom[$prevtrkey]['endpage'])) {
+ $pgendy = $this->pagedim[$dom[$prevtrkey]['endpage']]['hk'] - $this->pagedim[$dom[$prevtrkey]['endpage']]['bm'];
+ $dom[$prevtrkey]['endy'] = $pgendy;
+ // update row-spanned cells
+ if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
+ foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
+ if (($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
+ $dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
+ $dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
+ }
}
}
- if ($startpage == $endpage) { // single page
- $deltacol = 0;
- $deltath = 0;
- for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
- $this->selectColumn($column);
- if ($startcolumn == $endcolumn) { // single column
- $cborder = $border;
- $h = $endy - $parent['starty'];
- $this->y = $y;
- $this->x = $x;
- } elseif ($column == $startcolumn) { // first column
- $cborder = $border_start;
- $this->y = $starty;
- $this->x = $x;
- $h = $this->h - $this->y - $this->bMargin;
- if ($this->rtl) {
- $deltacol = $this->x + $this->rMargin - $this->w;
- } else {
- $deltacol = $this->x - $this->lMargin;
- }
- } elseif ($column == $endcolumn) { // end column
- $cborder = $border_end;
- if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
- $this->y = $this->columns[$column]['th']['\''.$page.'\''];
- }
- $this->x += $deltacol;
- $h = $endy - $this->y;
- } else { // middle column
- $cborder = $border_middle;
- if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
- $this->y = $this->columns[$column]['th']['\''.$page.'\''];
- }
- $this->x += $deltacol;
- $h = $this->h - $this->y - $this->bMargin;
- }
- $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
- } // end for each column
- } elseif ($page == $startpage) { // first page
- $deltacol = 0;
- $deltath = 0;
- for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
- $this->selectColumn($column);
- if ($column == $startcolumn) { // first column
- $cborder = $border_start;
- $this->y = $starty;
- $this->x = $x;
- $h = $this->h - $this->y - $this->bMargin;
- if ($this->rtl) {
- $deltacol = $this->x + $this->rMargin - $this->w;
- } else {
- $deltacol = $this->x - $this->lMargin;
- }
- } else { // middle column
- $cborder = $border_middle;
- if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
- $this->y = $this->columns[$column]['th']['\''.$page.'\''];
- }
- $this->x += $deltacol;
- $h = $this->h - $this->y - $this->bMargin;
- }
- $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
- } // end for each column
- } elseif ($page == $endpage) { // last page
- $deltacol = 0;
- $deltath = 0;
- for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
- $this->selectColumn($column);
- if ($column == $endcolumn) { // end column
- $cborder = $border_end;
- if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
- $this->y = $this->columns[$column]['th']['\''.$page.'\''];
- }
- $this->x += $deltacol;
- $h = $endy - $this->y;
- } else { // middle column
- $cborder = $border_middle;
- if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
- $this->y = $this->columns[$column]['th']['\''.$page.'\''];
- }
- $this->x += $deltacol;
- $h = $this->h - $this->y - $this->bMargin;
- }
- $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
- } // end for each column
- } else { // middle page
- $deltacol = 0;
- $deltath = 0;
- for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
- $this->selectColumn($column);
- $cborder = $border_middle;
- if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
- $this->y = $this->columns[$column]['th']['\''.$page.'\''];
- }
- $this->x += $deltacol;
- $h = $this->h - $this->y - $this->bMargin;
- $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
- } // end for each column
+ }
+ $prevtrkey = $trkey;
+ $table_el = $dom[($dom[$key]['parent'])];
+ }
+ // for each row
+ if (count($table_el['trids']) > 0) {
+ unset($xmax);
+ }
+ foreach ($table_el['trids'] as $j => $trkey) {
+ $parent = $dom[$trkey];
+ if (!isset($xmax)) {
+ $xmax = $parent['cellpos'][(count($parent['cellpos']) - 1)]['endx'];
+ }
+ // for each cell on the row
+ foreach ($parent['cellpos'] as $k => $cellpos) {
+ if (isset($cellpos['rowspanid']) AND ($cellpos['rowspanid'] >= 0)) {
+ $cellpos['startx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['startx'];
+ $cellpos['endx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['endx'];
+ $endy = $table_el['rowspans'][($cellpos['rowspanid'])]['endy'];
+ $startpage = $table_el['rowspans'][($cellpos['rowspanid'])]['startpage'];
+ $endpage = $table_el['rowspans'][($cellpos['rowspanid'])]['endpage'];
+ $startcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['startcolumn'];
+ $endcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['endcolumn'];
+ } else {
+ $endy = $parent['endy'];
+ $startpage = $parent['startpage'];
+ $endpage = $parent['endpage'];
+ $startcolumn = $parent['startcolumn'];
+ $endcolumn = $parent['endcolumn'];
}
- if (!empty($cborder) OR !empty($fill)) {
- $offsetlen = strlen($ccode);
- // draw border and fill
- if ($this->inxobj) {
- // we are inside an XObject template
- if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
- $pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
- $pagemark = $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
- $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey] += $offsetlen;
- } else {
- $pagemark = $this->xobjects[$this->xobjid]['intmrk'];
- $this->xobjects[$this->xobjid]['intmrk'] += $offsetlen;
+ if ($this->num_columns == 0) {
+ $this->num_columns = 1;
+ }
+ if (isset($cellpos['border'])) {
+ $border = $cellpos['border'];
+ }
+ if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
+ $this->SetFillColorArray($cellpos['bgcolor']);
+ $fill = true;
+ } else {
+ $fill = false;
+ }
+ $x = $cellpos['startx'];
+ $y = $parent['starty'];
+ $starty = $y;
+ $w = abs($cellpos['endx'] - $cellpos['startx']);
+ // get border modes
+ $border_start = TCPDF_STATIC::getBorderMode($border, $position='start', $this->opencell);
+ $border_end = TCPDF_STATIC::getBorderMode($border, $position='end', $this->opencell);
+ $border_middle = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
+ // design borders around HTML cells.
+ for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
+ $ccode = '';
+ $this->setPage($page);
+ if ($this->num_columns < 2) {
+ // single-column mode
+ $this->x = $x;
+ $this->y = $this->tMargin;
+ }
+ // account for margin changes
+ if ($page > $startpage) {
+ if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
+ $this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
+ } elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
+ $this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
}
- $pagebuff = $this->xobjects[$this->xobjid]['outdata'];
- $pstart = substr($pagebuff, 0, $pagemark);
- $pend = substr($pagebuff, $pagemark);
- $this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
- } else {
+ }
+ if ($startpage == $endpage) { // single page
+ $deltacol = 0;
+ $deltath = 0;
+ for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
+ $this->selectColumn($column);
+ if ($startcolumn == $endcolumn) { // single column
+ $cborder = $border;
+ $h = $endy - $parent['starty'];
+ $this->y = $y;
+ $this->x = $x;
+ } elseif ($column == $startcolumn) { // first column
+ $cborder = $border_start;
+ $this->y = $starty;
+ $this->x = $x;
+ $h = $this->h - $this->y - $this->bMargin;
+ if ($this->rtl) {
+ $deltacol = $this->x + $this->rMargin - $this->w;
+ } else {
+ $deltacol = $this->x - $this->lMargin;
+ }
+ } elseif ($column == $endcolumn) { // end column
+ $cborder = $border_end;
+ if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+ $this->y = $this->columns[$column]['th']['\''.$page.'\''];
+ }
+ $this->x += $deltacol;
+ $h = $endy - $this->y;
+ } else { // middle column
+ $cborder = $border_middle;
+ if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+ $this->y = $this->columns[$column]['th']['\''.$page.'\''];
+ }
+ $this->x += $deltacol;
+ $h = $this->h - $this->y - $this->bMargin;
+ }
+ $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+ } // end for each column
+ } elseif ($page == $startpage) { // first page
+ $deltacol = 0;
+ $deltath = 0;
+ for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
+ $this->selectColumn($column);
+ if ($column == $startcolumn) { // first column
+ $cborder = $border_start;
+ $this->y = $starty;
+ $this->x = $x;
+ $h = $this->h - $this->y - $this->bMargin;
+ if ($this->rtl) {
+ $deltacol = $this->x + $this->rMargin - $this->w;
+ } else {
+ $deltacol = $this->x - $this->lMargin;
+ }
+ } else { // middle column
+ $cborder = $border_middle;
+ if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+ $this->y = $this->columns[$column]['th']['\''.$page.'\''];
+ }
+ $this->x += $deltacol;
+ $h = $this->h - $this->y - $this->bMargin;
+ }
+ $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+ } // end for each column
+ } elseif ($page == $endpage) { // last page
+ $deltacol = 0;
+ $deltath = 0;
+ for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
+ $this->selectColumn($column);
+ if ($column == $endcolumn) { // end column
+ $cborder = $border_end;
+ if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+ $this->y = $this->columns[$column]['th']['\''.$page.'\''];
+ }
+ $this->x += $deltacol;
+ $h = $endy - $this->y;
+ } else { // middle column
+ $cborder = $border_middle;
+ if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+ $this->y = $this->columns[$column]['th']['\''.$page.'\''];
+ }
+ $this->x += $deltacol;
+ $h = $this->h - $this->y - $this->bMargin;
+ }
+ $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+ } // end for each column
+ } else { // middle page
+ $deltacol = 0;
+ $deltath = 0;
+ for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
+ $this->selectColumn($column);
+ $cborder = $border_middle;
+ if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+ $this->y = $this->columns[$column]['th']['\''.$page.'\''];
+ }
+ $this->x += $deltacol;
+ $h = $this->h - $this->y - $this->bMargin;
+ $ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+ } // end for each column
+ }
+ if (!empty($cborder) OR !empty($fill)) {
+ $offsetlen = strlen($ccode);
// draw border and fill
- if (end($this->transfmrk[$this->page]) !== false) {
- $pagemarkkey = key($this->transfmrk[$this->page]);
- $pagemark = $this->transfmrk[$this->page][$pagemarkkey];
- } elseif ($this->InFooter) {
- $pagemark = $this->footerpos[$this->page];
+ if ($this->inxobj) {
+ // we are inside an XObject template
+ if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
+ $pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
+ $pagemark = $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
+ $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey] += $offsetlen;
+ } else {
+ $pagemark = $this->xobjects[$this->xobjid]['intmrk'];
+ $this->xobjects[$this->xobjid]['intmrk'] += $offsetlen;
+ }
+ $pagebuff = $this->xobjects[$this->xobjid]['outdata'];
+ $pstart = substr($pagebuff, 0, $pagemark);
+ $pend = substr($pagebuff, $pagemark);
+ $this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
} else {
- $pagemark = $this->intmrk[$this->page];
+ // draw border and fill
+ if (end($this->transfmrk[$this->page]) !== false) {
+ $pagemarkkey = key($this->transfmrk[$this->page]);
+ $pagemark = $this->transfmrk[$this->page][$pagemarkkey];
+ } elseif ($this->InFooter) {
+ $pagemark = $this->footerpos[$this->page];
+ } else {
+ $pagemark = $this->intmrk[$this->page];
+ }
+ $pagebuff = $this->getPageBuffer($this->page);
+ $pstart = substr($pagebuff, 0, $pagemark);
+ $pend = substr($pagebuff, $pagemark);
+ $this->setPageBuffer($this->page, $pstart.$ccode.$pend);
}
- $pagebuff = $this->getPageBuffer($this->page);
- $pstart = substr($pagebuff, 0, $pagemark);
- $pend = substr($pagebuff, $pagemark);
- $this->setPageBuffer($this->page, $pstart.$ccode.$pend);
+ }
+ } // end for each page
+ // restore default border
+ $border = $default_border;
+ } // end for each cell on the row
+ if (isset($table_el['attribute']['cellspacing'])) {
+ $this->y += $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
+ } elseif (isset($table_el['border-spacing'])) {
+ $this->y += $table_el['border-spacing']['V'];
+ }
+ $this->Ln(0, $cell);
+ $this->x = $parent['startx'];
+ if ($endpage > $startpage) {
+ if (($this->rtl) AND ($this->pagedim[$endpage]['orm'] != $this->pagedim[$startpage]['orm'])) {
+ $this->x += ($this->pagedim[$endpage]['orm'] - $this->pagedim[$startpage]['orm']);
+ } elseif ((!$this->rtl) AND ($this->pagedim[$endpage]['olm'] != $this->pagedim[$startpage]['olm'])) {
+ $this->x += ($this->pagedim[$endpage]['olm'] - $this->pagedim[$startpage]['olm']);
+ }
+ }
+ }
+ if (!$in_table_head) { // we are not inside a thead section
+ $this->cell_padding = $table_el['old_cell_padding'];
+ // reset row height
+ $this->resetLastH();
+ if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
+ $plendiff = ($this->pagelen[$this->numpages] - $this->emptypagemrk[$this->numpages]);
+ if (($plendiff > 0) AND ($plendiff < 60)) {
+ $pagediff = substr($this->getPageBuffer($this->numpages), $this->emptypagemrk[$this->numpages], $plendiff);
+ if (substr($pagediff, 0, 5) == 'BT /F') {
+ // the difference is only a font setting
+ $plendiff = 0;
}
}
- } // end for each page
- // restore default border
- $border = $default_border;
- } // end for each cell on the row
- if (isset($table_el['attribute']['cellspacing'])) {
- $this->y += $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
- } elseif (isset($table_el['border-spacing'])) {
- $this->y += $table_el['border-spacing']['V'];
- }
- $this->Ln(0, $cell);
- $this->x = $parent['startx'];
- if ($endpage > $startpage) {
- if (($this->rtl) AND ($this->pagedim[$endpage]['orm'] != $this->pagedim[$startpage]['orm'])) {
- $this->x += ($this->pagedim[$endpage]['orm'] - $this->pagedim[$startpage]['orm']);
- } elseif ((!$this->rtl) AND ($this->pagedim[$endpage]['olm'] != $this->pagedim[$startpage]['olm'])) {
- $this->x += ($this->pagedim[$endpage]['olm'] - $this->pagedim[$startpage]['olm']);
- }
- }
- }
- if (!$in_table_head) { // we are not inside a thead section
- $this->cell_padding = $table_el['old_cell_padding'];
- // reset row height
- $this->resetLastH();
- if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
- $plendiff = ($this->pagelen[$this->numpages] - $this->emptypagemrk[$this->numpages]);
- if (($plendiff > 0) AND ($plendiff < 60)) {
- $pagediff = substr($this->getPageBuffer($this->numpages), $this->emptypagemrk[$this->numpages], $plendiff);
- if (substr($pagediff, 0, 5) == 'BT /F') {
- // the difference is only a font setting
- $plendiff = 0;
+ if ($plendiff == 0) {
+ // remove last blank page
+ $this->deletePage($this->numpages);
}
}
- if ($plendiff == 0) {
- // remove last blank page
- $this->deletePage($this->numpages);
+ if (isset($this->theadMargins['top'])) {
+ // restore top margin
+ $this->tMargin = $this->theadMargins['top'];
+ }
+ if (!isset($table_el['attribute']['nested']) OR ($table_el['attribute']['nested'] != 'true')) {
+ // reset main table header
+ $this->thead = '';
+ $this->theadMargins = array();
+ $this->pagedim[$this->page]['tm'] = $this->tMargin;
}
}
- if (isset($this->theadMargins['top'])) {
- // restore top margin
- $this->tMargin = $this->theadMargins['top'];
- }
- if (!isset($table_el['attribute']['nested']) OR ($table_el['attribute']['nested'] != 'true')) {
- // reset main table header
- $this->thead = '';
- $this->theadMargins = array();
- $this->pagedim[$this->page]['tm'] = $this->tMargin;
- }
+ $parent = $table_el;
+ break;
}
- $parent = $table_el;
- break;
- }
- case 'a': {
- $this->HREF = array();
- break;
- }
- case 'sup': {
- $this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
- break;
- }
- case 'sub': {
- $this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize']) / $this->k));
- break;
- }
- case 'div': {
- $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
- break;
- }
- case 'blockquote': {
- if ($this->rtl) {
- $this->rMargin -= $this->listindent;
- } else {
- $this->lMargin -= $this->listindent;
+ case 'a': {
+ $this->HREF = array();
+ break;
}
- --$this->listindentlevel;
- $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
- break;
- }
- case 'p': {
- $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
- break;
- }
- case 'pre': {
- $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
- $this->premode = false;
- break;
- }
- case 'dl': {
- --$this->listnum;
- if ($this->listnum <= 0) {
- $this->listnum = 0;
+ case 'sup': {
+ $this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
+ break;
+ }
+ case 'sub': {
+ $this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize']) / $this->k));
+ break;
+ }
+ case 'div': {
$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
- } else {
- $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+ break;
}
- $this->resetLastH();
- break;
- }
- case 'dt': {
- $this->lispacer = '';
- $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
- break;
- }
- case 'dd': {
- $this->lispacer = '';
- if ($this->rtl) {
- $this->rMargin -= $this->listindent;
- } else {
- $this->lMargin -= $this->listindent;
- }
- --$this->listindentlevel;
- $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
- break;
- }
- case 'ul':
- case 'ol': {
- --$this->listnum;
- $this->lispacer = '';
- if ($this->rtl) {
- $this->rMargin -= $this->listindent;
- } else {
- $this->lMargin -= $this->listindent;
- }
- --$this->listindentlevel;
- if ($this->listnum <= 0) {
- $this->listnum = 0;
+ case 'blockquote': {
+ if ($this->rtl) {
+ $this->rMargin -= $this->listindent;
+ } else {
+ $this->lMargin -= $this->listindent;
+ }
+ --$this->listindentlevel;
$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
- } else {
- $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+ break;
+ }
+ case 'p': {
+ $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+ break;
+ }
+ case 'pre': {
+ $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+ $this->premode = false;
+ break;
+ }
+ case 'dl': {
+ --$this->listnum;
+ if ($this->listnum <= 0) {
+ $this->listnum = 0;
+ $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+ } else {
+ $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+ }
+ $this->resetLastH();
+ break;
+ }
+ case 'dt': {
+ $this->lispacer = '';
+ $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+ break;
+ }
+ case 'dd': {
+ $this->lispacer = '';
+ if ($this->rtl) {
+ $this->rMargin -= $this->listindent;
+ } else {
+ $this->lMargin -= $this->listindent;
+ }
+ --$this->listindentlevel;
+ $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+ break;
+ }
+ case 'ul':
+ case 'ol': {
+ --$this->listnum;
+ $this->lispacer = '';
+ if ($this->rtl) {
+ $this->rMargin -= $this->listindent;
+ } else {
+ $this->lMargin -= $this->listindent;
+ }
+ --$this->listindentlevel;
+ if ($this->listnum <= 0) {
+ $this->listnum = 0;
+ $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+ } else {
+ $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+ }
+ $this->resetLastH();
+ break;
+ }
+ case 'li': {
+ $this->lispacer = '';
+ $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+ break;
+ }
+ case 'h1':
+ case 'h2':
+ case 'h3':
+ case 'h4':
+ case 'h5':
+ case 'h6': {
+ $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+ break;
+ }
+ // Form fields (since 4.8.000 - 2009-09-07)
+ case 'form': {
+ $this->form_action = '';
+ $this->form_enctype = 'application/x-www-form-urlencoded';
+ break;
+ }
+ default : {
+ break;
}
- $this->resetLastH();
- break;
- }
- case 'li': {
- $this->lispacer = '';
- $this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
- break;
- }
- case 'h1':
- case 'h2':
- case 'h3':
- case 'h4':
- case 'h5':
- case 'h6': {
- $this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
- break;
- }
- // Form fields (since 4.8.000 - 2009-09-07)
- case 'form': {
- $this->form_action = '';
- $this->form_enctype = 'application/x-www-form-urlencoded';
- break;
- }
- default : {
- break;
- }
}
// draw border and background (if any)
$this->drawHTMLTagBorder($parent, $xmax);
@@ -19987,7 +20330,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @param $lasttag (boolean) set to true when the tag is the last.
* @protected
*/
- protected function addHTMLVertSpace($hbz=0, $hb=0, $cell=false, $firsttag=false, $lasttag=false) {
+ protected function addHTMLVertSpace($hbz = 0, $hb = 0, $cell = false, $firsttag = false, $lasttag = false)
+ {
if ($firsttag) {
$this->Ln(0, $cell);
$this->htmlvspace = 0;
@@ -20013,7 +20357,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 5.7.000 (2010-08-03)
*/
- protected function getBorderStartPosition() {
+ protected function getBorderStartPosition()
+ {
if ($this->rtl) {
$xmax = $this->lMargin;
} else {
@@ -20029,7 +20374,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 5.7.000 (2010-08-03)
*/
- protected function drawHTMLTagBorder($tag, $xmax) {
+ protected function drawHTMLTagBorder($tag, $xmax)
+ {
if (!isset($tag['borderposition'])) {
// nothing to draw
return;
@@ -20231,7 +20577,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.0.028 (2008-09-26)
*/
- public function setLIsymbol($symbol='!') {
+ public function setLIsymbol($symbol = '!')
+ {
// check for custom image symbol
if (substr($symbol, 0, 4) == 'img|') {
$this->lisymbol = $symbol;
@@ -20254,7 +20601,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.2.000 (2008-10-29)
*/
- public function SetBooklet($booklet=true, $inner=-1, $outer=-1) {
+ public function SetBooklet($booklet = true, $inner = -1, $outer = -1)
+ {
$this->booklet = $booklet;
if ($inner >= 0) {
$this->lMargin = $inner;
@@ -20270,7 +20618,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.2.000 (2008-10-29)
*/
- protected function swapMargins($reverse=true) {
+ protected function swapMargins($reverse = true)
+ {
if ($reverse) {
// swap left and right margins
$mtemp = $this->original_lMargin;
@@ -20294,7 +20643,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.2.001 (2008-10-30)
*/
- public function setHtmlVSpace($tagvs) {
+ public function setHtmlVSpace($tagvs)
+ {
$this->tagvspaces = $tagvs;
}
@@ -20304,7 +20654,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.2.007 (2008-11-12)
*/
- public function setListIndentWidth($width) {
+ public function setListIndentWidth($width)
+ {
return $this->customlistindent = floatval($width);
}
@@ -20314,7 +20665,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.2.010 (2008-11-14)
*/
- public function setOpenCell($isopen) {
+ public function setOpenCell($isopen)
+ {
$this->opencell = $isopen;
}
@@ -20325,7 +20677,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.4.003 (2008-12-09)
*/
- public function setHtmlLinksStyle($color=array(0,0,255), $fontstyle='U') {
+ public function setHtmlLinksStyle($color = array(0,0,255), $fontstyle = 'U')
+ {
$this->htmlLinkColorArray = $color;
$this->htmlLinkFontStyle = $fontstyle;
}
@@ -20340,7 +20693,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.4.004 (2008-12-10)
*/
- public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) {
+ public function getHTMLUnitToUnits($htmlval, $refsize = 1, $defaultunit = 'px', $points = false)
+ {
$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
$retval = 0;
$value = 0;
@@ -20424,7 +20778,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.4.004 (2008-12-10)
*/
- protected function putHtmlListBullet($listdepth, $listtype='', $size=10) {
+ protected function putHtmlListBullet($listdepth, $listtype = '', $size = 10)
+ {
if ($this->state != 2) {
return;
}
@@ -20626,7 +20981,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.2.010 (2008-11-14)
*/
- protected function getGraphicVars() {
+ protected function getGraphicVars()
+ {
$grapvars = array(
'FontFamily' => $this->FontFamily,
'FontStyle' => $this->FontStyle,
@@ -20687,7 +21043,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.2.010 (2008-11-14)
*/
- protected function setGraphicVars($gvars, $extended=false) {
+ protected function setGraphicVars($gvars, $extended = false)
+ {
if ($this->state != 2) {
return;
}
@@ -20751,7 +21108,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* Outputs the "save graphics state" operator 'q'
* @protected
*/
- protected function _outSaveGraphicsState() {
+ protected function _outSaveGraphicsState()
+ {
$this->_out('q');
}
@@ -20759,7 +21117,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* Outputs the "restore graphics state" operator 'Q'
* @protected
*/
- protected function _outRestoreGraphicsState() {
+ protected function _outRestoreGraphicsState()
+ {
$this->_out('Q');
}
@@ -20769,7 +21128,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2009-01-02)
*/
- protected function setBuffer($data) {
+ protected function setBuffer($data)
+ {
$this->bufferlen += strlen($data);
$this->buffer .= $data;
}
@@ -20780,7 +21140,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 5.5.000 (2010-06-22)
*/
- protected function replaceBuffer($data) {
+ protected function replaceBuffer($data)
+ {
$this->bufferlen = strlen($data);
$this->buffer = $data;
}
@@ -20791,7 +21152,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2009-01-02)
*/
- protected function getBuffer() {
+ protected function getBuffer()
+ {
return $this->buffer;
}
@@ -20803,7 +21165,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2008-12-31)
*/
- protected function setPageBuffer($page, $data, $append=false) {
+ protected function setPageBuffer($page, $data, $append = false)
+ {
if ($append) {
$this->pages[$page] .= $data;
} else {
@@ -20823,7 +21186,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2008-12-31)
*/
- protected function getPageBuffer($page) {
+ protected function getPageBuffer($page)
+ {
if (isset($this->pages[$page])) {
return $this->pages[$page];
}
@@ -20838,8 +21202,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2008-12-31)
*/
- protected function setImageBuffer($image, $data) {
- if (($data['i'] = array_search($image, $this->imagekeys)) === FALSE) {
+ protected function setImageBuffer($image, $data)
+ {
+ if (($data['i'] = array_search($image, $this->imagekeys)) === false) {
$this->imagekeys[$this->numimages] = $image;
$data['i'] = $this->numimages;
++$this->numimages;
@@ -20856,7 +21221,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2008-12-31)
*/
- protected function setImageSubBuffer($image, $key, $data) {
+ protected function setImageSubBuffer($image, $key, $data)
+ {
if (!isset($this->images[$image])) {
$this->setImageBuffer($image, array());
}
@@ -20870,7 +21236,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2008-12-31)
*/
- protected function getImageBuffer($image) {
+ protected function getImageBuffer($image)
+ {
if (isset($this->images[$image])) {
return $this->images[$image];
}
@@ -20884,7 +21251,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2009-01-02)
*/
- protected function setFontBuffer($font, $data) {
+ protected function setFontBuffer($font, $data)
+ {
$this->fonts[$font] = $data;
if (!in_array($font, $this->fontkeys)) {
$this->fontkeys[] = $font;
@@ -20903,7 +21271,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2009-01-02)
*/
- protected function setFontSubBuffer($font, $key, $data) {
+ protected function setFontSubBuffer($font, $key, $data)
+ {
if (!isset($this->fonts[$font])) {
$this->setFontBuffer($font, array());
}
@@ -20917,7 +21286,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 4.5.000 (2009-01-02)
*/
- protected function getFontBuffer($font) {
+ protected function getFontBuffer($font)
+ {
if (isset($this->fonts[$font])) {
return $this->fonts[$font];
}
@@ -20932,7 +21302,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.5.000 (2009-01-02)
*/
- public function movePage($frompage, $topage) {
+ public function movePage($frompage, $topage)
+ {
if (($frompage > $this->numpages) OR ($frompage <= $topage)) {
return false;
}
@@ -21076,7 +21447,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$jfrompage = $frompage;
$jtopage = $topage;
if (preg_match_all('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/', $this->javascript, $pamatch) > 0) {
- foreach($pamatch[0] as $pk => $pmatch) {
+ foreach ($pamatch[0] as $pk => $pmatch) {
$pagenum = intval($pamatch[3][$pk]) + 1;
if (($pagenum >= $jtopage) AND ($pagenum < $jfrompage)) {
$newpage = ($pagenum + 1);
@@ -21103,7 +21474,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.6.004 (2009-04-23)
*/
- public function deletePage($page) {
+ public function deletePage($page)
+ {
if (($page < 1) OR ($page > $this->numpages)) {
return false;
}
@@ -21115,7 +21487,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
unset($this->bordermrk[$page]);
unset($this->cntmrk[$page]);
foreach ($this->pageobjects[$page] as $oid) {
- if (isset($this->offsets[$oid])){
+ if (isset($this->offsets[$oid])) {
unset($this->offsets[$oid]);
}
}
@@ -21196,7 +21568,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
unset($this->bordermrk[$this->numpages]);
unset($this->cntmrk[$this->numpages]);
foreach ($this->pageobjects[$this->numpages] as $oid) {
- if (isset($this->offsets[$oid])){
+ if (isset($this->offsets[$oid])) {
unset($this->offsets[$oid]);
}
}
@@ -21264,7 +21636,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// adjust javascript
$jpage = $page;
if (preg_match_all('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/', $this->javascript, $pamatch) > 0) {
- foreach($pamatch[0] as $pk => $pmatch) {
+ foreach ($pamatch[0] as $pk => $pmatch) {
$pagenum = intval($pamatch[3][$pk]) + 1;
if ($pagenum >= $jpage) {
$newpage = ($pagenum - 1);
@@ -21293,7 +21665,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.9.015 (2010-04-20)
*/
- public function copyPage($page=0) {
+ public function copyPage($page = 0)
+ {
if ($page == 0) {
// default value
$page = $this->page;
@@ -21370,7 +21743,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 4.5.000 (2009-01-02)
* @see addTOCPage(), endTOCPage(), addHTMLTOC()
*/
- public function addTOC($page='', $numbersfont='', $filler='.', $toc_name='TOC', $style='', $color=array(0,0,0)) {
+ public function addTOC($page = '', $numbersfont = '', $filler = '.', $toc_name = 'TOC', $style = '', $color = array(0,0,0))
+ {
$fontsize = $this->FontSizePt;
$fontfamily = $this->FontFamily;
$fontstyle = $this->FontStyle;
@@ -21580,7 +21954,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.0.001 (2010-05-06)
* @see addTOCPage(), endTOCPage(), addTOC()
*/
- public function addHTMLTOC($page='', $toc_name='TOC', $templates=array(), $correct_align=true, $style='', $color=array(0,0,0)) {
+ public function addHTMLTOC($page = '', $toc_name = 'TOC', $templates = array(), $correct_align = true, $style = '', $color = array(0,0,0))
+ {
$filler = ' ';
$prev_htmlLinkColorArray = $this->htmlLinkColorArray;
$prev_htmlLinkFontStyle = $this->htmlLinkFontStyle;
@@ -21713,7 +22088,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.5.029 (2009-03-19)
*/
- public function startTransaction() {
+ public function startTransaction()
+ {
if (isset($this->objcopy)) {
// remove previous copy
$this->commitTransaction();
@@ -21730,7 +22106,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.5.029 (2009-03-19)
*/
- public function commitTransaction() {
+ public function commitTransaction()
+ {
if (isset($this->objcopy)) {
$this->objcopy->_destroy(true, true);
unset($this->objcopy);
@@ -21744,7 +22121,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.5.029 (2009-03-19)
*/
- public function rollbackTransaction($self=false) {
+ public function rollbackTransaction($self = false)
+ {
if (isset($this->objcopy)) {
$this->_destroy(true, true);
if ($self) {
@@ -21768,7 +22146,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.9.001 (2010-03-28)
*/
- public function setEqualColumns($numcols=0, $width=0, $y='') {
+ public function setEqualColumns($numcols = 0, $width = 0, $y = '')
+ {
$this->columns = array();
if ($numcols < 2) {
$numcols = 0;
@@ -21800,7 +22179,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.9.072 (2011-04-26)
*/
- public function resetColumns() {
+ public function resetColumns()
+ {
$this->lMargin = $this->original_lMargin;
$this->rMargin = $this->original_rMargin;
$this->setEqualColumns();
@@ -21813,7 +22193,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.9.001 (2010-03-28)
*/
- public function setColumnsArray($columns) {
+ public function setColumnsArray($columns)
+ {
$this->columns = $columns;
$this->num_columns = count($columns);
$this->current_column = 0;
@@ -21827,7 +22208,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.9.001 (2010-03-28)
*/
- public function selectColumn($col='') {
+ public function selectColumn($col = '')
+ {
if (is_string($col)) {
$col = $this->current_column;
} elseif ($col >= $this->num_columns) {
@@ -21906,7 +22288,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.5.011 (2010-07-08)
*/
- public function getColumn() {
+ public function getColumn()
+ {
return $this->current_column;
}
@@ -21916,7 +22299,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.8.018 (2010-08-25)
*/
- public function getNumberOfColumns() {
+ public function getNumberOfColumns()
+ {
return $this->num_columns;
}
@@ -21928,7 +22312,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.9.008 (2009-04-02)
*/
- public function setTextRenderingMode($stroke=0, $fill=true, $clip=false) {
+ public function setTextRenderingMode($stroke = 0, $fill = true, $clip = false)
+ {
// Ref.: PDF 32000-1:2008 - 9.3.6 Text Rendering Mode
// convert text rendering parameters
if ($stroke < 0) {
@@ -21983,7 +22368,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.9.174 (2012-07-25)
* @public
*/
- public function setTextShadow($params=array('enabled'=>false, 'depth_w'=>0, 'depth_h'=>0, 'color'=>false, 'opacity'=>1, 'blend_mode'=>'Normal')) {
+ public function setTextShadow($params = array('enabled'=>false, 'depth_w'=>0, 'depth_h'=>0, 'color'=>false, 'opacity'=>1, 'blend_mode'=>'Normal'))
+ {
if (isset($params['enabled'])) {
$this->txtshadow['enabled'] = $params['enabled']?true:false;
} else {
@@ -22025,7 +22411,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.9.174 (2012-07-25)
* @public
*/
- public function getTextShadow() {
+ public function getTextShadow()
+ {
return $this->txtshadow;
}
@@ -22043,7 +22430,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 4.9.012 (2010-04-12)
* @protected
*/
- protected function hyphenateWord($word, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
+ protected function hyphenateWord($word, $patterns, $dictionary = array(), $leftmin = 1, $rightmin = 2, $charmin = 1, $charmax = 8)
+ {
$hyphenword = array(); // hyphens positions
$numchars = count($word);
if ($numchars <= $charmin) {
@@ -22123,7 +22511,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 4.9.012 (2010-04-12)
* @public
*/
- public function hyphenateText($text, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
+ public function hyphenateText($text, $patterns, $dictionary = array(), $leftmin = 1, $rightmin = 2, $charmin = 1, $charmax = 8)
+ {
$text = $this->unhtmlentities($text);
$word = array(); // last word
$txtarr = array(); // text to be returned
@@ -22187,7 +22576,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.0.000 (2010-04-27)
*/
- public function setRasterizeVectorImages($mode) {
+ public function setRasterizeVectorImages($mode)
+ {
$this->rasterize_vector_images = $mode;
}
@@ -22198,7 +22588,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.3.002 (2010-06-07)
*/
- public function setFontSubsetting($enable=true) {
+ public function setFontSubsetting($enable = true)
+ {
if ($this->pdfa_mode) {
$this->font_subsetting = false;
} else {
@@ -22213,7 +22604,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.3.002 (2010-06-07)
*/
- public function getFontSubsetting() {
+ public function getFontSubsetting()
+ {
return $this->font_subsetting;
}
@@ -22226,7 +22618,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.8.000 (2010-08-11)
*/
- public function stringLeftTrim($str, $replace='') {
+ public function stringLeftTrim($str, $replace = '')
+ {
return preg_replace('/^'.$this->re_space['p'].'+/'.$this->re_space['m'], $replace, $str);
}
@@ -22239,7 +22632,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.8.000 (2010-08-11)
*/
- public function stringRightTrim($str, $replace='') {
+ public function stringRightTrim($str, $replace = '')
+ {
return preg_replace('/'.$this->re_space['p'].'+$/'.$this->re_space['m'], $replace, $str);
}
@@ -22252,7 +22646,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.8.000 (2010-08-11)
*/
- public function stringTrim($str, $replace='') {
+ public function stringTrim($str, $replace = '')
+ {
$str = $this->stringLeftTrim($str, $replace);
$str = $this->stringRightTrim($str, $replace);
return $str;
@@ -22265,7 +22660,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.8.002 (2010-08-14)
*/
- public function isUnicodeFont() {
+ public function isUnicodeFont()
+ {
return (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0'));
}
@@ -22277,7 +22673,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.8.004 (2010-08-17)
*/
- public function getFontFamilyName($fontfamily) {
+ public function getFontFamilyName($fontfamily)
+ {
// remove spaces and symbols
$fontfamily = preg_replace('/[^a-z0-9_\,]/', '', strtolower($fontfamily));
// extract all font names
@@ -22321,7 +22718,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.8.017 (2010-08-24)
* @see endTemplate(), printTemplate()
*/
- public function startTemplate($w=0, $h=0, $group=false) {
+ public function startTemplate($w = 0, $h = 0, $group = false)
+ {
if ($this->inxobj) {
// we are already inside an XObject template
return false;
@@ -22386,7 +22784,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.8.017 (2010-08-24)
* @see startTemplate(), printTemplate()
*/
- public function endTemplate() {
+ public function endTemplate()
+ {
if (!$this->inxobj) {
// we are not inside a template
return false;
@@ -22415,7 +22814,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.8.017 (2010-08-24)
* @see startTemplate(), endTemplate()
*/
- public function printTemplate($id, $x='', $y='', $w=0, $h=0, $align='', $palign='', $fitonpage=false) {
+ public function printTemplate($id, $x = '', $y = '', $w = 0, $h = 0, $align = '', $palign = '', $fitonpage = false)
+ {
if ($this->state != 2) {
return;
}
@@ -22515,7 +22915,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
}
// set pointer to align the next text/objects
- switch($align) {
+ switch ($align) {
case 'T': {
$this->y = $y;
$this->x = $rb_x;
@@ -22548,7 +22948,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.9.000 (2010-09-29)
*/
- public function setFontStretching($perc=100) {
+ public function setFontStretching($perc = 100)
+ {
$this->font_stretching = $perc;
}
@@ -22559,7 +22960,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.9.000 (2010-09-29)
*/
- public function getFontStretching() {
+ public function getFontStretching()
+ {
return $this->font_stretching;
}
@@ -22570,7 +22972,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.9.000 (2010-09-29)
*/
- public function setFontSpacing($spacing=0) {
+ public function setFontSpacing($spacing = 0)
+ {
$this->font_spacing = $spacing;
}
@@ -22581,7 +22984,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 5.9.000 (2010-09-29)
*/
- public function getFontSpacing() {
+ public function getFontSpacing()
+ {
return $this->font_spacing;
}
@@ -22593,7 +22997,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.9.003 (2010-10-13)
* @see setPageRegions(), addPageRegion()
*/
- public function getPageRegions() {
+ public function getPageRegions()
+ {
return $this->page_regions;
}
@@ -22608,7 +23013,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.9.003 (2010-10-13)
* @see addPageRegion(), getPageRegions()
*/
- public function setPageRegions($regions=array()) {
+ public function setPageRegions($regions = array())
+ {
// empty current regions array
$this->page_regions = array();
// add regions
@@ -22628,7 +23034,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.9.003 (2010-10-13)
* @see setPageRegions(), getPageRegions()
*/
- public function addPageRegion($region) {
+ public function addPageRegion($region)
+ {
if (!isset($region['page']) OR empty($region['page'])) {
$region['page'] = $this->page;
}
@@ -22647,7 +23054,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.9.003 (2010-10-13)
* @see setPageRegions(), getPageRegions()
*/
- public function removePageRegion($key) {
+ public function removePageRegion($key)
+ {
if (isset($this->page_regions[$key])) {
unset($this->page_regions[$key]);
}
@@ -22665,7 +23073,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 5.9.003 (2010-10-13)
*/
- protected function checkPageRegions($h, $x, $y) {
+ protected function checkPageRegions($h, $x, $y)
+ {
// set default values
if ($x === '') {
$x = $this->x;
@@ -22768,7 +23177,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.0.000 (2010-05-02)
* @public
*/
- public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $palign='', $border=0, $fitonpage=false) {
+ public function ImageSVG($file, $x = '', $y = '', $w = 0, $h = 0, $link = '', $align = '', $palign = '', $border = 0, $fitonpage = false)
+ {
if ($this->state != 2) {
return;
}
@@ -22794,7 +23204,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->svgdir = dirname($file);
$svgdata = TCPDF_STATIC::fileGetContents($file);
}
- if ($svgdata === FALSE) {
+ if ($svgdata === false) {
$this->Error('SVG file not found: '.$file);
}
if ($x === '') {
@@ -23039,7 +23449,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->Link($ximg, $y, $w, $h, $link, 0);
}
// set pointer to align the next text/objects
- switch($align) {
+ switch ($align) {
case 'T':{
$this->y = $y;
$this->x = $this->img_rb_x;
@@ -23089,7 +23499,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 5.0.000 (2010-05-02)
*/
- protected function convertSVGtMatrix($tm) {
+ protected function convertSVGtMatrix($tm)
+ {
$a = $tm[0];
$b = -$tm[1];
$c = -$tm[2];
@@ -23109,7 +23520,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @protected
* @since 5.0.000 (2010-05-02)
*/
- protected function SVGTransform($tm) {
+ protected function SVGTransform($tm)
+ {
$this->Transform($this->convertSVGtMatrix($tm));
}
@@ -23128,7 +23540,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.0.000 (2010-05-02)
* @protected
*/
- protected function setSVGStyles($svgstyle, $prevsvgstyle, $x=0, $y=0, $w=1, $h=1, $clip_function='', $clip_params=array()) {
+ protected function setSVGStyles($svgstyle, $prevsvgstyle, $x = 0, $y = 0, $w = 1, $h = 1, $clip_function = '', $clip_params = array())
+ {
if ($this->state != 2) {
return;
}
@@ -23243,7 +23656,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$gradient['coords'][3] = (($gradient['coords'][3] - $y) / $h);
$gradient['coords'][4] /= $w;
} elseif ($gradient['mode'] == 'percentage') {
- foreach($gradient['coords'] as $key => $val) {
+ foreach ($gradient['coords'] as $key => $val) {
$gradient['coords'][$key] = (intval($val) / 100);
if ($val < 0) {
$gradient['coords'][$key] = 0;
@@ -23409,21 +23822,22 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* Draws an SVG path
* @param $d (string) attribute d of the path SVG element
* @param $style (string) Style of rendering. Possible values are:
- *
- * - D or empty string: Draw (default).
- * - F: Fill.
- * - F*: Fill using the even-odd rule to determine which regions lie inside the clipping path.
- * - DF or FD: Draw and fill.
- * - DF* or FD*: Draw and fill using the even-odd rule to determine which regions lie inside the clipping path.
- * - CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).
- * - CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).
- *
+ *
+ * - D or empty string: Draw (default).
+ * - F: Fill.
+ * - F*: Fill using the even-odd rule to determine which regions lie inside the clipping path.
+ * - DF or FD: Draw and fill.
+ * - DF* or FD*: Draw and fill using the even-odd rule to determine which regions lie inside the clipping path.
+ * - CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).
+ * - CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).
+ *
* @return array of container box measures (x, y, w, h)
* @author Nicola Asuni
* @since 5.0.000 (2010-05-02)
* @protected
*/
- protected function SVGPath($d, $style='') {
+ protected function SVGPath($d, $style = '')
+ {
if ($this->state != 2) {
return;
}
@@ -23714,7 +24128,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} else {
$root = sqrt($numerator / (($rx2 * $ya2) + ($ry2 * $xa2)));
}
- if ($fa == $fs){
+ if ($fa == $fs) {
$root *= -1;
}
$cax = $root * (($rx * $ya) / $ry);
@@ -23780,8 +24194,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @param $name (string) Tag name
* @protected
*/
- protected function removeTagNamespace($name) {
- if(strpos($name, ':') !== false) {
+ protected function removeTagNamespace($name)
+ {
+ if (strpos($name, ':') !== false) {
$parts = explode(':', $name);
return $parts[(sizeof($parts) - 1)];
}
@@ -23798,7 +24213,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.0.000 (2010-05-02)
* @protected
*/
- protected function startSVGElementHandler($parser, $name, $attribs, $ctm=array()) {
+ protected function startSVGElementHandler($parser, $name, $attribs, $ctm = array())
+ {
$name = $this->removeTagNamespace($name);
// check if we are in clip mode
if ($this->svgclipmode) {
@@ -23811,7 +24227,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->svgdefs[$attribs['id']] = array('name' => $name, 'attribs' => $attribs);
return;
}
- if (end($this->svgdefs) !== FALSE) {
+ if (end($this->svgdefs) !== false) {
$last_svgdefs_id = key($this->svgdefs);
if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
$attribs['id'] = 'DF_'.(count($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements']) + 1);
@@ -23827,7 +24243,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$clipping = true;
}
// get styling properties
- $prev_svgstyle = $this->svgstyles[max(0,(count($this->svgstyles) - 1))]; // previous style
+ $prev_svgstyle = $this->svgstyles[max(0, (count($this->svgstyles) - 1))]; // previous style
$svgstyle = $this->svgstyles[0]; // set default style
if ($clipping AND !isset($attribs['fill']) AND (!isset($attribs['style']) OR (!preg_match('/[;\"\s]{1}fill[\s]*:[\s]*([^;\"]*)/si', $attribs['style'], $attrval)))) {
// default fill attribute for clipping
@@ -23877,7 +24293,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$invisible = true;
}
// process tag
- switch($name) {
+ switch ($name) {
case 'defs': {
$this->svgdefsmode = true;
break;
@@ -23898,7 +24314,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
case 'svg': {
// start of SVG object
- if(++$this->svg_tag_depth <= 1) {
+ if (++$this->svg_tag_depth <= 1) {
break;
}
// inner SVG
@@ -23934,7 +24350,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$aspectY = 'YMid';
$fit = 'meet';
if (isset($attribs['preserveAspectRatio'])) {
- if($attribs['preserveAspectRatio'] == 'none') {
+ if ($attribs['preserveAspectRatio'] == 'none') {
$fit = 'none';
} else {
preg_match_all('/[a-zA-Z]+/', $attribs['preserveAspectRatio'], $tmp);
@@ -24430,7 +24846,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
if (!empty($use['attribs']['style'])) {
// merge styles
- $attribs['style'] = str_replace(';;',';',';'.$use['attribs']['style'].$attribs['style']);
+ $attribs['style'] = str_replace(';;', ';', ';'.$use['attribs']['style'].$attribs['style']);
}
$attribs = array_merge($use['attribs'], $attribs);
$this->startSVGElementHandler($parser, $use['name'], $attribs);
@@ -24447,7 +24863,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (!empty($attribs['child_elements'])) {
$child_elements = $attribs['child_elements'];
unset($attribs['child_elements']);
- foreach($child_elements as $child_element) {
+ foreach ($child_elements as $child_element) {
if (empty($child_element['attribs']['closing_tag'])) {
$this->startSVGElementHandler('child-tag', $child_element['name'], $child_element['attribs']);
} else {
@@ -24468,27 +24884,28 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.0.000 (2010-05-02)
* @protected
*/
- protected function endSVGElementHandler($parser, $name) {
+ protected function endSVGElementHandler($parser, $name)
+ {
$name = $this->removeTagNamespace($name);
if ($this->svgdefsmode AND !in_array($name, array('defs', 'clipPath', 'linearGradient', 'radialGradient', 'stop'))) {;
- if (end($this->svgdefs) !== FALSE) {
+ if (end($this->svgdefs) !== false) {
$last_svgdefs_id = key($this->svgdefs);
if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
- foreach($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'] as $child_element) {
+ foreach ($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'] as $child_element) {
if (isset($child_element['attribs']['id']) AND ($child_element['name'] == $name)) {
- $this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$child_element['attribs']['id'].'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => TRUE, 'content' => $this->svgtext));
+ $this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$child_element['attribs']['id'].'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => true, 'content' => $this->svgtext));
return;
}
}
if ($this->svgdefs[$last_svgdefs_id]['name'] == $name) {
- $this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$last_svgdefs_id.'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => TRUE, 'content' => $this->svgtext));
+ $this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$last_svgdefs_id.'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => true, 'content' => $this->svgtext));
return;
}
}
}
return;
}
- switch($name) {
+ switch ($name) {
case 'defs': {
$this->svgdefsmode = false;
break;
@@ -24575,12 +24992,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 5.0.000 (2010-05-02)
* @protected
*/
- protected function segSVGContentHandler($parser, $data) {
+ protected function segSVGContentHandler($parser, $data)
+ {
$this->svgtext .= $data;
}
// --- END SVG METHODS -----------------------------------------------------
-
} // END OF TCPDF CLASS
//============================================================+
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index d18e54c0c1c..e7bbe6c7771 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -32,6 +32,10 @@
vertical-align: middle;
}
+.right {
+ text-align: right;
+}
+
.opacitymedium {
opacity: 0.5;
}
diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql
index 7291c399da0..02a7b37fc91 100644
--- a/htdocs/install/mysql/data/llx_c_availability.sql
+++ b/htdocs/install/mysql/data/llx_c_availability.sql
@@ -25,10 +25,9 @@
-- Availability type
--
-delete from llx_c_availability;
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (1, 'AV_NOW', 'Immediate', 1, 10);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (2, 'AV_1W', '1 week', 1, 20);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (3, 'AV_2W', '2 weeks', 1, 30);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (4, 'AV_3W', '3 weeks', 1, 40);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (5, 'AV_4W', '4 weeks', 1, 50);
+INSERT INTO llx_c_availability (code,label,active,position) VALUES ('AV_NOW', 'Immediate', 1, 10);
+INSERT INTO llx_c_availability (code,label,active,position) VALUES ('AV_1W', '1 week', 1, 20);
+INSERT INTO llx_c_availability (code,label,active,position) VALUES ('AV_2W', '2 weeks', 1, 30);
+INSERT INTO llx_c_availability (code,label,active,position) VALUES ('AV_3W', '3 weeks', 1, 40);
+INSERT INTO llx_c_availability (code,label,active,position) VALUES ('AV_4W', '4 weeks', 1, 50);
diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql
index 1288fb23cea..7c20e73ef7c 100644
--- a/htdocs/install/mysql/data/llx_c_civilite.sql
+++ b/htdocs/install/mysql/data/llx_c_civilite.sql
@@ -30,9 +30,8 @@
-- Civilities
--
-delete from llx_c_civility;
-insert into llx_c_civility (rowid, code, label, active) values (1 , 'MME', 'Madame', 1);
-insert into llx_c_civility (rowid, code, label, active) values (3 , 'MR', 'Monsieur', 1);
-insert into llx_c_civility (rowid, code, label, active) values (5 , 'MLE', 'Mademoiselle', 1);
-insert into llx_c_civility (rowid, code, label, active) values (7 , 'MTRE', 'Maître', 1);
-insert into llx_c_civility (rowid, code, label, active) values (8 , 'DR', 'Docteur', 1);
+insert into llx_c_civility (code, label, active) values ('MME', 'Madame', 1);
+insert into llx_c_civility (code, label, active) values ('MR', 'Monsieur', 1);
+insert into llx_c_civility (code, label, active) values ('MLE', 'Mademoiselle', 1);
+insert into llx_c_civility (code, label, active) values ('MTRE', 'Maître', 1);
+insert into llx_c_civility (code, label, active) values ('DR', 'Docteur', 1);
diff --git a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
index 9f779ecf64b..80f59680df5 100644
--- a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
+++ b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
@@ -6,6 +6,7 @@
-- Copyright (C) 2005-2012 Regis Houssin
-- Copyright (C) 2007 Patrick Raguin
-- Copyright (C) 2019 Markus Welters
+-- Copyright (C) 2022 Joachim Kueter
--
-- 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
@@ -62,6 +63,24 @@ INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, m
INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('ES-CONSTITUIZION', 0, 4, '', 0, 12, 6, 1);
INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('ES-IMMACULE', 0, 4, '', 0, 12, 8, 1);
+-- Germany (5)
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-NEUJAHR', 0, 5, '', 0, 1, 1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-HL3KOEN--TLW', 0, 5, '', 0, 1, 6, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-INTFRAUENTAG--TLW', 0, 5, '', 0, 3, 8, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-KARFREITAG', 0, 5, 'goodfriday', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-OSTERMONTAG', 0, 5, 'eastermonday', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-TAGDERARBEIT', 0, 5, '', 0, 5, 1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-HIMMELFAHRT', 0, 5, 'ascension', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-PFINGSTEN', 0, 5, 'pentecotemonday', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-FRONLEICHNAM--TLW', 0, 5, 'fronleichnam', 0, 0, 0, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-MARIAEHIMMEL--TLW', 0, 5, '', 0, 8, 15, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-WELTKINDERTAG--TLW', 0, 5, '', 0, 9, 20, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-TAGDERDEUTEINHEIT', 0, 5, '', 0, 10, 3, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-REFORMATIONSTAG--TLW', 0, 5, '', 0, 10, 31, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-ALLERHEILIGEN--TLW', 0, 5, '', 0, 11, 1, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-WEIHNACHTSTAG1', 0, 5, '', 0, 12, 25, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-WEIHNACHTSTAG2', 0, 5, '', 0, 12, 26, 1);
+
-- Austria (41)
INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('AT-EASTER', 0, 41, 'eastermonday', 0, 0, 0, 1);
INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('AT-ASCENSION', 0, 41, 'ascension', 0, 0, 0, 1);
diff --git a/htdocs/install/mysql/data/llx_c_partnership_type.sql b/htdocs/install/mysql/data/llx_c_partnership_type.sql
new file mode 100644
index 00000000000..9410911b374
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_partnership_type.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2020 florian HENRY florian.henry@scopen.fr
+--
+-- 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 3 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, see .
+--
+--
+
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_partnership_type (code, label, active) VALUES ('DEFAULT', 'Default', 1);
+
diff --git a/htdocs/install/mysql/data/llx_c_ticket_type.sql b/htdocs/install/mysql/data/llx_c_ticket_type.sql
index 3b6fda322ad..85a85b0a63d 100644
--- a/htdocs/install/mysql/data/llx_c_ticket_type.sql
+++ b/htdocs/install/mysql/data/llx_c_ticket_type.sql
@@ -23,4 +23,4 @@ INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, descriptio
INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('PROBLEM', '22', 'Problem', 0, 0, NULL);
INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('REQUEST', '25', 'Change or enhancement request', 1, 0, NULL);
INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('PROJECT', '30', 'Project', 0, 0, NULL);
-INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('OTHER', '40', 'Other', 1, 0, NULL);
+INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('OTHER', '40', 'Other', 1, 1, NULL);
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index fa8cb0197cc..b9a5e535d21 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -43,6 +43,8 @@ create table llx_commande_fournisseur_dispatch_extrafields
ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande_fournisseur_dispatch_extrafields (fk_object);
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging double(24,8) DEFAULT 1;
+
UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version = 'SYSCOHADA';
create table llx_c_shipment_package_type
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 517771ced4e..a632a32271b 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -566,7 +566,8 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_customers_outstanding_bill_reached.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_customers_outstanding_bill_reached.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_scheduled_jobs.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_scheduled_jobs.php' AND entity = 1);
-ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging varchar(64) DEFAULT NULL;
ALTER TABLE llx_projet ADD COLUMN fk_opp_status_end integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 6d2d0ae3033..434d30bdfe4 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -84,6 +84,9 @@ UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'a
UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'cameleo';
DELETE FROM llx_user_param where param = 'MAIN_THEME' and value in ('auguria', 'amarok', 'cameleo');
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging varchar(64) DEFAULT NULL;
+
-- For v14
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index b57d995c251..3e0fa10ccd0 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -35,6 +35,9 @@
-- VMYSQL4.3 ALTER TABLE llx_partnership MODIFY COLUMN date_partnership_end date NULL;
-- VPGSQL8.2 ALTER TABLE llx_partnership ALTER COLUMN date_partnership_end DROP NOT NULL;
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging varchar(64) DEFAULT NULL;
+
ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_export datetime DEFAULT NULL;
ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN fk_project integer NOT NULL;
@@ -507,6 +510,7 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802);
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804);
+
-- We do not delete old mexican legal forms because they may have been used. User will have to insert the new one manually not inserted because of conflict if he need them.
--DELETE FROM llx_c_forme_juridique WHERE code IN ('15401', '15402', '15403', '15404', '15405', '15406');
@@ -529,3 +533,7 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154,
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15417', '624 - Coordinados', 1);
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15418', '625 - Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas', 1);
INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15419', '626 - Régimen Simplificado de Confianza', 1);
+
+-- VMYSQL4.3 ALTER TABLE llx_user MODIFY COLUMN fk_soc integer NULL;
+-- VPGSQL8.2 ALTER TABLE llx_user ALTER COLUMN fk_soc DROP NOT NULL;
+
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index b78e53bd287..e11fd27a5d2 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -69,6 +69,26 @@ ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(128);
UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AND module = 'holiday';
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', '601 - General de Ley Personas Morales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', '603 - Personas Morales con Fines no Lucrativos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', '605 - Sueldos y Salarios e Ingresos Asimilados a Salarios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', '606 - Arrendamiento', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', '607 - Régimen de Enajenación o Adquisición de Bienes', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', '608 - Demás ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15407', '610 - Residentes en el Extranjero sin Establecimiento Permanente en México', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15408', '611 - Ingresos por Dividendos (socios y accionistas)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15409', '612 - Personas FÃsicas con Actividades Empresariales y Profesionales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15410', '614 - Ingresos por intereses', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15411', '615 - Régimen de los ingresos por obtención de premios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15412', '616 - Sin obligaciones fiscales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15413', '620 - Sociedades Cooperativas de Producción que optan por diferir sus ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15414', '621 - Incorporación Fiscal', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15415', '622 - Actividades AgrÃcolas, Ganaderas, SilvÃcolas y Pesqueras', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15416', '623 - Opcional para Grupos de Sociedades', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15417', '624 - Coordinados', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15418', '625 - Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15419', '626 - Régimen Simplificado de Confianza', 1);
+
-- v16
@@ -237,4 +257,30 @@ ALTER TABLE llx_advtargetemailing RENAME TO llx_mailing_advtarget;
ALTER TABLE llx_mailing ADD UNIQUE uk_mailing(titre, entity);
+create table llx_inventory_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ fk_object integer NOT NULL,
+ import_key varchar(14) -- import key
+) ENGINE=innodb;
+ALTER TABLE llx_inventory_extrafields ADD INDEX idx_inventory_extrafields (fk_object);
+
+
+ALTER TABLE llx_reception MODIFY COLUMN ref_supplier varchar(128);
+
+ALTER TABLE llx_bank_account ADD COLUMN pti_in_ctti smallint DEFAULT 0 AFTER domiciliation;
+
+-- Set default ticket type to OTHER if no default exists
+UPDATE llx_c_ticket_type SET use_default=1 WHERE code='OTHER' AND NOT EXISTS(SELECT * FROM (SELECT * FROM llx_c_ticket_type) AS t WHERE use_default=1);
+
+
+ALTER TABLE llx_propal ADD last_main_doc VARCHAR(255) NULL AFTER model_pdf;
+
+UPDATE llx_c_country SET eec=0 WHERE eec IS NULL;
+ALTER TABLE llx_c_country MODIFY COLUMN eec tinyint DEFAULT 0 NOT NULL;
+
+
+ALTER TABLE llx_chargesociales ADD COLUMN note_private text;
+ALTER TABLE llx_chargesociales ADD COLUMN note_public text;
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index aed803cc7ea..d9713b66d38 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -42,6 +42,7 @@ create table llx_bank_account
country_iban varchar(2), -- deprecated
cle_iban varchar(2),
domiciliation varchar(255),
+ pti_in_ctti smallint DEFAULT 0,
state_id integer DEFAULT NULL,
fk_pays integer NOT NULL,
proprio varchar(60),
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
index d97c3b90371..7419b68c26d 100644
--- a/htdocs/install/mysql/tables/llx_c_country.sql
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -24,8 +24,8 @@ create table llx_c_country
rowid integer PRIMARY KEY,
code varchar(2) NOT NULL,
code_iso varchar(3) ,
- label varchar(128) NOT NULL,
- eec integer ,
+ label varchar(128) NOT NULL,
+ eec tinyint DEFAULT 0 NOT NULL,
active tinyint DEFAULT 1 NOT NULL,
favorite tinyint DEFAULT 0 NOT NULL
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.key.sql b/htdocs/install/mysql/tables/llx_chargesociales.key.sql
new file mode 100644
index 00000000000..8815b87c65c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_chargesociales.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2022 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
+-- the Free Software Foundation; either version 3 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, see .
+--
+-- ===================================================================
+
+
+--ALTER TABLE llx_chargesociales ADD INDEX idx_chargesociales (ref);
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 220c85410ce..93640a930b3 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -3,6 +3,7 @@
-- Copyright (C) 2005-2009 Regis Houssin
-- Copyright (C) 2017 Alexandre Spangaro
-- Copyright (C) 2021 Gauthier VERDOL
+-- Copyright (C) 2022 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
@@ -40,6 +41,8 @@ create table llx_chargesociales
paye smallint default 0 NOT NULL,
periode date,
fk_projet integer DEFAULT NULL,
+ note_private text,
+ note_public text,
import_key varchar(14)
)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_inventory_extrafields.key.sql b/htdocs/install/mysql/tables/llx_inventory_extrafields.key.sql
new file mode 100644
index 00000000000..ecfd1de723e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory_extrafields.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2022 Laurent Destailleur
+-- Copyright (C) 2022 ATM Consulting
+--
+-- 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 3 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, see .
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_inventory_extrafields ADD INDEX idx_inventory_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_inventory_extrafields.sql b/htdocs/install/mysql/tables/llx_inventory_extrafields.sql
new file mode 100644
index 00000000000..f6a6a59e0a1
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory_extrafields.sql
@@ -0,0 +1,27 @@
+-- ========================================================================
+-- Copyright (C) 2022 Laurent Destailleur
+-- Copyright (C) 2022 ATM Consulting
+
+-- 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 3 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, see .
+--
+-- ========================================================================
+
+create table llx_inventory_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ fk_object integer NOT NULL,
+ import_key varchar(14) -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 25b295ec383..83b97c201ad 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -50,8 +50,7 @@ create table llx_product_fournisseur_price
import_key varchar(14), -- Import key
delivery_time_days integer,
supplier_reputation varchar(10),
- packaging varchar(64),
-
+ packaging varchar(64) DEFAULT NULL,
fk_multicurrency integer,
multicurrency_code varchar(3),
multicurrency_tx double(24,8) DEFAULT 1,
diff --git a/htdocs/install/mysql/tables/llx_reception.sql b/htdocs/install/mysql/tables/llx_reception.sql
index 7989f80cf58..8de59edcb77 100644
--- a/htdocs/install/mysql/tables/llx_reception.sql
+++ b/htdocs/install/mysql/tables/llx_reception.sql
@@ -26,11 +26,11 @@ create table llx_reception
ref varchar(30) NOT NULL,
entity integer DEFAULT 1 NOT NULL, -- multi company id
fk_soc integer NOT NULL,
- fk_projet integer DEFAULT NULL,
+ fk_projet integer DEFAULT NULL,
ref_ext varchar(30), -- reference into an external system (not used by dolibarr)
- ref_int varchar(30), -- reference into an internal system (deprecated)
- ref_supplier varchar(30), -- customer number
+ ref_int varchar(30), -- reference into an internal system (deprecated)
+ ref_supplier varchar(128), -- supplier number
date_creation datetime, -- date de creation
fk_user_author integer, -- author of creation
@@ -38,7 +38,7 @@ create table llx_reception
date_valid datetime, -- date de validation
fk_user_valid integer, -- valideur
date_delivery datetime DEFAULT NULL, -- date planned of delivery
- date_reception datetime,
+ date_reception datetime,
fk_shipping_method integer,
tracking_number varchar(50),
fk_statut smallint DEFAULT 0, -- 0 = draft, 1 = validated, 2 = billed or closed depending on WORKFLOW_BILL_ON_SHIPMENT option
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index c8b78d42fae..c27a0fb2910 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -77,7 +77,8 @@ create table llx_societe
fk_stcomm integer DEFAULT 0 NOT NULL, -- commercial status
note_private text, --
note_public text, --
- model_pdf varchar(255),
+ model_pdf varchar(255),
+ last_main_doc varchar(255), -- relative filepath+filename of last main generated document
prefix_comm varchar(5), -- prefix commercial (deprecated)
client tinyint DEFAULT 0, -- client 0/1/2
fournisseur tinyint DEFAULT 0, -- fournisseur 0/1
diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql
index 047a10f1e90..f2250ccea75 100644
--- a/htdocs/install/mysql/tables/llx_user.key.sql
+++ b/htdocs/install/mysql/tables/llx_user.key.sql
@@ -21,7 +21,7 @@
ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
-ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc);
+ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc);
ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople);
ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member (fk_member);
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 8aa0d381e26..6cfdf8bfbb8 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -64,12 +64,12 @@ create table llx_user
--module_comm smallint DEFAULT 1,
--module_compta smallint DEFAULT 1,
- fk_soc integer, -- id thirdparty if user linked to a company (external user)
- fk_socpeople integer, -- id contact origin if user linked to a contact
- fk_member integer, -- if member if suer linked to a member
- fk_user integer, -- Supervisor, hierarchic parent
- fk_user_expense_validator integer,
- fk_user_holiday_validator integer,
+ fk_soc integer NULL, -- id thirdparty if user linked to a company (external user)
+ fk_socpeople integer NULL, -- id contact origin if user linked to a contact
+ fk_member integer NULL, -- if member if suer linked to a member
+ fk_user integer NULL, -- Supervisor, hierarchic parent
+ fk_user_expense_validator integer NULL,
+ fk_user_holiday_validator integer NULL,
idpers1 varchar(128),
idpers2 varchar(128),
diff --git a/htdocs/install/mysql/tables/llx_website.key.sql b/htdocs/install/mysql/tables/llx_website-website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website.key.sql
rename to htdocs/install/mysql/tables/llx_website-website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.key.sql b/htdocs/install/mysql/tables/llx_website_extrafields-website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_website_extrafields-website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.sql b/htdocs/install/mysql/tables/llx_website_extrafields-website.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_extrafields.sql
rename to htdocs/install/mysql/tables/llx_website_extrafields-website.sql
diff --git a/htdocs/install/mysql/tables/llx_website_page.key.sql b/htdocs/install/mysql/tables/llx_website_page-website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_page.key.sql
rename to htdocs/install/mysql/tables/llx_website_page-website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page-website.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_page.sql
rename to htdocs/install/mysql/tables/llx_website_page-website.sql
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index e58ae528f97..25dd1ee84fd 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -235,8 +235,12 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
// Force l'affichage de la progression
if ($ok) {
- print '| '.$langs->trans("PleaseBePatient").' | ';
+ print '| '.$langs->trans("PleaseBePatient").' | ';
+ print ' ';
+
flush();
+
+ print '';
}
@@ -355,7 +359,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
// Scan if there is migration scripts that depends of Dolibarr version
- // for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql")
+ // for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql" or "dolibarr_always.sql")
$modulesfile = array();
foreach ($conf->file->dol_document_root as $type => $dirroot) {
$handlemodule = @opendir($dirroot); // $dirroot may be '..'
@@ -366,6 +370,9 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file)) {
$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
}
+ if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_allversions.sql')) {
+ $modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_allversions.sql'] = '/'.$filemodule.'/sql/dolibarr_allversions.sql';
+ }
}
}
closedir($handlemodule);
@@ -398,6 +405,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
}
}
+
if (empty($actiondone)) {
print ''.$langs->trans("ErrorWrongParameters").' ';
}
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 9be3cc361a0..924d251702c 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -456,6 +456,13 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
migrate_export_import_profiles('export');
migrate_export_import_profiles('import');
}
+
+ // Scripts for 16.0
+ $afterversionarray = explode('.', '15.0.9');
+ $beforeversionarray = explode('.', '16.0.9');
+ if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+ migrate_user_photospath2();
+ }
}
@@ -4505,8 +4512,7 @@ function migrate_user_photospath()
}
// dol_delete_dir($origin.'/'.$file);
}
- } else // it is a file
- {
+ } else { // it is a file
if (!dol_is_file($destin.'/'.$file)) {
//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'
'."\n";
print '.';
@@ -4524,6 +4530,94 @@ function migrate_user_photospath()
print '';
}
+/**
+ * Migrate file from old path users/99/file.jpg into users/99/photos/file.jpg
+ *
+ * @return void
+ */
+function migrate_user_photospath2()
+{
+ global $conf, $db, $langs, $user;
+
+ print '';
+
+ print ''.$langs->trans('MigrationUserPhotoPath')."
\n";
+
+ include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+ $fuser = new User($db);
+
+ if (!is_object($user)) {
+ $user = $fuser; // To avoid error during migration
+ }
+
+ $sql = "SELECT rowid as uid from ".MAIN_DB_PREFIX."user"; // Get list of all users
+ $resql = $db->query($sql);
+ if ($resql) {
+ while ($obj = $db->fetch_object($resql)) {
+ $fuser->fetch($obj->uid);
+ //echo '
'.$fuser->id.' -> '.$fuser->entity;
+ $entity = (empty($fuser->entity) ? 1 : $fuser->entity);
+ if ($entity > 1) {
+ $dir = DOL_DATA_ROOT.'/'.$entity.'/users';
+ } else {
+ $dir = $conf->user->multidir_output[$entity]; // $conf->user->multidir_output[] for each entity is construct by the multicompany module
+ }
+
+ if ($dir) {
+ //print "Process user id ".$fuser->id."
\n";
+ $origin = $dir.'/'.$fuser->id;
+ $destin = $dir.'/'.$fuser->id.'/photos';
+
+ $origin_osencoded = dol_osencode($origin);
+
+ dol_mkdir($destin);
+
+ //echo '
'.$origin.' -> '.$destin;
+ if (dol_is_dir($origin)) {
+ $handle = opendir($origin_osencoded);
+ if (is_resource($handle)) {
+ while (($file = readdir($handle)) !== false) {
+ if ($file == '.' || $file == '..' || $file == 'photos') {
+ continue;
+ }
+ if (!empty($fuser->photo) && ($file != $fuser->photo && $file != 'thumbs')) {
+ continue;
+ }
+
+ if (dol_is_dir($origin.'/'.$file)) { // it is a dir (like 'thumbs')
+ $thumbs = opendir($origin_osencoded.'/'.$file);
+ if (is_resource($thumbs)) {
+ dol_mkdir($destin.'/'.$file);
+ while (($thumb = readdir($thumbs)) !== false) {
+ if (!dol_is_file($destin.'/'.$file.'/'.$thumb)) {
+ if ($thumb == '.' || $thumb == '..') {
+ continue;
+ }
+
+ //print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'
'."\n";
+ print '.';
+ dol_copy($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb, 0, 0);
+ }
+ }
+ // dol_delete_dir($origin.'/'.$file);
+ }
+ } else { // it is a file
+ if (!dol_is_file($destin.'/'.$file)) {
+ //print $origin.'/'.$file.' -> '.$destin.'/'.$file.'
'."\n";
+ print '.';
+ dol_copy($origin.'/'.$file, $destin.'/'.$file, 0, 0);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ print ' | ';
+}
+
/* A faire egalement: Modif statut paye et fk_facture des factures payes completement
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 2fcf05a4393..91f127b0057 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -184,9 +184,6 @@ if ($action == 'create') {
print dol_get_fiche_head(array(), '');
- // Set some default values
- //if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
print ''."\n";
// Common attributes
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 675f6e4397f..feadd8d9800 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -124,11 +124,11 @@ $arrayfields = array();
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1);
+ $visible = (int) dol_eval($val['visible'], 1, 1, '1');
$arrayfields['t.'.$key] = array(
'label'=>$val['label'],
'checked'=>(($visible < 0) ? 0 : 1),
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
'position'=>$val['position'],
'help'=> isset($val['help']) ? $val['help'] : ''
);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index a44c819aa78..fd5ff8461fe 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -219,12 +219,12 @@ ByPredefinedAccountGroups=By predefined groups
ByPersonalizedAccountGroups=By personalized groups
ByYear=By year
NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some lines from accounting
DelMonth=Month to delete
DelYear=Year to delete
DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all lines in accountancy for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted)
FinanceJournal=Finance journal
ExpenseReportsJournal=Expense reports journal
DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -282,7 +282,7 @@ DescClosure=Consult here the number of movements by month who are not validated
OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
AllMovementsWereRecordedAsValidated=All movements were recorded as validated
NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
+ValidateMovements=Validate and lock record...
DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
ValidateHistory=Bind Automatically
@@ -301,7 +301,7 @@ Accounted=Accounted in ledger
NotYetAccounted=Not yet transferred to accounting
ShowTutorial=Show Tutorial
NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Warning, all lines without subledger account defined are filtered and excluded from this view
## Admin
BindingOptions=Binding options
@@ -329,8 +329,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
## Export
-NotifiedExportDate=Flag exported lines as exported (modification of the lines will not be possible)
-NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
+NotifiedExportDate=Flag exported lines as Exported (to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)
+NotifiedValidationDate=Validate and Lock the exported entries (same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)
+DateValidationAndLock=Date validation and lock
ConfirmExportFile=Confirmation of the generation of the accounting export file ?
ExportDraftJournal=Export draft journal
Modelcsv=Model of export
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1e94ecbfdf0..cffd3532c05 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1068,6 +1068,7 @@ DictionaryExpenseTaxCat=Expense report - Transportation categories
DictionaryExpenseTaxRange=Expense report - Range by transportation category
DictionaryTransportMode=Intracomm report - Transport mode
DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
TypeOfUnit=Type of unit
SetupSaved=Setup saved
SetupNotSaved=Setup not saved
@@ -2222,4 +2223,5 @@ EachTerminalHasItsOwnCounter=Each terminal use its own counter.
FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
PreviousHash=Previous hash
LateWarningAfter="Late" warning after
-TemplateforBusinessCards=Template for a business card in different size
\ No newline at end of file
+TemplateforBusinessCards=Template for a business card in different size
+InventorySetup= Inventory Setup
diff --git a/htdocs/langs/en_US/assets.lang b/htdocs/langs/en_US/assets.lang
index afafc98503f..d1d47b96f63 100644
--- a/htdocs/langs/en_US/assets.lang
+++ b/htdocs/langs/en_US/assets.lang
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Alexandre Spangaro
+# Copyright (C) 2018-2022 Alexandre Spangaro
#
# 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
@@ -16,52 +16,171 @@
#
# Generic
#
-Assets = Assets
-NewAsset = New asset
-AccountancyCodeAsset = Accounting code (asset)
-AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
-AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
-NewAssetType=New asset type
-AssetsTypeSetup=Asset type setup
-AssetTypeModified=Asset type modified
-AssetType=Asset type
+NewAsset=New asset
+AccountancyCodeAsset=Accounting code (asset)
+AccountancyCodeDepreciationAsset=Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense=Accounting code (depreciation expense account)
AssetsLines=Assets
DeleteType=Delete
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Show type '%s'
+DeleteAnAssetType=Delete an asset model
+ConfirmDeleteAssetType=Are you sure you want to delete this asset model?
+ShowTypeCard=Show model '%s'
# Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName=Assets
# Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc=Assets description
#
# Admin page
#
-AssetsSetup = Assets setup
-Settings = Settings
-AssetsSetupPage = Assets setup page
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
-AssetsType=Asset type
-AssetsTypeId=Asset type id
-AssetsTypeLabel=Asset type label
-AssetsTypes=Assets types
+AssetSetup=Assets setup
+AssetSetupPage=Assets setup page
+ExtraFieldsAssetModel=Complementary attributes (Asset's model)
+
+AssetsType=Asset model
+AssetsTypeId=Asset model id
+AssetsTypeLabel=Asset model label
+AssetsTypes=Assets models
+ASSET_ACCOUNTANCY_CATEGORY=Fixed asset accounting group
#
# Menu
#
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
+MenuAssets=Assets
+MenuNewAsset=New asset
+MenuAssetModels=Model assets
+MenuListAssets=List
+MenuNewAssetModel=New asset's model
+MenuListAssetModels=List
#
# Module
#
+ConfirmDeleteAsset=Do you really want to remove this asset?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Depreciation options
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=Depreciation
+
+#
+# Asset
+#
Asset=Asset
-NewAssetType=New asset type
-NewAsset=New asset
-ConfirmDeleteAsset=Are you sure you want to delete this asset ?
+Assets=Assets
+AssetReversalAmountHT=Reversal amount (without taxes)
+AssetAcquisitionValueHT=Acquisition amount (without taxes)
+AssetRecoveredVAT=Recovered VAT
+AssetReversalDate=Reversal date
+AssetDateAcquisition=Acquisition date
+AssetDateStart=Date of start-up
+AssetAcquisitionType=Type of acquisition
+AssetAcquisitionTypeNew=New
+AssetAcquisitionTypeOccasion=Used
+AssetType=Type of asset
+AssetTypeIntangible=Intangible
+AssetTypeTangible=Tangible
+AssetTypeInProgress=In progress
+AssetTypeFinancial=Financial
+AssetNotDepreciated=Not depreciated
+AssetDisposal=Disposal
+AssetConfirmDisposalAsk=Are you sure you want to dispose of the asset %s?
+AssetConfirmReOpenAsk=Are you sure you want to reopen the asset %s?
+
+#
+# Asset status
+#
+AssetInProgress=In progress
+AssetDisposed=Disposed
+AssetRecorded=Accounted
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Date of disposal
+AssetDisposalAmount=Disposal value
+AssetDisposalType=Type of disposal
+AssetDisposalDepreciated=Depreciate the year of transfer
+AssetDisposalSubjectToVat=Disposal subject to VAT
+
+#
+# Asset model
+#
+AssetModel=Asset's model
+AssetModels=Asset's models
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Economic depreciation
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDepreciationType=Depreciation type
+AssetDepreciationOptionDepreciationTypeLinear=Linear
+AssetDepreciationOptionDepreciationTypeDegressive=Degressive
+AssetDepreciationOptionDepreciationTypeExceptional=Exceptional
+AssetDepreciationOptionDegressiveRate=Degressive rate
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated (tax)
+AssetDepreciationOptionDuration=Duration
+AssetDepreciationOptionDurationType=Type duration
+AssetDepreciationOptionDurationTypeAnnual=Annual
+AssetDepreciationOptionDurationTypeMonthly=Monthly
+AssetDepreciationOptionDurationTypeDaily=Daily
+AssetDepreciationOptionRate=Rate (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Depreciation base (excl. VAT)
+AssetDepreciationOptionAmountBaseDeductibleHT=Deductible base (excl. VAT)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. VAT)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Economic depreciation
+AssetAccountancyCodeAsset=Asset
+AssetAccountancyCodeDepreciationAsset=Depreciation
+AssetAccountancyCodeDepreciationExpense=Depreciation expense
+AssetAccountancyCodeValueAssetSold=Value of asset disposed
+AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
+AssetAccountancyCodeProceedsFromSales=Proceeds from disposal
+AssetAccountancyCodeVatCollected=Collected VAT
+AssetAccountancyCodeVatDeductible=Recovered VAT on assets
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetAccountancyCodeAcceleratedDepreciation=Account
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Depreciation expense
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Repossession/Provision
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Depreciation basis (excl. VAT)
+AssetDepreciationBeginDate=Start of depreciation on
+AssetDepreciationDuration=Duration
+AssetDepreciationRate=Rate (%%)
+AssetDepreciationDate=Depreciation date
+AssetDepreciationHT=Depreciation (excl. VAT)
+AssetCumulativeDepreciationHT=Cumulative depreciation (excl. VAT)
+AssetResidualHT=Residual value (excl. VAT)
+AssetDispatchedInBookkeeping=Depreciation recorded
+AssetFutureDepreciationLine=Future depreciation
+AssetDepreciationReversal=Reversal
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound has not been provided
+AssetErrorFetchAccountancyCodesForMode=Error when retrieving the accounting accounts for the '%s' depreciation mode
+AssetErrorDeleteAccountancyCodesForMode=Error when deleting accounting accounts from the '%s' depreciation mode
+AssetErrorInsertAccountancyCodesForMode=Error when inserting the accounting accounts of the depreciation mode '%s'
+AssetErrorFetchDepreciationOptionsForMode=Error when retrieving options for the '%s' depreciation mode
+AssetErrorDeleteDepreciationOptionsForMode=Error when deleting the '%s' depreciation mode options
+AssetErrorInsertDepreciationOptionsForMode=Error when inserting the '%s' depreciation mode options
+AssetErrorFetchDepreciationLines=Error when retrieving recorded depreciation lines
+AssetErrorClearDepreciationLines=Error when purging recorded depreciation lines (reversal and future)
+AssetErrorAddDepreciationLine=Error when adding a depreciation line
+AssetErrorCalculationDepreciationLines=Error when calculating the depreciation lines (recovery and future)
+AssetErrorReversalDateNotProvidedForMode=The reversal date is not provided for the '%s' depreciation method
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=The reversal date must be greater than or equal to the beginning of the current fiscal year for the '%s' depreciation method
+AssetErrorReversalAmountNotProvidedForMode=The reversal amount is not provided for the depreciation mode '%s'.
+AssetErrorFetchCumulativeDepreciation=Error when retrieving the accumulated depreciation amount from the depreciation line
+AssetErrorSetLastCumulativeDepreciation=Error when recording the last accumulated depreciation amount
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index f066877f676..959db0f1a5f 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on
NoBankAccountDefined=No bank account defined
NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
AlreadyOneBankAccount=Already one bank account defined
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA transfer: 'Payment Type' at 'Credit Transfer' level
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=SEPA XML: PaymentTypeInformation is mandatory and can now be placed at CreditTransferTransactionInformation level (instead of Payment level). We strongly recommend to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
+ToCreateRelatedRecordIntoBank=To create missing related bank record
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 4fd2220dea6..9705f8823b0 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -82,6 +82,8 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools -
JobDisabled=Job disabled
MakeLocalDatabaseDumpShort=Local database backup
MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
+MakeSendLocalDatabaseDumpShort=Send local database backup
+MakeSendLocalDatabaseDump=Send local database backup by email. Parameters are: to, from, subject, message, filename (Name of file sent), filter ('sql' for backup of database only)
WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
DATAPOLICYJob=Data cleaner and anonymizer
JobXMustBeEnabled=Job %s must be enabled
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 98d83aa9453..86d11ec59ea 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -67,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name %s already exist
ErrorPartialFile=File not received completely by server.
ErrorNoTmpDir=Temporary directy %s does not exists.
ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
ErrorFieldTooLong=Field %s is too long.
ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
@@ -278,6 +278,7 @@ ErrorIsNotADraft=%s is not a draft
ErrorExecIdFailed=Can't execute command "id"
ErrorBadCharIntoLoginName=Unauthorized character in the login name
ErrorRequestTooLarge=Error, request too large
+ErrorNotApproverForHoliday=You are not the approver for leave %s
# Warnings
WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2867c7b853b..62d167ea233 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1165,3 +1165,5 @@ NotClosedYet=Not yet closed
ClearSignature=Reset signature
CanceledHidden=Canceled hidden
CanceledShown=Canceled shown
+Terminate=Terminate
+Terminated=Terminated
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 61b5c939d12..7610aa78e9e 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -94,7 +94,7 @@ LanguageDefDesc=Enter in this files, all the key and the translation for each la
MenusDefDesc=Define here the menus provided by your module
DictionariesDefDesc=Define here the dictionaries provided by your module
PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array $this->menus into the module descriptor file. You can edit manually this file or use the embedded editor.
Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+MenusDefDescTooltip=The menus provided by your module/application are defined into the array $this->menus into the module descriptor file. You can edit manually this file or use the embedded editor.
Note: Once defined (and the module re-activated), the menus are also visible into the menu editor available to administrator users on %s.
DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array $this->dictionaries into the module descriptor file. You can edit manually this file or use the embedded editor.
Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array $this->rights into the module descriptor file. You can edit manually this file or use the embedded editor.
Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
HooksDefDesc=Define in the module_parts['hooks'] property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on 'initHooks(' in core code).
Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on 'executeHooks' in core code).
@@ -110,7 +110,7 @@ DropTableIfEmpty=(Destroy table if empty)
TableDoesNotExists=The table %s does not exists
TableDropped=Table %s deleted
InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
+UseAboutPage=Do not generate the About page
UseDocFolder=Disable the documentation folder
UseSpecificReadme=Use a specific ReadMe
ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
@@ -138,10 +138,12 @@ CSSViewClass=CSS for read form
CSSListClass=CSS for list
NotEditable=Not editable
ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
+TypeOfFieldsHelp=Type of fields:
varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]
'1' means we add a + button after the combo to create the record
'filter' is a sql condition, example: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
AsciiToHtmlConverter=Ascii to HTML converter
AsciiToPdfConverter=Ascii to PDF converter
TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
ImportExportProfiles=Import and export profiles
ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+WarningDatabaseIsNotUpdated=Warning: The database is not updated automatically, you must destroy tables and disable-enable the module to have tables recreated
+LinkToParentMenu=Parent menu (fk_xxxxmenu)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 14715670882..aaa2fe0ead0 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
ProductSpecial=Special
QtyMin=Min. purchase quantity
PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+PriceQtyMinCurrency=Price (currency) for this qty.
+WithoutDiscount=Without discount
VATRateForSupplierProduct=VAT Rate (for this vendor/product)
DiscountQtyMin=Discount for this qty.
NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
@@ -346,7 +347,7 @@ UseProductFournDesc=Add a feature to define the product description defined by t
ProductSupplierDescription=Vendor description for the product
UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=You will automaticaly buy a multiple of this quantity. Can't be lower than the minimum purchase quantity
QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
#Attributes
@@ -411,3 +412,4 @@ Rank=Rank
SwitchOnSaleStatus=Switch on sale status
SwitchOnPurchaseStatus=Switch on purchase status
StockMouvementExtraFields= Extra Fields (stock mouvement)
+InventoryExtraFields= Extra Fields (inventory)
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
index 284c4fa61fa..eb115682726 100644
--- a/htdocs/langs/en_US/receiptprinter.lang
+++ b/htdocs/langs/en_US/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Test Sent To Printer %s
ReceiptPrinter=Receipt printers
ReceiptPrinterDesc=Setup of receipt printers
ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterTypeDesc=Example of possible values for the field "Parameters" according to the type of driver
ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
ListPrinters=List of Printers
SetupReceiptTemplate=Template Setup
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index ebd67df79c9..98faab0c423 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -254,7 +254,7 @@ ReOpen=Reopen
ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
ObjectNotFound=%s not found
MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Fill real quantity with expected quantity
ShowAllBatchByDefault=By default, show batch details on product "stock" tab
CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
ErrorWrongBarcodemode=Unknown Barcode mode
@@ -270,4 +270,5 @@ ErrorOnElementsInventory=Operation canceled for the following reason:
ErrorCantFindCodeInInventory=Can't find the following code in inventory
QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
\ No newline at end of file
+NoWarehouseDefinedForTerminal=No warehouse defined for terminal
+ClearQtys=Clear all quantities
\ No newline at end of file
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 38b199f7260..310ac8dd7f6 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -138,6 +138,13 @@ TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
TicketsAutoReadTicket=Automatically mark the ticket as read (when created from backoffice)
TicketsAutoReadTicketHelp=Automatically mark the ticket as read when created from backoffice. When ticket is create from the public interface, ticket remains with the status "Not Read".
+TicketsDelayBeforeFirstAnswer=A new ticket should receive a first answer before (hours):
+TicketsDelayBeforeFirstAnswerHelp=If a new ticket has not received an answer after this time period (in hours), an important warning icon will be displayed in the list view.
+TicketsDelayBetweenAnswers=An unresolved ticket should not be unactive during (hours):
+TicketsDelayBetweenAnswersHelp=If an unresolved ticket that has already received an answer has not had further interaction after this time period (in hours), a warning icon will be displayed in the list view.
+TicketsAutoNotifyClose=Automatically notify thirdparty when closing a ticket
+TicketsAutoNotifyCloseHelp=When closing a ticket, you will be proposed to send a message to one of thirdparty's contacts. On mass closing, a message will be sent to one contact of the thirdparty linked to the ticket.
+TicketWrongContact=Provided contact is not part of current ticket contacts. Email not sent.
#
# Index & list page
@@ -154,6 +161,8 @@ OrderByDateAsc=Sort by ascending date
OrderByDateDesc=Sort by descending date
ShowAsConversation=Show as conversation list
MessageListViewType=Show as table list
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
#
# Ticket card
@@ -241,9 +250,14 @@ TicketChangeStatus=Change status
TicketConfirmChangeStatus=Confirm the status change: %s ?
TicketLogStatusChanged=Status changed: %s to %s
TicketNotNotifyTiersAtCreate=Not notify company at create
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
Unread=Unread
TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
ErrorTicketRefRequired=Ticket reference name is required
+TicketsDelayForFirstResponseTooLong=Too much time elapsed since ticket opening without any answer.
+TicketsDelayFromLastResponseTooLong=Too much time elapsed since last answer on this ticket.
#
# Logs
@@ -273,6 +287,7 @@ TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
@@ -294,6 +309,10 @@ NewUser=New user
NumberOfTicketsByMonth=Number of tickets per month
NbOfTickets=Number of tickets
# notifications
+TicketCloseEmailSubjectCustomer=Ticket closed
+TicketCloseEmailBodyCustomer=This is an automatic message to notify you that ticket %s has just been closed.
+TicketCloseEmailSubjectAdmin=Ticket closed - Réf %s (public ticket ID %s)
+TicketCloseEmailBodyAdmin=A ticket with ID #%s has just been closed, see information:
TicketNotificationEmailSubject=Ticket %s updated
TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
TicketNotificationRecipient=Notification recipient
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8ddcce45285..55aa799ed90 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -97,15 +97,15 @@ function testSqlAndScriptInject($val, $type)
//$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $val); // Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
return realCharForNumericEntities($m); }, $val);
+
+ // We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
+ // We should use dol_string_nounprintableascii but function is not yet loaded/available
+ $val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
+ // We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: onerror=alert(1)
+ $val = preg_replace('//', '', $val);
} while ($oldval != $val);
//print "after decoding $val\n";
- // We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
- // We should use dol_string_nounprintableascii but function is not yet loaded/available
- $val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
- // We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: onerror=alert(1)
- $val = preg_replace('//', '', $val);
-
$inj = 0;
// For SQL Injection (only GET are used to scan for such injection strings)
if ($type == 1 || $type == 3) {
@@ -149,7 +149,7 @@ function testSqlAndScriptInject($val, $type)
// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like ![]( "...")
$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforecopy|beforecut|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $val);
- $inj += preg_match('/on(dblclick|drop|durationchange|emptied|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $val);
+ $inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $val);
$inj += preg_match('/on(lostpointercapture|offline|online|pagehide|pageshow)\s*=/i', $val);
$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)\s*=/i', $val);
$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $val);
@@ -158,8 +158,8 @@ function testSqlAndScriptInject($val, $type)
$tmpval = preg_replace('/<[^<]+>/', '', $val);
// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like ![]( "...")
- $inj += preg_match('/on(abort|afterprint|animation|auxclick|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $tmpval);
- $inj += preg_match('/on(dblclick|drop|durationchange|emptied|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $tmpval);
+ $inj += preg_match('/on(abort|afterprint|animation|auxclick|beforecopy|beforecut|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $tmpval);
+ $inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $tmpval);
$inj += preg_match('/on(lostpointercapture|offline|online|pagehide|pageshow)\s*=/i', $tmpval);
$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)\s*=/i', $tmpval);
$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $tmpval);
@@ -282,7 +282,7 @@ if (!empty($php_session_save_handler) && $php_session_save_handler == 'db') {
// Init session. Name of session is specific to Dolibarr instance.
// Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
-// Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
+// Note: the function dol_getprefix() is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
$prefix = dol_getprefix('');
$sessionname = 'DOLSESSID_'.$prefix;
$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
@@ -290,7 +290,6 @@ if (!empty($_COOKIE[$sessiontimeout])) {
ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
}
-
// This create lock, released by session_write_close() or end of page.
// We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
if (!defined('NOSESSION')) {
@@ -504,7 +503,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
// If token is not provided or empty, error (we are in case it is mandatory)
if (!GETPOST('token', 'alpha') || GETPOST('token', 'alpha') == 'notrequired') {
if (GETPOST('uploadform', 'int')) {
- dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused. File size too large.");
+ dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused. File size too large or not provided.");
$langs->loadLangs(array("errors", "install"));
print $langs->trans("ErrorFileSizeTooLarge").' ';
print $langs->trans("ErrorGoBackAndCorrectParameters");
@@ -534,7 +533,10 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
//print 'Unset POST by CSRF protection in main.inc.php.'; // Do not output anything because this create problems when using the BACK button on browsers.
setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');
- if (isset($_POST['id'])) $savid = ((int) $_POST['id']);
+ $savid = null;
+ if (isset($_POST['id'])) {
+ $savid = ((int) $_POST['id']);
+ }
unset($_POST);
//unset($_POST['action']); unset($_POST['massaction']);
//unset($_POST['confirm']); unset($_POST['confirmmassaction']);
@@ -542,7 +544,10 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
unset($_GET['action']);
unset($_GET['confirmmassaction']);
unset($_GET['massaction']);
- if (isset($savid)) $_POST['id'] = ((int) $savid);
+ unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
+ if (isset($savid)) {
+ $_POST['id'] = ((int) $savid);
+ }
}
// Note: There is another CSRF protection into the filefunc.inc.php
@@ -3263,7 +3268,7 @@ if (!function_exists("llxFooter")) {
$forceping = GETPOST('forceping', 'alpha');
if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping) {
//print '';
- $hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
+ $hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id); // Do not use dol_hash(), must not change if salt changes.
if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 30c85197337..94330eb8dc1 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -64,7 +64,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
}
if ($action == 'remises') {
- if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0) {
+ if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', GETPOST('MARGIN_METHODE_FOR_DISCOUNT'), 'chaine', 0, '', $conf->entity) > 0) {
setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
} else {
dol_print_error($db);
@@ -72,7 +72,7 @@ if ($action == 'remises') {
}
if ($action == 'typemarges') {
- if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0) {
+ if (dolibarr_set_const($db, 'MARGIN_TYPE', GETPOST('MARGIN_TYPE'), 'chaine', 0, '', $conf->entity) > 0) {
setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
} else {
dol_print_error($db);
@@ -80,7 +80,7 @@ if ($action == 'typemarges') {
}
if ($action == 'contact') {
- if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0) {
+ if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', GETPOST('AGENT_CONTACT_TYPE'), 'chaine', 0, '', $conf->entity) > 0) {
setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
} else {
dol_print_error($db);
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index e5ccb0c3966..01a02d0c7dd 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -120,7 +120,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
print '';
print '| '.$langs->trans("UseAboutPage").' | ';
- print '';
+ print ' | ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('MODULEBUILDER_USE_ABOUT');
} else {
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index e0bd19ab251..240c739e5c0 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -955,6 +955,21 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
if ($fieldname == 'entity') {
$index = 1;
}
+ // css
+ $css = '';
+ $cssview = '';
+ $csslist = '';
+ if (preg_match('/^fk_/', $fieldname)) {
+ $css = 'maxwidth500 widthcentpercentminusxx';
+ }
+ if ($fieldname == 'label') {
+ $css = 'minwidth300';
+ $cssview = 'wordbreak';
+ }
+ if (in_array($fieldname, array('note_public', 'note_private'))) {
+ $cssview = 'wordbreak';
+ }
+
$string .= "'".$obj->Field."' =>array('type'=>'".$type."', 'label'=>'".$label."',";
if ($default != '') {
@@ -972,6 +987,15 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
if ($index) {
$string .= ", 'index'=>".$index;
}
+ if ($css) {
+ $string .= ", 'css'=>".$css;
+ }
+ if ($cssview) {
+ $string .= ", 'cssview'=>".$cssview;
+ }
+ if ($csslist) {
+ $string .= ", 'csslist'=>".$csslist;
+ }
$string .= "),\n";
$string .= "
";
$i += 5;
@@ -1307,7 +1331,6 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
}
- }
if (!$error && !GETPOST('regenerateclasssql')&& !GETPOST('regeneratemissing')) {
$addfieldentry = array(
@@ -1324,16 +1347,18 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
'isameasure'=>GETPOST('propisameasure', 'int'),
'comment'=>GETPOST('propcomment', 'alpha'),
'help'=>GETPOST('prophelp', 'alpha'),
- 'css'=>GETPOST('propcss', 'aZ09'),
- 'cssview'=>GETPOST('propcssview', 'aZ09'),
- 'csslist'=>GETPOST('propcsslist', 'aZ09'),
+ 'css'=>GETPOST('propcss', 'alpha'), // Can be 'maxwidth500 widthcentpercentminusxx' for example
+ 'cssview'=>GETPOST('propcssview', 'alpha'),
+ 'csslist'=>GETPOST('propcsslist', 'alpha'),
'default'=>GETPOST('propdefault', 'restricthtml'),
'noteditable'=>intval(GETPOST('propnoteditable', 'int')),
'validate' => GETPOST('propvalidate', 'int')
);
- if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
- $addfieldentry['arrayofkeyval'] = json_decode($addfieldentry['arrayofkeyval'], true);
+
+ if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
+ $addfieldentry['arrayofkeyval'] = json_decode($addfieldentry['arrayofkeyval'], true);
+ }
}
} else {
$addfieldentry = array();
@@ -1348,8 +1373,8 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
// Edit the class file to write properties
if (!$error) {
$moduletype = 'external';
-
$object = rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, $addfieldentry, $moduletype);
+
if (is_numeric($object) && $object <= 0) {
$error++;
}
@@ -1368,6 +1393,8 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
if (!$error) {
setEventMessages($langs->trans('FilesForObjectUpdated', $objectname), null);
+ setEventMessages($langs->trans('WarningDatabaseIsNotUpdated'), null);
+
clearstatcache(true);
// Make a redirect to reload all data
@@ -1942,6 +1969,11 @@ if ($module == 'initmodule') {
$head2[$h][2] = 'description';
$h++;
+ $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '');
+ $head2[$h][1] = $langs->trans("Objects");
+ $head2[$h][2] = 'objects';
+ $h++;
+
$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=languages&module='.$module.($forceddirread ? '@'.$dirread : '');
$head2[$h][1] = $langs->trans("Languages");
$head2[$h][2] = 'languages';
@@ -1952,11 +1984,6 @@ if ($module == 'initmodule') {
$head2[$h][2] = 'dictionaries';
$h++;
- $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '');
- $head2[$h][1] = $langs->trans("Objects");
- $head2[$h][2] = 'objects';
- $h++;
-
$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$module.($forceddirread ? '@'.$dirread : '');
$head2[$h][1] = $langs->trans("Permissions");
$head2[$h][2] = 'permissions';
@@ -2289,7 +2316,7 @@ if ($module == 'initmodule') {
print '';
print '';
- print_liste_field_titre("#", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+ print_liste_field_titre("#", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, ' aaa ');
print_liste_field_titre("Table", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("SQL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
@@ -2539,8 +2566,9 @@ if ($module == 'initmodule') {
$pathtoapi = strtolower($module).'/class/api_'.strtolower($module).'s.class.php';
$realpathtoapi = $dirread.'/'.$pathtoapi;
}
- $urloflist = $dirread.'/'.$pathtolist;
- $urlofcard = $dirread.'/'.$pathtocard;
+
+ $urloflist = dol_buildpath('/'.$pathtolist, 1);
+ $urlofcard = dol_buildpath('/'.$pathtocard, 1);
print '';
print ' '.$langs->trans("ClassFile").' : '.($realpathtoclass ? '' : '').preg_replace('/^'.strtolower($module).'\//', '', $pathtoclass).($realpathtoclass ? '' : '').'';
@@ -2701,7 +2729,7 @@ if ($module == 'initmodule') {
print ' ';
print ' ';
print '';
- print '| '.$langs->trans("Property");
+ print ' | '.$langs->trans("Property");
print ' ('.$langs->trans("SeeExamples").')';
print ' | ';
print '';
@@ -2727,7 +2755,7 @@ if ($module == 'initmodule') {
//print ' | '.$langs->trans("Disabled").' | ';
print ''.$form->textwithpicto($langs->trans("Validate"), $langs->trans("ValidateModBuilderDesc")).' | ';
print ''.$langs->trans("Comment").' | ';
- print ' | ';
+ print ' | ';
print ' ';
// We must use $reflectorpropdefault['fields'] to get list of fields because $tmpobjet->fields may have been
@@ -2738,7 +2766,7 @@ if ($module == 'initmodule') {
if (!empty($properties)) {
// Line to add a property
print '';
- print ' | ';
+ print ' | ';
print ' | ';
print ' | ';
print ' | ';
@@ -2760,7 +2788,7 @@ if ($module == 'initmodule') {
//print ' | ';
print ' | ';
print ' | ';
- print '';
+ print ' | ';
print '';
print ' | ';
@@ -2805,7 +2833,7 @@ if ($module == 'initmodule') {
print '';
- print '| ';
+ print ' | ';
print dol_escape_htmltag($propname);
print ' | ';
print '';
@@ -2820,7 +2848,7 @@ if ($module == 'initmodule') {
print ' | ';
print '';
print '';
@@ -2876,7 +2904,7 @@ if ($module == 'initmodule') {
print ' | ';
print '';
print ' | ';
- print '';
+ print ' | ';
print '';
print '';
print ' | ';
@@ -2886,8 +2914,8 @@ if ($module == 'initmodule') {
print '';
print '';
if ($proparrayofkeyval) {
- print '';
- print dol_escape_htmltag(json_encode($proparrayofkeyval));
+ print '';
+ print dol_escape_htmltag(json_encode($proparrayofkeyval, JSON_UNESCAPED_UNICODE));
print '';
}
print ' | ';
@@ -2947,7 +2975,7 @@ if ($module == 'initmodule') {
print dol_escape_htmltag($propcomment);
print '';
print '';
- print '';
+ print ' | ';
if ($propname != 'rowid') {
print ''.img_edit().'';
print ''.img_delete().'';
@@ -3081,14 +3109,14 @@ if ($module == 'initmodule') {
print ' | ';
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("fk_menu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+ print_liste_field_titre("LinkToParentMenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Title", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("mainmenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("leftmenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("URL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+ print_liste_field_titre("RelativeURL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("LanguageFile", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Position", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("Enabled", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+ print_liste_field_titre("Position", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'right ');
+ print_liste_field_titre("Enabled", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Permission", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Target", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("UserType", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'right ');
@@ -3126,15 +3154,15 @@ if ($module == 'initmodule') {
print dol_escape_htmltag($menu['langs']);
print '';
- print '| ';
+ print ' | ';
print dol_escape_htmltag($menu['position']);
print ' | ';
- print '';
+ print ' | ';
print dol_escape_htmltag($menu['enabled']);
print ' | ';
- print '';
+ print ' | ';
print dol_escape_htmltag($menu['perms']);
print ' | ';
@@ -3836,8 +3864,10 @@ if ($module == 'initmodule') {
$FILENAMEDOCPDF = $modulelowercase.'.pdf';
$outputfiledoc = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOC;
$outputfiledocurl = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOC;
+ $outputfiledocrel = $modulelowercase.'/doc/'.$FILENAMEDOC;
$outputfiledocpdf = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOCPDF;
$outputfiledocurlpdf = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOCPDF;
+ $outputfiledocrelpdf = $modulelowercase.'/doc/'.$FILENAMEDOCPDF;
// HTML
print ' '.$langs->trans("PathToModuleDocumentation", "HTML").' : ';
@@ -3850,6 +3880,7 @@ if ($module == 'initmodule') {
print '';
print '';
print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')';
+ print ' '.img_picto($langs->trans("Delete"), 'delete').'';
}
print '
';
@@ -3864,6 +3895,7 @@ if ($module == 'initmodule') {
print '';
print '';
print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledocpdf), 'dayhour').')';
+ print ' '.img_picto($langs->trans("Delete"), 'delete').'';
}
print '
';
@@ -3930,8 +3962,11 @@ if ($module == 'initmodule') {
$relativepath = $modulelowercase.'/bin/'.$FILENAMEZIP;
print ''.$outputfilezip.'';
print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfilezip), 'dayhour').')';
+ print ' '.img_picto($langs->trans("Delete"), 'delete').'';
}
- print '
';
+ print '';
+
+ print '
';
print '
';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index ac934439934..4e88703b454 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -108,11 +108,11 @@ class MyObject extends CommonObject
'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>2, 'validate'=>1),
'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount', 'validate'=>1),
'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp', 'validate'=>1),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty', 'validate'=>1),
- 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'validate'=>1),
+ 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty', 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx'),
+ 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx'),
'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60, 'validate'=>1),
- 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'validate'=>1),
- 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'validate'=>1),
+ 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'validate'=>1, 'cssview'=>'wordbreak'),
+ 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'validate'=>1, 'cssview'=>'wordbreak'),
'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>500),
'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 0, 'position'=>501),
//'date_validation ' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>502),
@@ -122,7 +122,7 @@ class MyObject extends CommonObject
'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'notnull'=>0, 'position'=>600),
'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'notnull'=>-1, 'position'=>1010),
- 'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled'), 'validate'=>1),
+ 'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled'), 'validate'=>1),
);
/**
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 13e34593bba..874d964ad6e 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -305,7 +305,7 @@ class modMyModule extends DolibarrModules
/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
$this->menu[$r++]=array(
'fk_menu'=>'fk_mainmenu=mymodule', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Top menu entry
+ 'type'=>'left', // This is a Left menu entry
'titre'=>'MyObject',
'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
'mainmenu'=>'mymodule',
@@ -432,7 +432,7 @@ class modMyModule extends DolibarrModules
$sql = array();
// Document templates
- $moduledir = 'mymodule';
+ $moduledir = dol_sanitizeFileName('mymodule');
$myTmpObjects = array();
$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
@@ -441,8 +441,8 @@ class modMyModule extends DolibarrModules
continue;
}
if ($myTmpObjectArray['includerefgeneration']) {
- $src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
- $dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
+ $src = DOL_DOCUMENT_ROOT.'/install/doctemplates/'.$moduledir.'/template_myobjects.odt';
+ $dirodt = DOL_DATA_ROOT.'/doctemplates/'.$moduledir;
$dest = $dirodt.'/template_myobjects.odt';
if (file_exists($src) && !file_exists($dest)) {
diff --git a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
index 2f0ecd06774..21cb16c3644 100644
--- a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
+++ b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
@@ -22,7 +22,7 @@ if (empty($conf) || !is_object($conf)) {
}
-print "\n";
+print "\n";
global $user;
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index e29057c5423..37ece327185 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -28,8 +28,6 @@
* - interface_99_all_MyTrigger.class.php
* - The file must stay in core/triggers
* - The class name must be InterfaceMytrigger
- * - The constructor method must be named InterfaceMytrigger
- * - The name property name must be MyTrigger
*/
require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 5eb4f6e3028..b40092f93a7 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -132,15 +132,24 @@ if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->mymodule->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
}
-$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
+// There is several ways to check permission.
+// Set $enablepermissioncheck to 1 to enable a minimum low level of checks
+$enablepermissioncheck = 0;
+if ($enablepermissioncheck) {
+ $permissiontoread = $user->rights->mymodule->myobject->read;
+ $permissiontoadd = $user->rights->mymodule->myobject->write;
+} else {
+ $permissiontoread = 1;
+ $permissiontoadd = 1;
+}
// Security check (enable the most restrictive one)
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-//if (empty($conf->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
+if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
/*
@@ -187,7 +196,7 @@ if ($object->id > 0) {
$head = myobjectPrepareHead($object);
- print dol_get_fiche_head($head, 'agenda', '', -1, $object->picto);
+ print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, $object->picto);
// Object card
// ------------------------------------------------------------
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 531d463eea1..6d5c807c3f0 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -122,12 +122,23 @@ if (empty($action) && empty($id) && empty($ref)) {
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+// There is several ways to check permission.
+// Set $enablepermissioncheck to 1 to enable a minimum low level of checks
+$enablepermissioncheck = 0;
+if ($enablepermissioncheck) {
+ $permissiontoread = $user->rights->mymodule->myobject->read;
+ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+ $permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+ $permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
+ $permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php
+} else {
+ $permissiontoread = 1;
+ $permissiontoadd = 1; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+ $permissiontodelete = 1;
+ $permissionnote = 1;
+ $permissiondellink = 1;
+}
-$permissiontoread = $user->rights->mymodule->myobject->read;
-$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php
$upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1].'/myobject';
// Security check (enable the most restrictive one)
@@ -135,8 +146,8 @@ $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object-
//if ($user->socid > 0) $socid = $user->socid;
//$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-//if (empty($conf->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
+if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
/*
@@ -230,6 +241,11 @@ llxHeader('', $title, $help_url);
// Part to create
if ($action == 'create') {
+ if (empty($permissiontoadd)) {
+ accessforbidden($langs->trans('NotEnoughPermissions'), 0, 1);
+ exit;
+ }
+
print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")), '', 'object_'.$object->picto);
print '';
print '
';
@@ -404,7 +407,7 @@ if ($resql) {
$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
}
- print '';
+ print ' ';
print ' '."\n";
// Lines with input filters
@@ -426,7 +429,7 @@ if ($resql) {
// rate
if (!empty($arrayfields['cr.rate']['checked'])) {
print '| ';
- print '';
+ print '';
print ' | ';
}
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 3f822679350..bc018a2dda1 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -137,18 +137,18 @@ if (empty($reshook)) {
if (GETPOST('ajoutcomment')) {
$error = 0;
- if (!GETPOST('comment')) {
+ if (!GETPOST('comment', "alphanohtml")) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
}
- if (!GETPOST('commentuser')) {
+ if (!GETPOST('commentuser', "alphanohtml")) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
}
if (!$error) {
- $comment = (string) GETPOST("comment", "restricthtml");
- $comment_user = (string) GETPOST('commentuser', "restricthtml");
+ $comment = (string) GETPOST("comment", "alphanohtml");
+ $comment_user = (string) GETPOST('commentuser', "alphanohtml");
$resql = $object->addComment($comment, $comment_user);
@@ -422,7 +422,7 @@ print '
';
if ($object->allow_comments) {
print $langs->trans("AddACommentForPoll").'
';
print '
'."\n";
- print $langs->trans("Name").': '."\n";
+ print $langs->trans("Name").': '."\n";
print '
'."\n";
}
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index e37f9bf3de5..f372e847455 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -53,7 +53,7 @@ $nblines = $object->fetch_lines();
// Return to the results
if (GETPOST('retoursondage')) {
- header('Location: results.php?id='.GETPOST('id', 'int'));
+ header('Location: results.php?id='.(GETPOSTISSET('id_sondage') ? GETPOST('id_sondage', 'aZ09') : GETPOST('id', 'int')));
exit;
}
@@ -103,13 +103,13 @@ $testmodifier = false;
$testligneamodifier = false;
$ligneamodifier = -1;
for ($i = 0; $i < $nblines; $i++) {
- if (isset($_POST['modifierligne'.$i])) {
+ if (GETPOSTISSET('modifierligne'.$i)) {
$ligneamodifier = $i;
$testligneamodifier = true;
}
//test pour voir si une ligne est a modifier
- if (isset($_POST['validermodifier'.$i])) {
+ if (GETPOSTISSET('validermodifier'.$i)) {
$modifier = $i;
$testmodifier = true;
}
@@ -153,7 +153,7 @@ if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && $object->format =
//on rajoute la valeur a la fin de tous les sujets deja entrés
$nouveauxsujets .= ',';
- $nouveauxsujets .= str_replace(array(",", "@"), " ", GETPOST("nouvellecolonne")).(empty($_POST["typecolonne"]) ? '' : '@'.GETPOST("typecolonne"));
+ $nouveauxsujets .= str_replace(array(",", "@"), " ", GETPOST("nouvellecolonne")).(!GETPOST("typecolonne") ? '' : '@'.GETPOST("typecolonne"));
//mise a jour avec les nouveaux sujets dans la base
$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
@@ -588,6 +588,7 @@ if (GETPOST('ajoutsujet')) {
$tmparray = array('checkbox'=>$langs->trans("CheckBox"), 'yesno'=>$langs->trans("YesNoList"), 'foragainst'=>$langs->trans("PourContreList"));
print $langs->trans("Type").' '.$form->selectarray("typecolonne", $tmparray, GETPOST('typecolonne')).'
';
print '';
+ print '';
print ' ';
print '';
print '
'."\n";
@@ -663,6 +664,7 @@ $nbcolonnes = substr_count($object->sujet, ',') + 1;
print ' | |