From a6a8dcb6c8f5d7955c782dd6f6194712239c2225 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 5 Sep 2018 15:36:42 +0100
Subject: [PATCH] compatibility php7.2
---
.../avis/class/avis_controler_Abstract.php | 24 +++--
.../avis/difflist_avis_history_display.php | 66 +++++++-------
modules/entities/difflist_history_display.php | 66 +++++++-------
.../difflist_visa_history_display.php | 68 +++++++-------
modules/entities/lang/en.php | 10 +++
modules/entities/lang/fr.php | 10 +++
.../class/class_modules_tools_Abstract.php | 89 ++++++++++++++-----
modules/visa/show_visa_tab.php | 2 +-
8 files changed, 203 insertions(+), 132 deletions(-)
diff --git a/modules/avis/class/avis_controler_Abstract.php b/modules/avis/class/avis_controler_Abstract.php
index 63d86f95d00..cb61ff1dcc1 100755
--- a/modules/avis/class/avis_controler_Abstract.php
+++ b/modules/avis/class/avis_controler_Abstract.php
@@ -101,7 +101,7 @@ abstract class avis_controler_Abstract
$i = 1;
$lastUserAvis = true;
- if (count($circuit['avis']['users']) == 0) {
+ if (empty($circuit['avis']['users']) || !is_array($circuit['avis']['users']) || count($circuit['avis']['users']) == 0) {
$str .= '<div id="emptyAvis"><strong><em>'._EMPTY_AVIS_WORKFLOW.'</em></strong></div>';
} else {
$str .= '<div id="emptyAvis" style="display:none;"><strong><em>'._EMPTY_AVIS_WORKFLOW.'</em></strong></div>';
@@ -287,7 +287,10 @@ abstract class avis_controler_Abstract
$diff_list = new diffusion_list();
$diff_list->save_listmodel(
- $workflow, $typeList, $id_list, $title
+ $workflow,
+ $typeList,
+ $id_list,
+ $title
);
}
@@ -297,7 +300,12 @@ abstract class avis_controler_Abstract
$diff_list = new diffusion_list();
$diff_list->save_listinstance(
- $workflow, $typeList, $coll_id, $res_id, $_SESSION['user']['UserId'], $_SESSION['user']['primaryentity']['id']
+ $workflow,
+ $typeList,
+ $coll_id,
+ $res_id,
+ $_SESSION['user']['UserId'],
+ $_SESSION['user']['primaryentity']['id']
);
}
@@ -403,8 +411,14 @@ abstract class avis_controler_Abstract
$hist = new history();
$hist->add(
- $view, $resId, 'UP', 'resup', _AVIS_UPDATED
- ._ON_DOC_NUM.$resId.' '._BY.' '.$_SESSION['user']['UserId'], $_SESSION['config']['databasetype'], 'notes'
+ $view,
+ $resId,
+ 'UP',
+ 'resup',
+ _AVIS_UPDATED
+ ._ON_DOC_NUM.$resId.' '._BY.' '.$_SESSION['user']['UserId'],
+ $_SESSION['config']['databasetype'],
+ 'notes'
);
}
}
diff --git a/modules/avis/difflist_avis_history_display.php b/modules/avis/difflist_avis_history_display.php
index f202c08d38f..329fd7c511e 100755
--- a/modules/avis/difflist_avis_history_display.php
+++ b/modules/avis/difflist_avis_history_display.php
@@ -51,7 +51,7 @@ $urlParameters = '';
//Templates
$defaultTemplate = 'history_list_diff';
$selectedTemplate = $list->getTemplate();
- if (empty($selectedTemplate)) {
+ if (empty($selectedTemplate)) {
if (!empty($defaultTemplate)) {
$list->setTemplate($defaultTemplate);
$selectedTemplate = $list->getTemplate();
@@ -62,7 +62,9 @@ $urlParameters = '';
//For status icon
$extension_icon = '';
- if($selectedTemplate <> 'none') $extension_icon = "_big";
+ if ($selectedTemplate <> 'none') {
+ $extension_icon = "_big";
+ }
/************Construction de la requete*******************/
//Table or view
@@ -72,16 +74,16 @@ $urlParameters = '';
//Fields
//Documents
- array_push($select[$view], "listinstance_history_id", "res_id", "updated_by_user", "updated_date");
+ array_push($select[$view], "listinstance_history_id", "res_id", "updated_by_user", "updated_date");
//Where clause
- $where_tab = array();
+ $where_tab = array();
$where_tab[] = "res_id = ?";
$where_tab[] = "coll_id = ?";
- $arrayPDO = array();
-
- if (isset($diffListType)) {
- $where_tab[] = "listinstance_history_id IN (SELECT DISTINCT listinstance_history_id from listinstance_history_details where difflist_type = '$diffListType')";
+ $arrayPDO = array();
+
+ if (isset($diffListType)) {
+ $where_tab[] = "listinstance_history_id IN (SELECT DISTINCT listinstance_history_id from listinstance_history_details where difflist_type = '$diffListType')";
}
//From searching comp query
@@ -94,34 +96,34 @@ $urlParameters = '';
// $_SESSION['save_list']['order'] = $order;
// $_SESSION['save_list']['order_field'] = $order_field;
- if (!empty($order_field) && !empty($order))
+ if (!empty($order_field) && !empty($order)) {
$orderstr = "order by ".$order_field." ".$order;
- else {
+ } else {
$list->setOrder();
$list->setOrderField('updated_date');
$orderstr = "order by updated_date desc";
}
-//URL extra Parameters
+//URL extra Parameters
$parameters = '';
$start = $list->getStart();
- if (!empty($selectedTemplate)) $parameters .= '&template='.$selectedTemplate;
- if (!empty($start)) $parameters .= '&start='.$start;
+ if (!empty($selectedTemplate)) {
+ $parameters .= '&template='.$selectedTemplate;
+ }
+ if (!empty($start)) {
+ $parameters .= '&start='.$start;
+ }
// $_SESSION['save_list']['start'] = $start;
//Query
- $tab=$request->PDOselect($select,$where_request,$arrayPDO,$orderstr,$_SESSION['config']['databasetype'],"default", false, "", "", "", $add_security);
+ $tab=$request->PDOselect($select, $where_request, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], "default", false, "", "", "", $add_security);
// $request->show();
//Result array
- for ($i=0;$i<count($tab);$i++)
- {
- for ($j=0;$j<count($tab[$i]);$j++)
- {
- foreach(array_keys($tab[$i][$j]) as $value)
- {
- if($tab[$i][$j][$value]=="listinstance_history_id")
- {
+ for ($i=0;$i<count($tab);$i++) {
+ for ($j=0;$j<count($tab[$i]);$j++) {
+ foreach (array_keys($tab[$i][$j]) as $value) {
+ if ($tab[$i][$j][$value]=="listinstance_history_id") {
$tab[$i][$j]["label"]=_TYPE_ID_HISTORY;
$tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
@@ -133,8 +135,7 @@ $urlParameters = '';
$tab[$i][$j]["order"]="listinstance_history_id";
}
- if($tab[$i][$j][$value]=="res_id")
- {
+ if ($tab[$i][$j][$value]=="res_id") {
$tab[$i][$j]["label"]=_RES_ID;
$tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
@@ -146,11 +147,10 @@ $urlParameters = '';
$tab[$i][$j]["order"]="res_id";
}
- if($tab[$i][$j][$value]=="updated_by_user")
- {
+ if ($tab[$i][$j][$value]=="updated_by_user") {
$tab[$i][$j]["label"]=_UPDATED_BY_USER;
$db = new Database();
- $stmt = $db->query("SELECT firstname, lastname FROM users WHERE user_id = ?",array($tab[$i][$j]['value']));
+ $stmt = $db->query("SELECT firstname, lastname FROM users WHERE user_id = ?", array($tab[$i][$j]['value']));
$user = $stmt->fetchObject();
$tab[$i][$j]['value'] = ucwords($user->lastname) . " " . functions::show_string(ucfirst($user->firstname));
$tab[$i][$j]["size"]="15";
@@ -162,9 +162,8 @@ $urlParameters = '';
$tab[$i][$j]["order"]="updated_by_user";
}
- if($tab[$i][$j][$value]=="updated_date")
- {
- $tab[$i][$j]["label"]=__UPDATED_DATE;
+ if ($tab[$i][$j][$value]=="updated_date") {
+ $tab[$i][$j]["label"]=_UPDATED_DATE;
$tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
$tab[$i][$j]["label_align"]="left";
@@ -174,13 +173,12 @@ $urlParameters = '';
$tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
$tab[$i][$j]["order"]="updated_date";
}
-
}
}
}
if (count($tab) > 0) {
-/************Construction de la liste*******************/
+ /************Construction de la liste*******************/
//Clé de la liste
$listKey = 'listinstance_history_id';
@@ -197,7 +195,7 @@ if (count($tab) > 0) {
//Form attributs
//Standalone form
- $paramsTab['bool_standaloneForm'] = true;
+ $paramsTab['bool_standaloneForm'] = true;
//Afficher la liste dans process
if (isset($return_mode) && $return_mode) {
@@ -211,7 +209,7 @@ if (count($tab) > 0) {
$frm_str .= _DIFFLIST_NEVER_MODIFIED;
} else {
echo '<br/>' . _DIFFLIST_NEVER_MODIFIED;
- }
+ }
}
// $list->debug();
diff --git a/modules/entities/difflist_history_display.php b/modules/entities/difflist_history_display.php
index a399cc6d4f1..8df4b293506 100755
--- a/modules/entities/difflist_history_display.php
+++ b/modules/entities/difflist_history_display.php
@@ -20,7 +20,7 @@
*/
/**
-* @brief Displays diffusion list history
+* @brief Displays diffusion list history
*
* @file
* @author <dev@maarch.org>
@@ -52,7 +52,7 @@ $urlParameters = '';
//Templates
$defaultTemplate = 'history_list_diff';
$selectedTemplate = $list->getTemplate();
- if (empty($selectedTemplate)) {
+ if (empty($selectedTemplate)) {
if (!empty($defaultTemplate)) {
$list->setTemplate($defaultTemplate);
$selectedTemplate = $list->getTemplate();
@@ -63,7 +63,9 @@ $urlParameters = '';
//For status icon
$extension_icon = '';
- if($selectedTemplate <> 'none') $extension_icon = "_big";
+ if ($selectedTemplate <> 'none') {
+ $extension_icon = "_big";
+ }
/************Construction de la requete*******************/
//Table or view
@@ -73,16 +75,16 @@ $urlParameters = '';
//Fields
//Documents
- array_push($select[$view], "listinstance_history_id", "res_id", "updated_by_user", "updated_date");
+ array_push($select[$view], "listinstance_history_id", "res_id", "updated_by_user", "updated_date");
//Where clause
- $where_tab = array();
+ $where_tab = array();
$where_tab[] = "res_id = ?";
$where_tab[] = "coll_id = ?";
- $arrayPDO = array();
-
- if (isset($diffListType)) {
- $where_tab[] = "listinstance_history_id IN (SELECT DISTINCT listinstance_history_id from listinstance_history_details where difflist_type = '$diffListType')";
+ $arrayPDO = array();
+
+ if (isset($diffListType)) {
+ $where_tab[] = "listinstance_history_id IN (SELECT DISTINCT listinstance_history_id from listinstance_history_details where difflist_type = '$diffListType')";
}
//From searching comp query
@@ -93,33 +95,33 @@ $urlParameters = '';
$order = $list->getOrder();
$order_field = $list->getOrderField();
- if (!empty($order_field) && !empty($order))
+ if (!empty($order_field) && !empty($order)) {
$orderstr = "order by ".$order_field." ".$order;
- else {
+ } else {
$list->setOrder();
$list->setOrderField('updated_date');
$orderstr = "order by updated_date desc";
}
-//URL extra Parameters
+//URL extra Parameters
$parameters = '';
$start = $list->getStart();
- if (!empty($selectedTemplate)) $parameters .= '&template='.$selectedTemplate;
- if (!empty($start)) $parameters .= '&start='.$start;
+ if (!empty($selectedTemplate)) {
+ $parameters .= '&template='.$selectedTemplate;
+ }
+ if (!empty($start)) {
+ $parameters .= '&start='.$start;
+ }
//Query
- $tab=$request->PDOselect($select,$where_request, $arrayPDO, $orderstr,$_SESSION['config']['databasetype'],"default", false, "", "", "", $add_security);
+ $tab=$request->PDOselect($select, $where_request, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], "default", false, "", "", "", $add_security);
// $request->show();
//Result array
- for ($i=0;$i<count($tab);$i++)
- {
- for ($j=0;$j<count($tab[$i]);$j++)
- {
- foreach(array_keys($tab[$i][$j]) as $value)
- {
- if($tab[$i][$j][$value]=="listinstance_history_id")
- {
+ for ($i=0;$i<count($tab);$i++) {
+ for ($j=0;$j<count($tab[$i]);$j++) {
+ foreach (array_keys($tab[$i][$j]) as $value) {
+ if ($tab[$i][$j][$value]=="listinstance_history_id") {
$tab[$i][$j]["label"]=_TYPE_ID_HISTORY;
$tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
@@ -131,8 +133,7 @@ $urlParameters = '';
$tab[$i][$j]["order"]="listinstance_history_id";
}
- if($tab[$i][$j][$value]=="res_id")
- {
+ if ($tab[$i][$j][$value]=="res_id") {
$tab[$i][$j]["label"]=_RES_ID;
$tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
@@ -144,8 +145,7 @@ $urlParameters = '';
$tab[$i][$j]["order"]="res_id";
}
- if($tab[$i][$j][$value]=="updated_by_user")
- {
+ if ($tab[$i][$j][$value]=="updated_by_user") {
$tab[$i][$j]["label"]=_UPDATED_BY_USER;
$db = new Database();
$stmt = $db->query("SELECT firstname, lastname FROM users WHERE user_id = '".$tab[$i][$j]['value']."'");
@@ -160,9 +160,8 @@ $urlParameters = '';
$tab[$i][$j]["order"]="updated_by_user";
}
- if($tab[$i][$j][$value]=="updated_date")
- {
- $tab[$i][$j]["label"]=__UPDATED_DATE;
+ if ($tab[$i][$j][$value]=="updated_date") {
+ $tab[$i][$j]["label"]=_UPDATED_DATE;
$tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
$tab[$i][$j]["label_align"]="left";
@@ -172,13 +171,12 @@ $urlParameters = '';
$tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
$tab[$i][$j]["order"]="updated_date";
}
-
}
}
}
if (count($tab) > 0) {
-/************Construction de la liste*******************/
+ /************Construction de la liste*******************/
//Clé de la liste
$listKey = 'listinstance_history_id';
@@ -195,7 +193,7 @@ if (count($tab) > 0) {
//Form attributs
//Standalone form
- $paramsTab['bool_standaloneForm'] = true;
+ $paramsTab['bool_standaloneForm'] = true;
//Afficher la liste dans process
if (isset($return_mode) && $return_mode) {
@@ -209,7 +207,7 @@ if (count($tab) > 0) {
$frm_str .= _DIFFLIST_NEVER_MODIFIED;
} else {
echo '<br/>' . _DIFFLIST_NEVER_MODIFIED;
- }
+ }
}
// $list->debug();
diff --git a/modules/entities/difflist_visa_history_display.php b/modules/entities/difflist_visa_history_display.php
index d6023cace9b..f3c4ba55c4f 100755
--- a/modules/entities/difflist_visa_history_display.php
+++ b/modules/entities/difflist_visa_history_display.php
@@ -20,7 +20,7 @@
*/
/**
-* @brief Displays diffusion list history
+* @brief Displays diffusion list history
*
* @file
* @author <dev@maarch.org>
@@ -51,7 +51,7 @@ $urlParameters = '';
//Templates
$defaultTemplate = 'history_list_diff';
$selectedTemplate = $list->getTemplate();
- if (empty($selectedTemplate)) {
+ if (empty($selectedTemplate)) {
if (!empty($defaultTemplate)) {
$list->setTemplate($defaultTemplate);
$selectedTemplate = $list->getTemplate();
@@ -62,7 +62,9 @@ $urlParameters = '';
//For status icon
$extension_icon = '';
- if($selectedTemplate <> 'none') $extension_icon = "_big";
+ if ($selectedTemplate <> 'none') {
+ $extension_icon = "_big";
+ }
/************Construction de la requete*******************/
//Table or view
@@ -72,16 +74,16 @@ $urlParameters = '';
//Fields
//Documents
- array_push($select[$view], "listinstance_history_id", "res_id", "updated_by_user", "updated_date");
+ array_push($select[$view], "listinstance_history_id", "res_id", "updated_by_user", "updated_date");
//Where clause
- $where_tab = array();
+ $where_tab = array();
$where_tab[] = "res_id = ?";
$where_tab[] = "coll_id = ?";
- $arrayPDO = array();
-
- if (isset($diffListType)) {
- $where_tab[] = "listinstance_history_id IN (SELECT DISTINCT listinstance_history_id from listinstance_history_details where difflist_type = '$diffListType')";
+ $arrayPDO = array();
+
+ if (isset($diffListType)) {
+ $where_tab[] = "listinstance_history_id IN (SELECT DISTINCT listinstance_history_id from listinstance_history_details where difflist_type = '$diffListType')";
}
//From searching comp query
@@ -94,34 +96,34 @@ $urlParameters = '';
// $_SESSION['save_list']['order'] = $order;
// $_SESSION['save_list']['order_field'] = $order_field;
- if (!empty($order_field) && !empty($order))
+ if (!empty($order_field) && !empty($order)) {
$orderstr = "order by ".$order_field." ".$order;
- else {
+ } else {
$list->setOrder();
$list->setOrderField('updated_date');
$orderstr = "order by updated_date desc";
}
-//URL extra Parameters
+//URL extra Parameters
$parameters = '';
$start = $list->getStart();
- if (!empty($selectedTemplate)) $parameters .= '&template='.$selectedTemplate;
- if (!empty($start)) $parameters .= '&start='.$start;
+ if (!empty($selectedTemplate)) {
+ $parameters .= '&template='.$selectedTemplate;
+ }
+ if (!empty($start)) {
+ $parameters .= '&start='.$start;
+ }
// $_SESSION['save_list']['start'] = $start;
//Query
- $tab=$request->PDOselect($select,$where_request,$arrayPDO,$orderstr,$_SESSION['config']['databasetype'],"default", false, "", "", "", $add_security);
+ $tab=$request->PDOselect($select, $where_request, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], "default", false, "", "", "", $add_security);
// $request->show();
//Result array
- for ($i=0;$i<count($tab);$i++)
- {
- for ($j=0;$j<count($tab[$i]);$j++)
- {
- foreach(array_keys($tab[$i][$j]) as $value)
- {
- if($tab[$i][$j][$value]=="listinstance_history_id")
- {
+ for ($i=0;$i<count($tab);$i++) {
+ for ($j=0;$j<count($tab[$i]);$j++) {
+ foreach (array_keys($tab[$i][$j]) as $value) {
+ if ($tab[$i][$j][$value]=="listinstance_history_id") {
$tab[$i][$j]["label"]=_TYPE_ID_HISTORY;
$tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
@@ -133,8 +135,7 @@ $urlParameters = '';
$tab[$i][$j]["order"]="listinstance_history_id";
}
- if($tab[$i][$j][$value]=="res_id")
- {
+ if ($tab[$i][$j][$value]=="res_id") {
$tab[$i][$j]["label"]=_RES_ID;
$tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
@@ -146,11 +147,10 @@ $urlParameters = '';
$tab[$i][$j]["order"]="res_id";
}
- if($tab[$i][$j][$value]=="updated_by_user")
- {
+ if ($tab[$i][$j][$value]=="updated_by_user") {
$tab[$i][$j]["label"]=_UPDATED_BY_USER;
$db = new Database();
- $stmt = $db->query("SELECT firstname, lastname FROM users WHERE user_id = ?",array($tab[$i][$j]['value']));
+ $stmt = $db->query("SELECT firstname, lastname FROM users WHERE user_id = ?", array($tab[$i][$j]['value']));
$user = $stmt->fetchObject();
$tab[$i][$j]['value'] = ucwords($user->lastname) . " " . functions::show_string(ucfirst($user->firstname));
$tab[$i][$j]["size"]="15";
@@ -162,9 +162,8 @@ $urlParameters = '';
$tab[$i][$j]["order"]="updated_by_user";
}
- if($tab[$i][$j][$value]=="updated_date")
- {
- $tab[$i][$j]["label"]=__UPDATED_DATE;
+ if ($tab[$i][$j][$value]=="updated_date") {
+ $tab[$i][$j]["label"]=_UPDATED_DATE;
$tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value']);
$tab[$i][$j]["size"]="15";
$tab[$i][$j]["label_align"]="left";
@@ -174,13 +173,12 @@ $urlParameters = '';
$tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
$tab[$i][$j]["order"]="updated_date";
}
-
}
}
}
if (count($tab) > 0) {
-/************Construction de la liste*******************/
+ /************Construction de la liste*******************/
//Clé de la liste
$listKey = 'listinstance_history_id';
@@ -197,7 +195,7 @@ if (count($tab) > 0) {
//Form attributs
//Standalone form
- $paramsTab['bool_standaloneForm'] = true;
+ $paramsTab['bool_standaloneForm'] = true;
//Afficher la liste dans process
if (isset($return_mode) && $return_mode) {
@@ -211,7 +209,7 @@ if (count($tab) > 0) {
$frm_str .= _DIFFLIST_NEVER_MODIFIED;
} else {
echo '<br/>' . _DIFFLIST_NEVER_MODIFIED;
- }
+ }
}
// $list->debug();
diff --git a/modules/entities/lang/en.php b/modules/entities/lang/en.php
index 0044daa5197..ef2e05d874d 100755
--- a/modules/entities/lang/en.php
+++ b/modules/entities/lang/en.php
@@ -663,3 +663,13 @@ if (!defined('_UP_ENTITY_ONE_ROW')) {
if (!defined('_DOWN_ENTITY_ONE_ROW')) {
define('_DOWN_ENTITY_ONE_ROW', 'Move down the entity for a row');
}
+
+if (!defined('_TYPE_ID_HISTORY')) {
+ define('_TYPE_ID_HISTORY', "Historic identifier");
+}
+if (!defined('_RES_ID')) {
+ define('_RES_ID', "RES ID");
+}
+if (!defined('_UPDATED_BY_USER')) {
+ define('_UPDATED_BY_USER', "Updated by");
+}
diff --git a/modules/entities/lang/fr.php b/modules/entities/lang/fr.php
index 98a43158aef..1fb14a7f6e4 100755
--- a/modules/entities/lang/fr.php
+++ b/modules/entities/lang/fr.php
@@ -685,3 +685,13 @@ if (!defined('_UP_ENTITY_ONE_ROW')) {
if (!defined('_DOWN_ENTITY_ONE_ROW')) {
define('_DOWN_ENTITY_ONE_ROW', "Descendre l'entité d'un rang");
}
+
+if (!defined('_TYPE_ID_HISTORY')) {
+ define('_TYPE_ID_HISTORY', "Identifiant de l'historique");
+}
+if (!defined('_RES_ID')) {
+ define('_RES_ID', "RES ID");
+}
+if (!defined('_UPDATED_BY_USER')) {
+ define('_UPDATED_BY_USER', "Mis à jour par");
+}
diff --git a/modules/visa/class/class_modules_tools_Abstract.php b/modules/visa/class/class_modules_tools_Abstract.php
index fff22add3eb..d40eec5c560 100755
--- a/modules/visa/class/class_modules_tools_Abstract.php
+++ b/modules/visa/class/class_modules_tools_Abstract.php
@@ -97,11 +97,32 @@ abstract class visa_Abstract extends Database
$request = new request();
$table = $_SESSION['current_basket']['view'];
$select[$table] = array();
- array_push($select[$table], 'res_id', 'status', 'category_id as category_img',
- 'contact_firstname', 'contact_lastname', 'contact_society', 'user_lastname',
- 'user_firstname', 'priority', 'creation_date', 'admission_date', 'subject',
- 'process_limit_date', 'entity_label', 'dest_user', 'category_id', 'type_label',
- 'exp_user_id', 'doc_custom_n1 as count_attachment', 'alt_identifier', 'is_multicontacts', 'locker_user_id', 'locker_time');
+ array_push(
+ $select[$table],
+ 'res_id',
+ 'status',
+ 'category_id as category_img',
+ 'contact_firstname',
+ 'contact_lastname',
+ 'contact_society',
+ 'user_lastname',
+ 'user_firstname',
+ 'priority',
+ 'creation_date',
+ 'admission_date',
+ 'subject',
+ 'process_limit_date',
+ 'entity_label',
+ 'dest_user',
+ 'category_id',
+ 'type_label',
+ 'exp_user_id',
+ 'doc_custom_n1 as count_attachment',
+ 'alt_identifier',
+ 'is_multicontacts',
+ 'locker_user_id',
+ 'locker_time'
+ );
$where_tab = array();
@@ -135,7 +156,13 @@ abstract class visa_Abstract extends Database
$orderstr,
$_SESSION['config']['databasetype'],
$_SESSION['config']['databasesearchlimit'],
- false, '', '', '', false, false, 'distinct'
+ false,
+ '',
+ '',
+ '',
+ false,
+ false,
+ 'distinct'
);
$tab_docs = array();
@@ -158,25 +185,31 @@ abstract class visa_Abstract extends Database
}
$db = new Database();
- $stmt = $db->query('select docserver_id from res_view_attachments where res_id_master = ?'
+ $stmt = $db->query(
+ 'select docserver_id from res_view_attachments where res_id_master = ?'
."AND status <> 'DEL' order by res_id desc",
- array($res_id));
+ array($res_id)
+ );
while ($res = $stmt->fetchObject()) {
$docserver_id = $res->docserver_id;
break;
}
- $stmt = $db->query('select path_template from '.$_SESSION['tablename']['docservers'].' where docserver_id = ?',
- array($docserver_id));
+ $stmt = $db->query(
+ 'select path_template from '.$_SESSION['tablename']['docservers'].' where docserver_id = ?',
+ array($docserver_id)
+ );
$res = $stmt->fetchObject();
$docserver_path = $res->path_template;
- $stmt = $db->query('select filename, format, path, title, res_id, res_id_version, attachment_type '
+ $stmt = $db->query(
+ 'select filename, format, path, title, res_id, res_id_version, attachment_type '
."from res_view_attachments where res_id_master = ? AND status <> 'OBS' AND status <> 'SIGN' "
."AND status <> 'DEL' and attachment_type NOT IN "
."('converted_pdf','print_folder') order by creation_date desc",
- array($res_id));
+ array($res_id)
+ );
$array_reponses = array();
$cpt_rep = 0;
@@ -627,11 +660,11 @@ abstract class visa_Abstract extends Database
$i = 1;
$lastUserVis = true;
- if (count($circuit['visa']['users']) == 0 && $circuit['sign']['users'] == 0) {
+ if ((empty($circuit['visa']['users']) || !is_array($circuit['visa']['users']) || count($circuit['visa']['users']) == 0) && (empty($circuit['sign']['users']) || !is_array($circuit['sign']['users']) || count($circuit['sign']['users']) == 0)) {
$str .= '<div id="emptyVisa"><strong><em>'._EMPTY_VISA_WORKFLOW.'</em></strong></div>';
} else {
$str .= '<div id="emptyVisa" style="display:none;"><strong><em>'._EMPTY_VISA_WORKFLOW.'</em></strong></div>';
- if (count($circuit['visa']['users']) > 0) {
+ if (!empty($circuit['visa']['users']) && is_array($circuit['visa']['users']) && count($circuit['visa']['users']) > 0) {
$isCurrentVisa = false;
foreach ($circuit['visa']['users'] as $it => $info_userVis) {
if (empty($info_userVis['process_date'])) {
@@ -964,17 +997,20 @@ abstract class visa_Abstract extends Database
//Have version table
if ($versionTable != '') {
- $stmt = $db->query('select res_id from '
+ $stmt = $db->query(
+ 'select res_id from '
.$versionTable
." where res_id_master = ? and status <> 'DEL' order by res_id desc",
- array($id));
+ array($id)
+ );
$line = $stmt->fetchObject();
$lastVersion = $line->res_id;
//Have new version
if ($lastVersion != '') {
$stmt = $db->query(
'select res_id, description, subject, title, format, filesize, relation, creation_date, typist from '
- .$versionTable." where res_id = ? and status <> 'DEL'", array($lastVersion)
+ .$versionTable." where res_id = ? and status <> 'DEL'",
+ array($lastVersion)
);
// $db->show();
//Get infos
@@ -994,7 +1030,8 @@ abstract class visa_Abstract extends Database
} else {
$typist = '';
}
- array_push($joinedFiles,
+ array_push(
+ $joinedFiles,
array('id' => $res->res_id, //ID
'label' => $label, //Label
'format' => $res->format, //Format
@@ -1011,7 +1048,8 @@ abstract class visa_Abstract extends Database
$stmt = $db->query(
'select res_id, description, subject, title, format, filesize, relation, creation_date from '
- .$table." where res_id = ? and status <> 'DEL'", array($id)
+ .$table." where res_id = ? and status <> 'DEL'",
+ array($id)
);
} else {
require_once 'modules/attachments/attachments_tables.php';
@@ -1092,7 +1130,8 @@ abstract class visa_Abstract extends Database
._PRINT_DOCUMENT.'"></i>'
.'</a>';
}
- array_push($joinedFiles,
+ array_push(
+ $joinedFiles,
array('id' => $idFile, //ID
'label' => $label, //Label
'format' => $res->format, //Format
@@ -1221,8 +1260,11 @@ abstract class visa_Abstract extends Database
//Get data
$idNote = $user_notes[$i]['id'];
//$noteShort = $request->cut_string($user_notes[$i]['label'], 50);
- $noteShort = $request->cut_string(str_replace(array("'", "\r", "\n", '"'), array("'", ' ', ' ', '"'),
- $user_notes[$i]['label']), 50);
+ $noteShort = $request->cut_string(str_replace(
+ array("'", "\r", "\n", '"'),
+ array("'", ' ', ' ', '"'),
+ $user_notes[$i]['label']
+ ), 50);
$noteShort = functions::xssafe($noteShort);
$note = $user_notes[$i]['label'];
$userArray = $users_tools->get_user($user_notes[$i]['author']);
@@ -1310,7 +1352,8 @@ abstract class PdfNotes_Abstract extends FPDI
$stmt2 = $db2->query(
'SELECT n.identifier, n.date_note, n.user_id, n.note_text, u.lastname, '
.'u.firstname FROM '.NOTES_TABLE.' n inner join '.USERS_TABLE
- .' u on n.user_id = u.user_id WHERE n.id = :Id '.$where, $arrayPDO
+ .' u on n.user_id = u.user_id WHERE n.id = :Id '.$where,
+ $arrayPDO
);
if ($stmt2->rowCount() > 0) {
diff --git a/modules/visa/show_visa_tab.php b/modules/visa/show_visa_tab.php
index fd05372c37e..1363636bbe4 100755
--- a/modules/visa/show_visa_tab.php
+++ b/modules/visa/show_visa_tab.php
@@ -69,7 +69,7 @@ $frm_str .= '</div>';
//script
$curr_visa_wf = $visa->getWorkflow($res_id, $coll_id, 'VISA_CIRCUIT');
-if (count($curr_visa_wf['visa']) == 0 && count($curr_visa_wf['sign']) == 0) {
+if ((empty($curr_visa_wf['visa']) || !is_array($curr_visa_wf['visa']) || count($curr_visa_wf['visa']) == 0) && (empty($curr_visa_wf['sign']) || !is_array($curr_visa_wf['sign']) || count($curr_visa_wf['sign']) == 0)) {
$frm_str .= '<script>';
$frm_str .= '$j("#modelList").val(\''.$destination.'\');$j("#modelList").change();';
$frm_str .= '</script>';
--
GitLab