diff --git a/apps/maarch_entreprise/Views/profile.component.html b/apps/maarch_entreprise/Views/profile.component.html
index 7f6e3f373050350106efe933cdd48f3e89fbea81..920dfadd967aabf911562b5976ac42ebe8dda42c 100755
--- a/apps/maarch_entreprise/Views/profile.component.html
+++ b/apps/maarch_entreprise/Views/profile.component.html
@@ -38,7 +38,7 @@
</div>
</nav>
<div class="row row-eq-height">
- <div class="col-md-3" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #CEE9F1;border-top: solid 2px #FDD16C;border-bottom: solid 2px #FDD16C;padding:10px;">
+ <div class="col-md-3" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #F2F2F2;border-top: solid 2px #F99830;border-bottom: solid 2px #F99830;padding:10px;">
<h2>{{lang.groups}}</h2>
<ul class="list-group">
<li class="list-group-item" *ngFor="let group of user.groups">
@@ -46,7 +46,7 @@
</li>
</ul>
</div>
- <div class="col-md-4 col-md-offset-1" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #CEE9F1;border-top: solid 2px #FDD16C;border-bottom: solid 2px #FDD16C;padding:10px;">
+ <div class="col-md-4 col-md-offset-1" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #F2F2F2;border-top: solid 2px #F99830;border-bottom: solid 2px #F99830;padding:10px;">
<h2>{{lang.informations}}</h2>
<form class="form-horizontal" (ngSubmit)="onSubmit()" #profileForm="ngForm">
<div class="form-group">
@@ -157,7 +157,7 @@
</div>
</form>
</div>
- <div class="col-md-3 col-md-offset-1" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #CEE9F1;border-top: solid 2px #FDD16C;border-bottom: solid 2px #FDD16C;padding:10px;">
+ <div class="col-md-3 col-md-offset-1" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #F2F2F2;border-top: solid 2px #F99830;border-bottom: solid 2px #F99830;padding:10px;">
<h2>{{lang.entities}}</h2>
<ul class="list-group">
<li class="list-group-item" *ngFor="let entity of user.entities">
diff --git a/apps/maarch_entreprise/Views/save-numeric-package.component.html b/apps/maarch_entreprise/Views/save-numeric-package.component.html
index a124c8a834dfa5e9a9b773cd4e26aee7c4ace496..b1a1e65191c748067a5e79fb245532f373179264 100644
--- a/apps/maarch_entreprise/Views/save-numeric-package.component.html
+++ b/apps/maarch_entreprise/Views/save-numeric-package.component.html
@@ -13,7 +13,7 @@
</div>
</nav>
<div class="row row-eq-height">
- <div class="col-md-4 col-md-offset-4" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #CEE9F1;border-top: solid 2px #FDD16C;border-bottom: solid 2px #FDD16C;padding:10px;">
+ <div class="col-md-4 col-md-offset-4" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #F2F2F2;border-top: solid 2px #F99830;border-bottom: solid 2px #F99830;padding:10px;">
<h2>{{lang.saveNumericPackage}}</h2>
<form class="form-horizontal" (ngSubmit)="submitNumericPackage()" #saveNumericPackageForm="ngForm">
<input id="numericPackageFilePath" type="file" name="files[]"(change)="uploadNumericPackage($event)">
diff --git a/apps/maarch_entreprise/Views/signature-book.component.html b/apps/maarch_entreprise/Views/signature-book.component.html
index 7631dd2be5c89c84a13673765a09ec8c7cb6bcb1..de5925003a5338c93cf626c4b6c108028256a65e 100755
--- a/apps/maarch_entreprise/Views/signature-book.component.html
+++ b/apps/maarch_entreprise/Views/signature-book.component.html
@@ -122,7 +122,7 @@
<div [ngStyle]="{'display': showTopRightPanel ? 'block' : 'none'}" class="pjDetails">
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}}">
<label>Type : </label>
- <span>{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}} <sup *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'" style="color:#16ADEB;">{{signatureBook.lang.signed}}</sup></span>
+ <span>{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}} <sup *ngIf="signatureBook.attachments[rightSelectedThumbnail].status == 'SIGN'" style="color:#135F7F;">{{signatureBook.lang.signed}}</sup></span>
</div>
<div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].title}}">
<label>{{signatureBook.lang.object}} : </label>
@@ -156,7 +156,7 @@
<div class="infoPj">
<label>Version : </label>
<span>{{signatureBook.attachments[rightSelectedThumbnail].relation}}</span>
- <i [ngStyle]="{'display': signatureBook.attachments[rightSelectedThumbnail].relation > 1 ? '' : 'none'}" style="color:#16ADEB" class="fa fa-chevron-circle-up" id="obsVersion" data-tooltip-content="#obsVersionTooltip" aria-hidden="true"></i>
+ <i [ngStyle]="{'display': signatureBook.attachments[rightSelectedThumbnail].relation > 1 ? '' : 'none'}" style="color:#135F7F" class="fa fa-chevron-circle-up" id="obsVersion" data-tooltip-content="#obsVersionTooltip" aria-hidden="true"></i>
</div>
<div class="infoPj">
<label>Format : </label>
@@ -249,7 +249,7 @@
<span>{{version.relation}}</span>
<span>{{signatureBook.lang.object}} : </span>
<span>{{version.title}}</span>
- <a style="color:#16ADEB" title="{{signatureBook.lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{version.resId}}" target="_blank">
+ <a style="color:#135F7F" title="{{signatureBook.lang.dlAttachment}}" href="index.php?display=true&module=attachments&page=view_attachment&res_id_master={{resId}}&id={{version.resId}}" target="_blank">
<i class="fa fa-download fa-2x"></i>
</a>
</div>
diff --git a/apps/maarch_entreprise/actions/index_mlb.php b/apps/maarch_entreprise/actions/index_mlb.php
index 2ffd816f15085ef9d14675dbca1e7a46638690d8..3f9f6bda61b9f33925605fe773ea001d49213f28 100755
--- a/apps/maarch_entreprise/actions/index_mlb.php
+++ b/apps/maarch_entreprise/actions/index_mlb.php
@@ -167,7 +167,7 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $c
$frmStr .= '<form name="index_file" method="post" id="index_file" action="#"'
.' class="forms indexingform" style="text-align:left;width:100%;">';
//MODAL HEADER
- $frmStr .= '<div style="margin:-10px;margin-bottom:10px;background-color: #009DC5;">';
+ $frmStr .= '<div style="margin:-10px;margin-bottom:10px;background-color: #135F7F;">';
$frmStr .= '<h2 class="tit" id="action_title" style="display:table-cell;vertical-align:middle;margin:0px;">'._INDEXING_MLB.' : ';
$frmStr .= '</h2>';
$frmStr .= '<div style="display:table-cell;vertical-align:middle;">';
@@ -588,11 +588,11 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $c
.'style="visibility:hidden;display:inline;" ></a> </td>';
$frmStr .= '<td class="indexing_field">';
- //$frmStr .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#009DC5\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
+ //$frmStr .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#135F7F\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
- $frmStr .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#009DC5;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#009DC5\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#666\');"></i>';
+ $frmStr .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#135F7F;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#135F7F\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#666\');"></i>';
- $frmStr .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#009DC5\');"></i>';
+ $frmStr .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#135F7F\');"></i>';
$frmStr .= ' <i class="fa fa-tty" title="'._CONTACT_COMMUNICATION_DEFINE.'"style="visibility:hidden;display:inline;"" id="type_contact_communication_icon"></i>';
$frmStr .= ' <span style="position:relative;"><input type="text" name="contact" onkeyup="erase_contact_external_id(\'contact\', \'contactid\');erase_contact_external_id(\'contact\', \'addressid\');"'
.'id="contact" onblur="clear_error(\'frm_error_'.$actionId.'\');'
@@ -633,11 +633,11 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $c
.'" onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''.urlencode(_CONTACT).'\',loadInfoContact(),\'info_contact\');return false;" '
.'style="visibility:hidden;" ></a> </td>';
$frmStr .= '<td class="indexing_field">';
- //$frmStr .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#009DC5\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
+ //$frmStr .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#135F7F\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
- $frmStr .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#009DC5\');$j(\'#type_contact_external_icon\').css(\'color\',\'#009DC5\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#666\');"></i>';
+ $frmStr .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#135F7F\');$j(\'#type_contact_external_icon\').css(\'color\',\'#135F7F\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#666\');"></i>';
- $frmStr .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;color:#009DC5;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#009DC5\');"></i>';
+ $frmStr .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;color:#135F7F;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#135F7F\');"></i>';
$frmStr .= '<span style="position:relative;"><input type="text" name="email" id="email" value="" onblur="clear_error(\'frm_error_'.$actionId.'\');display_contact_card(\'visible\', \'multi_contact_card\');"/>';
$frmStr .= '<div id="multiContactList" class="autocomplete" style="left:0px;width:100%;top:17px;"></div><div class="autocomplete autocompleteIndex" id="searching_autocomplete_multi" style="display: none;text-align:left;padding:5px;left:0px;width:100%;top:17px;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> chargement ...</div></span>';
diff --git a/apps/maarch_entreprise/actions/process.php b/apps/maarch_entreprise/actions/process.php
index ec53fab32cfffaab945597422e07611c243ef901..ad2839e50136316e00645d2634f6939957c870bd 100755
--- a/apps/maarch_entreprise/actions/process.php
+++ b/apps/maarch_entreprise/actions/process.php
@@ -74,12 +74,12 @@ include 'apps/'.$_SESSION['config']['app_id'].'/definition_mail_categories.php';
function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode)
{
//DECLARATIONS
- require_once('core/class/class_security.php');
- require_once('modules/basket/class/class_modules_tools.php');
- require_once('core/class/class_request.php');
- require_once('apps/'.$_SESSION['config']['app_id'].'/class/class_types.php');
- require_once('apps/'.$_SESSION['config']['app_id'].'/class/class_indexing_searching_app.php');
- require_once('apps/'.$_SESSION['config']['app_id'].'/class/class_chrono.php');
+ require_once 'core/class/class_security.php';
+ require_once 'modules/basket/class/class_modules_tools.php';
+ require_once 'core/class/class_request.php';
+ require_once 'apps/'.$_SESSION['config']['app_id'].'/class/class_types.php';
+ require_once 'apps/'.$_SESSION['config']['app_id'].'/class/class_indexing_searching_app.php';
+ require_once 'apps/'.$_SESSION['config']['app_id'].'/class/class_chrono.php';
//INSTANTIATE
$type = new types();
@@ -109,9 +109,9 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$docLockerCustomPath = 'apps/maarch_entreprise/actions/docLocker.php';
$docLockerPath = $_SESSION['config']['businessappurl'].'/actions/docLocker.php';
if (is_file($docLockerCustomPath)) {
- require_once$docLockerCustomPath;
+ require_once $docLockerCustomPath;
} elseif (is_file($docLockerPath)) {
- require_once$docLockerPath;
+ require_once $docLockerPath;
} else {
exit("can't find docLocker.php");
}
@@ -148,7 +148,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
//print_r($indexes);
}
if ($core_tools->is_module_loaded('entities')) {
- require_once('modules/entities/class/class_manage_listdiff.php');
+ require_once 'modules/entities/class/class_manage_listdiff.php';
$listdiff = new diffusion_list();
$roles = $listdiff->list_difflist_roles();
$_SESSION['process']['diff_list'] = $listdiff->get_listinstance($res_id, false, $coll_id);
@@ -202,13 +202,13 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
//_ID_TO_DISPLAY ?
if (_ID_TO_DISPLAY == 'res_id') {
//MODAL HEADER
- $frm_str .= '<div style="margin:-10px;margin-bottom:10px;background-color: #009DC5;">';
+ $frm_str .= '<div style="margin:-10px;margin-bottom:10px;background-color: #135F7F;">';
$frm_str .= '<h2 class="tit" id="action_title" style="display:table-cell;vertical-align:middle;margin:0px;">'._PROCESS._LETTER_NUM.$res_id.' : ';
$frm_str .= '</h2>';
$frm_str .= '<div style="display:table-cell;vertical-align:middle;">';
} else {
//MODAL HEADER
- $frm_str .= '<div style="margin:-10px;margin-bottom:10px;background-color: #009DC5;">';
+ $frm_str .= '<div style="margin:-10px;margin-bottom:10px;background-color: #135F7F;">';
$frm_str .= '<h2 class="tit" title="'._LETTER_NUM.$res_id.'" id="action_title" style="display:table-cell;vertical-align:middle;margin:0px;">'._PROCESS._DOCUMENT.' '.$chrono_number.' : ';
$frm_str .= '</h2>';
$frm_str .= '<div style="display:table-cell;vertical-align:middle;">';
@@ -797,7 +797,7 @@ function check_form($form_id, $values)
}
if (!empty($res_id) && !empty($coll_id) && !empty($folder_id)) {
- require_once('core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php');
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php';
$sec = new security();
$table = $sec->retrieve_table_from_coll($coll_id);
if (empty($table)) {
@@ -846,7 +846,7 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
if (empty($values_form) || count($arr_id) < 1 || empty($coll_id)) {
return false;
}
- require_once('core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php');
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php';
$sec = new security();
$db = new Database();
@@ -902,8 +902,8 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
if (!empty($folder)) {
$folder_id = $folder;
- if ($folder_id != $old_folder_id && $_SESSION['history']['folderup']) {
- require_once('core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_history.php');
+ if ($folder_id != $old_folder_id && $_SESSION['history']['folderup']) {
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_history.php';
$hist = new history();
@@ -919,8 +919,8 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
}
}
//DIFFLIST
- if ($core->is_module_loaded('entities') && count($_SESSION['redirect']['diff_list']) == 0) {
- require_once('modules/entities/class/class_manage_listdiff.php');
+ if ($core->is_module_loaded('entities') && count($_SESSION['redirect']['diff_list']) == 0) {
+ require_once 'modules/entities/class/class_manage_listdiff.php';
$list = new diffusion_list();
diff --git a/apps/maarch_entreprise/actions/validate_mail.php b/apps/maarch_entreprise/actions/validate_mail.php
index 0ac46c499086f1c9eca0841e8801bb645731034a..79ec9210e48a56139e0fea292fadf8123dae15cf 100755
--- a/apps/maarch_entreprise/actions/validate_mail.php
+++ b/apps/maarch_entreprise/actions/validate_mail.php
@@ -261,7 +261,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$frm_str .= '<form name="index_file" method="post" id="index_file" action="#" class="forms indexingform" style="text-align:left;width:100%;">';
//MODAL HEADER
- $frm_str .= '<div style="margin:-10px;margin-bottom:10px;background-color: #009DC5;">';
+ $frm_str .= '<div style="margin:-10px;margin-bottom:10px;background-color: #135F7F;">';
if (_ID_TO_DISPLAY == 'res_id') {
$frm_str .= '<h2 class="tit" id="action_title" style="display:table-cell;vertical-align:middle;margin:0px;">'._VALIDATE_MAIL.' '._NUM.functions::xssafe($res_id).' : ';
$frm_str .= '</h2>';
@@ -654,16 +654,16 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$frm_str .= '<td class="indexing_field">';
if ($data['type_contact'] == 'internal') {
- //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;color:#009DC5;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#009DC5\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
+ //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;color:#135F7F;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#135F7F\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
//MODIF:
- $frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#009DC5;" id="type_contact_internal_icon" onclick="$j(\'#type_contact_internal\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\', \'#666\');$j(\'#type_contact_internal_icon\').css(\'color\', \'#009DC5\');$j(\'#type_multi_contact_internal_icon\').css(\'color\', \'#666\');"></i>';
+ $frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#135F7F;" id="type_contact_internal_icon" onclick="$j(\'#type_contact_internal\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\', \'#666\');$j(\'#type_contact_internal_icon\').css(\'color\', \'#135F7F\');$j(\'#type_multi_contact_internal_icon\').css(\'color\', \'#666\');"></i>';
} elseif ($data['type_contact'] == 'external') {
- //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#009DC5\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
+ //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#135F7F\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
//MODIF:
- $frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#009DC5;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\', \'#666\');$j(\'#type_contact_external_icon\').css(\'color\', \'#009DC5\');$j(\'#type_multi_contact_external_icon\').css(\'color\', \'#666\');"></i>';
+ $frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#135F7F;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\', \'#666\');$j(\'#type_contact_external_icon\').css(\'color\', \'#135F7F\');$j(\'#type_multi_contact_external_icon\').css(\'color\', \'#666\');"></i>';
}
- $frm_str .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#009DC5\');"></i>';
+ $frm_str .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#135F7F\');"></i>';
$frm_str .= '<span style="position:relative;"><input type="text" onkeyup="erase_contact_external_id(\'contact\', \'contactid\');erase_contact_external_id(\'contact\', \'addressid\');" name="contact" id="contact" onchange="clear_error(\'frm_error_'.$id_action.'\');display_contact_card(\'visible\');" onblur="display_contact_card(\'visible\');if(document.getElementById(\'type_contact_external\').checked == true){check_date_exp(\''.$path_to_script.'\',\''.$path_check_date_link.'\');}"';
if (isset($data['contact']) && !empty($data['contact'])) {
@@ -715,11 +715,11 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
.'style="visibility:hidden;display:inline;text-align:right;" ></a> </td>';
$frm_str .= '<td class="indexing_field">';
- //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#009DC5\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
+ //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#135F7F\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
- $frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#009DC5\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#666\');"></i>';
+ $frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#135F7F\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#666\');"></i>';
- $frm_str .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;color:#009DC5;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#009DC5\');"></i>';
+ $frm_str .= ' <i class="fa fa-users" title="'._MULTI_CONTACT.'" style="cursor:pointer;color:#135F7F;" id="type_multi_contact_external_icon" onclick="$j(\'#type_multi_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\',\'#666\');$j(\'#type_contact_external_icon\').css(\'color\',\'#666\');$j(\'#type_multi_contact_external_icon\').css(\'color\',\'#135F7F\');"></i>';
$frm_str .= '<span style="position:relative;"><input type="text" name="email" id="email" onblur="clear_error(\'frm_error_'.$id_action.'\');display_contact_card(\'visible\', \'multi_contact_card\');"/>';
$frm_str .= '<div id="multiContactList" class="autocomplete" style="left:0px;width:100%;top:17px;"></div><div class="autocomplete autocompleteIndex" id="searching_autocomplete_multi" style="display: none;text-align:left;padding:5px;left:0px;width:100%;top:17px;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> chargement ...</div></span>';
diff --git a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php
index d9bbdebeecff6c2901dc4f94ba38d30e6f6fe509..a07988a9d36adafbea578fc9c50a62bc0ee1f849 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php
@@ -1,297 +1,283 @@
-<?php
-/*
-* Copyright 2014 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework 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.
-*
-* Maarch Framework 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 Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
-*
-*
-* @file
-* @author <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup admin
-*/
-
-require_once("apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_contacts_v2.php");
-$core_tools = new core_tools();
-$core_tools->load_lang();
-$func = new functions();
-$contact = new contacts_v2();
-
-require_once "core" . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR . "class_request.php";
-require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR . "class_list_show.php";
-$func = new functions();
-
-$return = $core_tools->test_admin('admin_contacts', 'apps', false);
-if (!$return) {
- $return = $core_tools->test_admin('search_contacts', 'apps', false);
-}
-if (!$return) {
- $return = $core_tools->test_admin('create_contacts', 'apps');
-}
-
- /****************Management of the location bar ************/
-$init = false;
-if(isset($_REQUEST['reinit']) && $_REQUEST['reinit'] == "true") {
- $init = true;
-}
-$level = "";
-if(isset($_REQUEST['level']) && ($_REQUEST['level'] == 2 || $_REQUEST['level'] == 3 || $_REQUEST['level'] == 4 || $_REQUEST['level'] == 1)) {
- $level = $_REQUEST['level'];
-}
-$page_path = $_SESSION['config']['businessappurl'].'index.php?page=contact_addresses_list';
-$page_label = _MANAGE_CONTACT_ADDRESSES_LIST;
-$page_id = "contact_addresses_list";
-$core_tools->manage_location_bar($page_path, $page_label, $page_id, $init, $level);
-/***********************************************************/
-
-$select["view_contacts"] = array();
-array_push(
- $select["view_contacts"],
- "ca_id"
- , "contact_id
- , case when view_contacts.is_corporate_person <> 'Y' then view_contacts.contact_id || ' - ' || view_contacts.contact_lastname || ' ' || view_contacts.contact_firstname|| ' - physique' else view_contacts.contact_id || ' - ' || view_contacts.society || ' - moral' end as \"society\""
- , "contact_purpose_id"
- , "departement
+<?php
+/*
+* Copyright 2014 Maarch
+*
+* This file is part of Maarch Framework.
+*
+* Maarch Framework 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.
+*
+* Maarch Framework 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 Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file
+ *
+ * @author <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup admin
+ */
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_contacts_v2.php';
+$core_tools = new core_tools();
+$core_tools->load_lang();
+$func = new functions();
+$contact = new contacts_v2();
+
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_request.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_list_show.php';
+$func = new functions();
+
+$return = $core_tools->test_admin('admin_contacts', 'apps', false);
+if (!$return) {
+ $return = $core_tools->test_admin('search_contacts', 'apps', false);
+}
+if (!$return) {
+ $return = $core_tools->test_admin('create_contacts', 'apps');
+}
+
+ /****************Management of the location bar ************/
+$init = false;
+if (isset($_REQUEST['reinit']) && $_REQUEST['reinit'] == 'true') {
+ $init = true;
+}
+$level = '';
+if (isset($_REQUEST['level']) && ($_REQUEST['level'] == 2 || $_REQUEST['level'] == 3 || $_REQUEST['level'] == 4 || $_REQUEST['level'] == 1)) {
+ $level = $_REQUEST['level'];
+}
+$page_path = $_SESSION['config']['businessappurl'].'index.php?page=contact_addresses_list';
+$page_label = _MANAGE_CONTACT_ADDRESSES_LIST;
+$page_id = 'contact_addresses_list';
+$core_tools->manage_location_bar($page_path, $page_label, $page_id, $init, $level);
+/***********************************************************/
+
+$select['view_contacts'] = array();
+array_push(
+ $select['view_contacts'],
+ 'ca_id', "contact_id
+ , case when view_contacts.is_corporate_person <> 'Y' then view_contacts.contact_id || ' - ' || view_contacts.contact_lastname || ' ' || view_contacts.contact_firstname|| ' - physique' else view_contacts.contact_id || ' - ' || view_contacts.society || ' - moral' end as \"society\"", 'contact_purpose_id', "departement
, case when view_contacts.contact_lastname <> '' then view_contacts.contact_lastname else view_contacts.lastname end as \"lastname\"
, case when view_contacts.contact_firstname <> '' then view_contacts.contact_firstname else view_contacts.firstname end as \"firstname\"
- , case when view_contacts.contact_function <> '' then view_contacts.contact_function else view_contacts.function end as \"function\""
- , "address_town", "phone", "email"
-);
-$what = "";
-$where = "";
-
-$arrayPDO = array();
-if (isset($_REQUEST['selectedObject']) && ! empty($_REQUEST['selectedObject'])) {
- $where .= " ca_id = ? ";
- $arrayPDO = array($_REQUEST['selectedObject']);
-} elseif (isset($_REQUEST['what']) && ! empty($_REQUEST['what'])) {
-
- $what = str_replace(" ", "", $_REQUEST['what']);
- $what_table = explode(" ", $what);
-
- foreach($what_table as $key => $what_a){
- $sql_lastname[] = " lower(lastname) LIKE lower(:what_".$key.")";
- $sql_firstname[] = " lower(firstname) LIKE lower(:what_".$key.")";
- $sql_society[] = " lower(departement) LIKE lower(:what_".$key.")";
- $sql_contact_firstname[] = " lower(contact_firstname) LIKE lower(:what_".$key.")";
- $sql_contact_lastname[] = " lower(contact_lastname) LIKE lower(:what_".$key.")";
- $arrayPDO = array_merge($arrayPDO, array(":what_".$key => $what_a."%"));
- }
-
- $where .= " (" . implode(' OR ', $sql_lastname) . " ";
- $where .= " or " . implode(' OR ', $sql_firstname) . " ";
- $where .= " or " . implode(' OR ', $sql_society) . " ";
- $where .= " or " . implode(' OR ', $sql_contact_firstname) . " ";
- $where .= " or " . implode(' OR ', $sql_contact_lastname) . ") ";
-}
-// var_dump($arrayPDO);
-// var_dump($where);
-
-$list = new list_show();
-$order = 'asc';
-if (isset($_REQUEST['order']) && !empty($_REQUEST['order'])) {
- $order = trim($_REQUEST['order']);
-}
-
-//use to pass the next condition in order_field. Then we need to delete them.
-array_push(
- $select["view_contacts"],
- "lastname", "firstname", "function"
-);
-
-$field = 'society';
-if (isset($_REQUEST['order_field']) && ! empty($_REQUEST['order_field']) && in_array($_REQUEST['order_field'], $select["view_contacts"])) {
- $field = trim($_REQUEST['order_field']);
-}
-
-array_pop($select["view_contacts"]);
-array_pop($select["view_contacts"]);
-array_pop($select["view_contacts"]);
-
-$orderstr = $list->define_order($order, $field);
-
-$request = new request;
-$tab = $request->PDOselect(
- $select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype']
-);
-// $request->show();
-
-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] == "ca_id") {
- $tab[$i][$j]["id"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["label"] = _ID;
- $tab[$i][$j]["size"] = "30";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["order"] = 'id';
- }
- if ($tab[$i][$j][$value] == "contact_id") {
- $tab[$i][$j]["contact_id"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["label"] = _CONTACT_ID;
- $tab[$i][$j]["size"] = "30";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["order"] = 'contact_id';
- }
- if ($tab[$i][$j][$value] == "society") {
- $show_string = explode(' - ', $tab[$i][$j]['value']);
- $show_string[2] = '<i style="font-size:10px;color:#16ADEB;">'.$show_string[2].'</i>';
- $show_string = implode(' - ', $show_string);
- $tab[$i][$j]["value"] = $show_string;
- $tab[$i][$j]["society"] = $tab[$i][$j]["value"];
- $tab[$i][$j]["label"] = _LINKED_CONTACT;
- $tab[$i][$j]["size"] = "30";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["order"] = 'society';
- }
- if ($tab[$i][$j][$value] == "contact_purpose_id") {
- $tab[$i][$j]["value"]= $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
- $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["label"] = _CONTACT_PURPOSE;
- $tab[$i][$j]["size"] = "20";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["order"] = 'contact_purpose_id';
- }
- if ($tab[$i][$j][$value] == "departement") {
- $tab[$i][$j]['value'] = $request->show_string(
- $tab[$i][$j]['value']
- );
- $tab[$i][$j]["departement"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["label"] = _SERVICE;
- $tab[$i][$j]["size"] = "20";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["order"] = 'departement';
- }
- if($tab[$i][$j][$value]=="lastname")
- {
- $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]["lastname"]=$tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_LASTNAME;
- $tab[$i][$j]["size"]="15";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]= "lastname";
- }
- if($tab[$i][$j][$value]=="firstname")
- {
- $tab[$i][$j]["firstname"]= $request->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]["label"]=_FIRSTNAME;
- $tab[$i][$j]["size"]="15";
- $tab[$i][$j]["label_align"]="center";
- $tab[$i][$j]["align"]="center";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]= "firstname";
- }
- if($tab[$i][$j][$value]=="function")
- {
- $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]["function"]=$tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_FUNCTION;
- $tab[$i][$j]["size"]="15";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]= "function";
- }
- if($tab[$i][$j][$value]=="address_town")
- {
- $tab[$i][$j]["address_town"]= $request->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]["label"]=_TOWN;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="center";
- $tab[$i][$j]["align"]="center";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]= "address_town";
- }
- if($tab[$i][$j][$value]=="phone")
- {
- $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]["phone"]=$tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_PHONE;
- $tab[$i][$j]["size"]="15";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["order"]= "phone";
- }
- if($tab[$i][$j][$value]=="email")
- {
- $tab[$i][$j]["email"]= $request->show_string($tab[$i][$j]['value']);
- $tab[$i][$j]["label"]=_MAIL;
- $tab[$i][$j]["size"]="15";
- $tab[$i][$j]["label_align"]="center";
- $tab[$i][$j]["align"]="center";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["order"]= "email";
- }
- }
- }
-}
-
-$pageName = "contact_addresses_list";
-$pageNameUp = "contact_addresses_up&fromContactAddressesList";
-$pageNameAdd = "";
-$pageNameDel = "";
-$pageNameVal = "";
-$tableName = "view_contacts";
-$pageNameBan = "";
-$addLabel = "";
-
-$autoCompletionArray = array();
-$autoCompletionArray["list_script_url"] = $_SESSION['config']['businessappurl']
- . "index.php?display=true&page=contact_addresses_list_by_name";
-$autoCompletionArray["number_to_begin"] = 1;
-$autoCompletionArray["searchBoxAutoCompletionUpdate"] = true;
-
-$title = _ADDRESSES_LIST." : ".$i." "._ADDRESSES;
-
-$list->admin_list(
- $tab, $i, $title,
- 'contact_id', 'contact_addresses_list', 'contact_addresses',
- 'id', true, $pageNameUp, $pageNameVal, $pageNameBan,
- $pageNameDel, $pageNameAdd, $addLabel, FALSE, FALSE, _ALL_CONTACT_ADDRESSES,
- _A_CONTACT_ADDRESS, 'home', false, true, true, true,
- $what, true, $autoCompletionArray, false, true);
-
-$_SESSION['m_admin']['address'] = array();
-
-?>
+ , case when view_contacts.contact_function <> '' then view_contacts.contact_function else view_contacts.function end as \"function\"", 'address_town', 'phone', 'email'
+);
+$what = '';
+$where = '';
+
+$arrayPDO = array();
+if (isset($_REQUEST['selectedObject']) && !empty($_REQUEST['selectedObject'])) {
+ $where .= ' ca_id = ? ';
+ $arrayPDO = array($_REQUEST['selectedObject']);
+} elseif (isset($_REQUEST['what']) && !empty($_REQUEST['what'])) {
+ $what = str_replace(' ', '', $_REQUEST['what']);
+ $what_table = explode(' ', $what);
+
+ foreach ($what_table as $key => $what_a) {
+ $sql_lastname[] = ' lower(lastname) LIKE lower(:what_'.$key.')';
+ $sql_firstname[] = ' lower(firstname) LIKE lower(:what_'.$key.')';
+ $sql_society[] = ' lower(departement) LIKE lower(:what_'.$key.')';
+ $sql_contact_firstname[] = ' lower(contact_firstname) LIKE lower(:what_'.$key.')';
+ $sql_contact_lastname[] = ' lower(contact_lastname) LIKE lower(:what_'.$key.')';
+ $arrayPDO = array_merge($arrayPDO, array(':what_'.$key => $what_a.'%'));
+ }
+
+ $where .= ' ('.implode(' OR ', $sql_lastname).' ';
+ $where .= ' or '.implode(' OR ', $sql_firstname).' ';
+ $where .= ' or '.implode(' OR ', $sql_society).' ';
+ $where .= ' or '.implode(' OR ', $sql_contact_firstname).' ';
+ $where .= ' or '.implode(' OR ', $sql_contact_lastname).') ';
+}
+// var_dump($arrayPDO);
+// var_dump($where);
+
+$list = new list_show();
+$order = 'asc';
+if (isset($_REQUEST['order']) && !empty($_REQUEST['order'])) {
+ $order = trim($_REQUEST['order']);
+}
+
+//use to pass the next condition in order_field. Then we need to delete them.
+array_push(
+ $select['view_contacts'],
+ 'lastname', 'firstname', 'function'
+);
+
+$field = 'society';
+if (isset($_REQUEST['order_field']) && !empty($_REQUEST['order_field']) && in_array($_REQUEST['order_field'], $select['view_contacts'])) {
+ $field = trim($_REQUEST['order_field']);
+}
+
+array_pop($select['view_contacts']);
+array_pop($select['view_contacts']);
+array_pop($select['view_contacts']);
+
+$orderstr = $list->define_order($order, $field);
+
+$request = new request();
+$tab = $request->PDOselect(
+ $select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype']
+);
+// $request->show();
+
+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] == 'ca_id') {
+ $tab[$i][$j]['id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _ID;
+ $tab[$i][$j]['size'] = '30';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'id';
+ }
+ if ($tab[$i][$j][$value] == 'contact_id') {
+ $tab[$i][$j]['contact_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _CONTACT_ID;
+ $tab[$i][$j]['size'] = '30';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'contact_id';
+ }
+ if ($tab[$i][$j][$value] == 'society') {
+ $show_string = explode(' - ', $tab[$i][$j]['value']);
+ $show_string[2] = '<i style="font-size:10px;color:#135F7F;">'.$show_string[2].'</i>';
+ $show_string = implode(' - ', $show_string);
+ $tab[$i][$j]['value'] = $show_string;
+ $tab[$i][$j]['society'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _LINKED_CONTACT;
+ $tab[$i][$j]['size'] = '30';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'society';
+ }
+ if ($tab[$i][$j][$value] == 'contact_purpose_id') {
+ $tab[$i][$j]['value'] = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
+ $tab[$i][$j]['contact_purpose_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _CONTACT_PURPOSE;
+ $tab[$i][$j]['size'] = '20';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'contact_purpose_id';
+ }
+ if ($tab[$i][$j][$value] == 'departement') {
+ $tab[$i][$j]['value'] = $request->show_string(
+ $tab[$i][$j]['value']
+ );
+ $tab[$i][$j]['departement'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _SERVICE;
+ $tab[$i][$j]['size'] = '20';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'departement';
+ }
+ if ($tab[$i][$j][$value] == 'lastname') {
+ $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['lastname'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _LASTNAME;
+ $tab[$i][$j]['size'] = '15';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'lastname';
+ }
+ if ($tab[$i][$j][$value] == 'firstname') {
+ $tab[$i][$j]['firstname'] = $request->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['label'] = _FIRSTNAME;
+ $tab[$i][$j]['size'] = '15';
+ $tab[$i][$j]['label_align'] = 'center';
+ $tab[$i][$j]['align'] = 'center';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'firstname';
+ }
+ if ($tab[$i][$j][$value] == 'function') {
+ $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['function'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _FUNCTION;
+ $tab[$i][$j]['size'] = '15';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'function';
+ }
+ if ($tab[$i][$j][$value] == 'address_town') {
+ $tab[$i][$j]['address_town'] = $request->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['label'] = _TOWN;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'center';
+ $tab[$i][$j]['align'] = 'center';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'address_town';
+ }
+ if ($tab[$i][$j][$value] == 'phone') {
+ $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['phone'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _PHONE;
+ $tab[$i][$j]['size'] = '15';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'phone';
+ }
+ if ($tab[$i][$j][$value] == 'email') {
+ $tab[$i][$j]['email'] = $request->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['label'] = _MAIL;
+ $tab[$i][$j]['size'] = '15';
+ $tab[$i][$j]['label_align'] = 'center';
+ $tab[$i][$j]['align'] = 'center';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'email';
+ }
+ }
+ }
+}
+
+$pageName = 'contact_addresses_list';
+$pageNameUp = 'contact_addresses_up&fromContactAddressesList';
+$pageNameAdd = '';
+$pageNameDel = '';
+$pageNameVal = '';
+$tableName = 'view_contacts';
+$pageNameBan = '';
+$addLabel = '';
+
+$autoCompletionArray = array();
+$autoCompletionArray['list_script_url'] = $_SESSION['config']['businessappurl']
+ .'index.php?display=true&page=contact_addresses_list_by_name';
+$autoCompletionArray['number_to_begin'] = 1;
+$autoCompletionArray['searchBoxAutoCompletionUpdate'] = true;
+
+$title = _ADDRESSES_LIST.' : '.$i.' '._ADDRESSES;
+
+$list->admin_list(
+ $tab, $i, $title,
+ 'contact_id', 'contact_addresses_list', 'contact_addresses',
+ 'id', true, $pageNameUp, $pageNameVal, $pageNameBan,
+ $pageNameDel, $pageNameAdd, $addLabel, false, false, _ALL_CONTACT_ADDRESSES,
+ _A_CONTACT_ADDRESS, 'home', false, true, true, true,
+ $what, true, $autoCompletionArray, false, true);
+
+$_SESSION['m_admin']['address'] = array();
diff --git a/apps/maarch_entreprise/class/class_lists_Abstract.php b/apps/maarch_entreprise/class/class_lists_Abstract.php
index 4d373175355f8849d20dd6c8814012ec80372f6c..abba1b54480090a9184fdfa19806f4e34469164f 100755
--- a/apps/maarch_entreprise/class/class_lists_Abstract.php
+++ b/apps/maarch_entreprise/class/class_lists_Abstract.php
@@ -18,27 +18,28 @@
* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
*/
-
/**
* @defgroup list Lists
*/
/**
- * @brief Lists :
+ * @brief Lists :
*
*
* @file
+ *
* @author Yves Christian Kpakpo <dev@maarch.org>
* @date $date$
+ *
* @version $Revision$
* @ingroup list
*/
-
- /**
- * @brief Parameters
- *
- * Parameters for lists array
-
+
+/**
+ * @brief Parameters
+ *
+ * Parameters for lists array
+
[bool_modeReturn] boolean Return or echo mode (default: true)
[divListId] string Id of the div used to contain ajax return of list (default: divList)
[moduleName] string Name of the module where the page is
@@ -48,15 +49,15 @@
[pageTitle] string Title of the page to be displayed over the list
[bool_bigPageTitle] boolean Size of the title. If false small size
[pagePicto] string Image to be displayed near title
- [bool_showIconDetails] boolean Show the detail icon and link
+ [bool_showIconDetails] boolean Show the detail icon and link
[viewDetailsLink] string Default details link
- [bool_showIconDocument] boolean Show the icon view document
+ [bool_showIconDocument] boolean Show the icon view document
[bool_showAddButton] boolean Show the Add Button
[bool_showBottomToolbar] boolean Show bottom toolbar (default: true)
[bool_showSmallToolbar] boolean Show toolbar in small mode (default: false)
[addButtonLabel] string Label of the Add Button, (default: _ADD)
[addButtonLink] string Url of the Add Button link
- [addButtonScript] string Action or function executed on click to Add Button
+ [addButtonScript] string Action or function executed on click to Add Button
[listCss] string Css used in the list (default: listing spec)
[bool_sortColumn] boolean Show the order icons or not (default: true)
[linesToShow] string Number of rows to show in the list
@@ -78,7 +79,7 @@
[formClass] string Class of the list form (default: forms)
[disabledRules] string Rules to verify to disabled a line in list (must return boolean) Use generic @@field@@ format parameter
[hiddenFormFields] array Hidden fields in the form (format: array( 'ID' => "the_id", 'NAME' => "the_name", 'VALUE'=> "the_value"))
- [bool_actionOnLineClick] boolean Action on line click
+ [bool_actionOnLineClick] boolean Action on line click
[defaultAction] string Id of the default action
[collId] string Id of the collection (used in actions management)
[tableName] string Name of the table or view (used in actions management)
@@ -91,26 +92,26 @@
[processInstructions] string Process instructions text (default: _CLICK_LINE_TO_PROCESS)
[bool_showSublist] boolean Show sublist icon and action (default: false)
[sublistUrl] string Sublist content url (used in ajax function)
- (*)[actionIcons] array Array of action icons in list (format:
+ (*)[actionIcons] array Array of action icons in list (format:
array(
- 'type' => 'the_type',
+ 'type' => 'the_type',
'href' => 'the_href_link', (**)
'script' => 'the_javascript_action', (**)
- 'class' => 'the_icon_class',
- 'icon' => 'the_icon',
- 'label' => 'the_label',
- 'tooltip' => 'the_tooltip',
+ 'class' => 'the_icon_class',
+ 'icon' => 'the_icon',
+ 'label' => 'the_label',
+ 'tooltip' => 'the_tooltip',
'alertText' => 'the_text_alert',
'disabledRules' => 'the_disabled_rules'
'alwaysVisible' => true/false
)
- )
- * Parameters for actions array
+ )
+ * Parameters for actions array
[type] string Type of the action Icon (switch, button, image or link)
[on] array Details of action button ON. (only for switch action) (***)
[off] array Details of action button OFF. (only for switch action) (***)
[switchRules] string Rule to active switch action (must return boolean). Use @@field_name@@ parameter. (only for switch action)
- *** Details of action button
+ *** Details of action button
[href] string Link for action (** can't use it with [script])
[script] string javascript for action (** can't use it with [href])
[tooltip] string Tooltip for action
@@ -120,9 +121,8 @@
[alertText] string Text displayed in the alert box. Can use @@field_name@@ parameter
[disabledRules] string To disabled action link (must return boolean). Use @@field_name@@ parameter
*/
-
-require_once 'core' . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR
-. 'class_security.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR
+.'class_security.php';
abstract class lists_Abstract extends Database
{
@@ -134,270 +134,290 @@ abstract class lists_Abstract extends Database
protected $end;
protected $order;
protected $orderField;
- protected $params ;
+ protected $params;
protected $actionButtons;
protected $withForm;
protected $formId;
protected $whatSearch;
protected $haveAction;
- protected $currentBasket;
- protected $template;
- protected $tmplt_CurrentCssLine;
- protected $modeReturn;
- protected $divListId;
- protected $collId;
-
- function __construct(){
+ protected $currentBasket;
+ protected $template;
+ protected $tmplt_CurrentCssLine;
+ protected $modeReturn;
+ protected $divListId;
+ protected $collId;
+
+ public function __construct()
+ {
$this->order = $_REQUEST['order'];
$this->orderField = $_REQUEST['order_field'];
$this->start = $_REQUEST['start'];
$this->whatSearch = $_REQUEST['what'];
$this->_manageFilters();
- if (isset($_REQUEST['template'])) $this->template = $_REQUEST['template'];
- if (isset($_REQUEST['coll_id'])) $this->collId = $_REQUEST['coll_id'];
- if(!isset($_SESSION['previous_basket']['id'])){
+ if (isset($_REQUEST['template'])) {
+ $this->template = $_REQUEST['template'];
+ }
+ if (isset($_REQUEST['coll_id'])) {
+ $this->collId = $_REQUEST['coll_id'];
+ }
+ if (!isset($_SESSION['previous_basket']['id'])) {
$_SESSION['previous_basket']['id'] = $_SESSION['current_basket']['id'];
}
}
-
- protected function _buildFilter($filter) {
+
+ protected function _buildFilter($filter)
+ {
//Reset some values
$filters = $filtersClause = $where = $options = '';
-
+
//Db query
$db = new Database();
//var_dump($_SESSION['filters']['contact']);
//Load filter's data
switch ($filter) {
-
case 'status':
$stmt = $db->query(
- "SELECT * FROM " . STATUS_TABLE . " WHERE can_be_searched = 'Y' order by label_status"
+ 'SELECT * FROM '.STATUS_TABLE." WHERE can_be_searched = 'Y' order by label_status"
);
while ($res = $stmt->fetchObject()) {
- if (isset($_SESSION['filters']['status']['VALUE'])
+ if (isset($_SESSION['filters']['status']['VALUE'])
&& $_SESSION['filters']['status']['VALUE'] == $res->id
- ) $selected = 'selected="selected"'; else $selected = '';
- $options .='<option value="'.$res->id.'" '.$selected.'>'.$res->label_status.'</option>';
+ ) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+ $options .= '<option value="'.$res->id.'" '.$selected.'>'.$res->label_status.'</option>';
}
- $filters .='<select name="status_id" id="status_id" onChange="loadList(\''.$this->link
+ $filters .= '<select name="status_id" id="status_id" onChange="loadList(\''.$this->link
.'&filter=status&value=\' + document.filters.status_id.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">'
.'<option value="none">'._CHOOSE_STATUS.'</option>'
.$options.'<option value="late">'._LATE.'</option>'
.'</select> ';
break;
-
+
case 'entity':
- require_once "modules" . DIRECTORY_SEPARATOR . "entities" . DIRECTORY_SEPARATOR
- . "class" . DIRECTORY_SEPARATOR . "class_manage_entities.php";
- require_once "modules" . DIRECTORY_SEPARATOR . "entities" . DIRECTORY_SEPARATOR
- . "entities_tables.php";
-
+ require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
+ require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR
+ .'entities_tables.php';
+
$ent = new entity();
$sec = new security();
$ent = new entity();
-
+
$view = $sec->retrieve_view_from_table($this->params['tableName']);
if (empty($view)) {
$view = $this->params['tableName'];
}
if (!empty($view)) {
- if (! empty($this->params['basketClause'])) {
+ if (!empty($this->params['basketClause'])) {
$this->params['basketClause'] = str_replace('res_view_letterbox.', 'r.', $this->params['basketClause']);
- $where = 'where (' . $this->params['basketClause'] . ')';
+ $where = 'where ('.$this->params['basketClause'].')';
}
}
if ((isset($_SESSION['filters']['entity']['VALUE']) || isset($_SESSION['filters']['entity_subentities']))) {
-
$options = '<option selected="selected" value="'.$_SESSION['filters']['entity']['VALUE'].'" style="text-align:center;">'.$ent->getentityshortlabel($_SESSION['filters']['entity']['VALUE']).'</option>';
}
- $filters .='<select data-placeholder="'._ENTITY.'" name="entity_id" id="entity_id" onChange="loadList(\''.$this->link
+ $filters .= '<select data-placeholder="'._ENTITY.'" name="entity_id" id="entity_id" onChange="loadList(\''.$this->link
.'&filter=entity&value=\' + document.filters.entity_id.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">'
.'<option value="none" style="text-align:center;"></option>'
.$options.'</select>';
- $filters .= '<script>$j("#entity_id").chosen({width:"300px",allow_single_deselect: true});$j("#entity_id").bind("chosen:showing_dropdown", function() {loadToolbarEntities("'.$where.'");}); </script>';
+ $filters .= '<script>$j("#entity_id").chosen({width:"300px",allow_single_deselect: true});$j("#entity_id").bind("chosen:showing_dropdown", function() {loadToolbarEntities("'.$where.'");}); </script>';
break;
case 'entity_subentities':
-
- if (isset($_SESSION['filters']['entity']['VALUE']) && $_SESSION['filters']['entity_subentities']['checked'] == true && $_SESSION['filters']['entity']['VALUE'] != ''){
- $checked = 'checked="checked"';
- }else{
- $checked = '';
+
+ if (isset($_SESSION['filters']['entity']['VALUE']) && $_SESSION['filters']['entity_subentities']['checked'] == true && $_SESSION['filters']['entity']['VALUE'] != '') {
+ $checked = 'checked="checked"';
+ } else {
+ $checked = '';
}
-
- if($_SESSION['filters']['entity_subentities']['checked']){
- $filters .='<input type="checkbox" '.$checked.' style="margin-left:0px" title="inclure les sous-entités" onclick="loadList(\''.$this->link
+
+ if ($_SESSION['filters']['entity_subentities']['checked']) {
+ $filters .= '<input type="checkbox" '.$checked.' style="margin-left:0px" title="inclure les sous-entités" onclick="loadList(\''.$this->link
.'&filter=entity&value=\' + document.filters.entity_id.value, \''
.$this->divListId.'\', '.$this->modeReturn.');" /> ';
- } else {
- $filters .='<input type="checkbox" '.$checked.' style="margin-left:0px" title="inclure les sous-entités" onclick="loadList(\''.$this->link
+ } else {
+ $filters .= '<input type="checkbox" '.$checked.' style="margin-left:0px" title="inclure les sous-entités" onclick="loadList(\''.$this->link
.'&filter=entity_subentities&value=\' + document.filters.entity_id.value, \''
.$this->divListId.'\', '.$this->modeReturn.');" /> ';
- }
-
+ }
break;
-
+
case 'typist':
$sec = new security();
-
+
$view = $sec->retrieve_view_from_table($this->params['tableName']);
if (empty($view)) {
$view = $this->params['tableName'];
}
if (!empty($view)) {
- if (! empty($this->params['basketClause'])) $where = 'where '.$this->params['basketClause'];
+ if (!empty($this->params['basketClause'])) {
+ $where = 'where '.$this->params['basketClause'];
+ }
$stmt = $db->query(
- "SELECT distinct(typist) as typist, count(distinct res_id)"
- . " as total FROM res_view_letterbox r"
- . $view. " r " .$where
- . " group by typist order by typist"
+ 'SELECT distinct(typist) as typist, count(distinct res_id)'
+ .' as total FROM res_view_letterbox r'
+ .$view.' r '.$where
+ .' group by typist order by typist'
);
-
+
while ($res = $stmt->fetchObject()) {
-
- if (isset($_SESSION['filters']['typist']['VALUE'])
+ if (isset($_SESSION['filters']['typist']['VALUE'])
&& $_SESSION['filters']['typist']['VALUE'] == $res->typist
- ) $selected = 'selected="selected"'; else $selected = '';
-
- if ($_SESSION['user']['UserId'] == $res->typist) $style = 'style="font-weight:bold;"'; else $style = '';
+ ) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+
+ if ($_SESSION['user']['UserId'] == $res->typist) {
+ $style = 'style="font-weight:bold;"';
+ } else {
+ $style = '';
+ }
- $options .='<option value="'.$res->typist.'" '.$selected.' '.$style.'>'.$res->typist.' ('.$res->total.')</option>';
+ $options .= '<option value="'.$res->typist.'" '.$selected.' '.$style.'>'.$res->typist.' ('.$res->total.')</option>';
}
}
- $filters .='<select name="typist" id="typist" onChange="loadList(\''.$this->link
+ $filters .= '<select name="typist" id="typist" onChange="loadList(\''.$this->link
.'&filter=typist&value=\' + document.filters.typist.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">'
.'<option value="none">'._CHOOSE_USER2.'</option>'
.$options.'</select> ';
break;
-
+
case 'category':
- $filters .='<select data-placeholder="'._CATEGORY.'" name="category_id_list" id="category_id_list" onChange="loadList(\''.$this->link
+ $filters .= '<select data-placeholder="'._CATEGORY.'" name="category_id_list" id="category_id_list" onChange="loadList(\''.$this->link
.'&filter=category&value=\' + document.filters.category_id_list.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- $filters .='<option value="none" style="text-align:center;"></option>';
+ $filters .= '<option value="none" style="text-align:center;"></option>';
foreach (array_keys($_SESSION['coll_categories'][$this->collId]) as $catId) {
- if ($catId <> 'default_category') {
- if (isset($_SESSION['filters']['category']['VALUE'])
+ if ($catId != 'default_category') {
+ if (isset($_SESSION['filters']['category']['VALUE'])
&& $_SESSION['filters']['category']['VALUE'] == $catId
- ) $selected = 'selected="selected"'; else $selected = '';
- $filters .='<option value="'.$catId.'" '.$selected.'>'.$_SESSION['coll_categories'][$this->collId][$catId].'</option>';
+ ) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+ $filters .= '<option value="'.$catId.'" '.$selected.'>'.$_SESSION['coll_categories'][$this->collId][$catId].'</option>';
}
}
- $filters .='</select> ';
+ $filters .= '</select> ';
$filters .= '<script> $j("#category_id_list").chosen({width:"150px",allow_single_deselect: true});</script>';
break;
case 'priority':
- $filters .='<select data-placeholder="'._PRIORITY.'" name="priority_id_list" id="priority_id_list" onChange="loadList(\''.$this->link
+ $filters .= '<select data-placeholder="'._PRIORITY.'" name="priority_id_list" id="priority_id_list" onChange="loadList(\''.$this->link
.'&filter=priority&value=\' + document.filters.priority_id_list.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- $filters .='<option value="none" style="text-align:center;"></option>';
- foreach (array_keys($_SESSION['mail_priorities']) as $priorityId) {
- if (is_numeric($_SESSION['filters']['priority']['VALUE']) && $_SESSION['filters']['priority']['VALUE'] == $priorityId){
- $selected = 'selected="selected"';
- } else{
- $selected = '';
- }
- $filters .='<option value="'.$priorityId.'" '.$selected.'>'.$_SESSION['mail_priorities'][$priorityId].'</option>';
-
+ $filters .= '<option value="none" style="text-align:center;"></option>';
+ foreach (array_keys($_SESSION['mail_priorities']) as $priorityId) {
+ if (is_numeric($_SESSION['filters']['priority']['VALUE']) && $_SESSION['filters']['priority']['VALUE'] == $priorityId) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+ $filters .= '<option value="'.$priorityId.'" '.$selected.'>'.$_SESSION['mail_priorities'][$priorityId].'</option>';
}
- $filters .='</select> ';
+ $filters .= '</select> ';
//$filters .= '<script>new c($(\'priority_id_list\'),{width:"150px",allow_single_deselect: true});</script>';
$filters .= '<script> $j("#priority_id_list").chosen({width:"150px",allow_single_deselect: true});</script>';
-
+
break;
-
+
case 'isViewed':
- $isViewedArray = array('yes' =>_YES, 'no' => _NO);
- $filters .='<select data-placeholder="'._VIEWED.'" name="isViewed" id="isViewed" onChange="loadList(\''.$this->link
+ $isViewedArray = array('yes' => _YES, 'no' => _NO);
+ $filters .= '<select data-placeholder="'._VIEWED.'" name="isViewed" id="isViewed" onChange="loadList(\''.$this->link
.'&filter=isViewed&value=\' + document.filters.isViewed.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- $filters .='<option value="none"></option>';
+ $filters .= '<option value="none"></option>';
foreach ($isViewedArray as $key => $value) {
- if (isset($_SESSION['filters']['isViewed']['VALUE'])
+ if (isset($_SESSION['filters']['isViewed']['VALUE'])
&& $_SESSION['filters']['isViewed']['VALUE'] == $key
- ) $selected = 'selected="selected"'; else $selected = '';
- $filters .='<option value="'.$key.'" '.$selected.'>'.$value.'</option>';
+ ) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+ $filters .= '<option value="'.$key.'" '.$selected.'>'.$value.'</option>';
}
- $filters .='</select> ';
+ $filters .= '</select> ';
//$filters .= '<script>new c($(\'isViewed\'),{width: "150px", disable_search: true,allow_single_deselect: true});</script>';
$filters .= '<script> $j("#isViewed").chosen({width:"150px", disable_search: true, allow_single_deselect: true});</script>';
break;
-
+
case 'folder':
- if(isset($_SESSION['filters']['folder']['VALUE']) && !empty($_SESSION['filters']['folder']['VALUE'])) {
+ if (isset($_SESSION['filters']['folder']['VALUE']) && !empty($_SESSION['filters']['folder']['VALUE'])) {
$folder = $_SESSION['filters']['folder']['VALUE'];
} else {
$folder = '['._FOLDER.']';
}
- $filters .='<input type="text" name="folder_id" id="folder_id" placeholder="'.$folder.'" size="40" '
+ $filters .= '<input type="text" name="folder_id" id="folder_id" placeholder="'.$folder.'" size="40" '
.'onfocus="if(this.value==\'['._FOLDER.']\'){this.value=\'\';}'
.'onKeyPress="if(event.keyCode == 9 || event.keyCode == 13) loadList(\''.$this->link
.'&filter=folder&value=\' + this.value, \''.$this->divListId.'\', '
.$this->modeReturn.');" /> ';
- //Autocompletion script and div
- $filters .='<div id="folderListByName" class="autocomplete"></div>';
- $filters .='<script type="text/javascript">initList(\'folder_id\', \'folderListByName\', \''
+ //Autocompletion script and div
+ $filters .= '<div id="folderListByName" class="autocomplete"></div>';
+ $filters .= '<script type="text/javascript">initList(\'folder_id\', \'folderListByName\', \''
.$_SESSION['config']['businessappurl'].'index.php?display=true&module='
.'folder&page=folders_list_by_name\', \'folder\', \'2\');</script>';
break;
-
+
case 'contact':
//if(isset($_SESSION['filters']['contact']['VALUE']) && !empty($_SESSION['filters']['contact']['VALUE'])) {
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_request.php");
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_request.php';
$sec = new security();
$pos = strpos($this->params['basketClause'], 'r.');
- if($pos){
+ if ($pos) {
$ext = 'r';
$view = 'res_view_letterbox r';
- }else {
+ } else {
$ext = 'res_view_letterbox';
$view = 'res_view_letterbox';
}
- $query = "SELECT distinct(".$ext.".contact_id),society, firstname, lastname FROM "
- . $_SESSION['tablename']['contacts_v2'] . " c, ".$view." WHERE c.contact_id = ".$ext.".contact_id and ".$this->params['basketClause'];
-
+ $query = 'SELECT distinct('.$ext.'.contact_id),society, firstname, lastname FROM '
+ .$_SESSION['tablename']['contacts_v2'].' c, '.$view.' WHERE c.contact_id = '.$ext.'.contact_id and '.$this->params['basketClause'];
+
$stmt = $db->query($query, array());
-
- $filters .='<select id="contact_id_list" onChange="loadList(\''.$this->link
+
+ $filters .= '<select id="contact_id_list" onChange="loadList(\''.$this->link
.'&filter=contact&value=\' + document.filters.contact_id_list.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- $filters .='<option value="none" style="text-align:center;">' . _CONTACT . '</option>';
+ $filters .= '<option value="none" style="text-align:center;">'._CONTACT.'</option>';
- while($line = $stmt->fetchObject()){
- $filters .='<option value="'.$line->contact_id.'" title="'.$line->society.'"';
- if(empty($line->lastname)){
+ while ($line = $stmt->fetchObject()) {
+ $filters .= '<option value="'.$line->contact_id.'" title="'.$line->society.'"';
+ if (empty($line->lastname)) {
$person = $line->society;
- }else{
+ } else {
$person = $line->firstname.' '.$line->lastname.' ('.$line->society.')';
}
-
- if($_SESSION['filters']['contact']['VALUE'] == $line->contact_id){
- $filters .=' selected="selected" ';
- }
- $filters .='>'.$person.'</option>';
+ if ($_SESSION['filters']['contact']['VALUE'] == $line->contact_id) {
+ $filters .= ' selected="selected" ';
+ }
+ $filters .= '>'.$person.'</option>';
}
- $filters .='</select> ';
+ $filters .= '</select> ';
//$filters .= '<script>new c($(\'contact_id_list\'),{width: "150px",max_shown_results: "10"});</script>';
$filters .= '<script> $j("#contact_id_list").chosen({width:"150px",max_shown_results: "10"});</script>';
-
-
/*if (is_numeric($_SESSION['filters']['contact']['VALUE'])) {
$query = "SELECT society, lastname, firstname, is_corporate_person, society_short FROM "
. $_SESSION['tablename']['contacts_v2'] . " WHERE contact_id = ?";
-
+
$stmt = $db->query($query, array($_SESSION['filters']['contact']['VALUE']));
$line = $stmt->fetchObject();
@@ -414,7 +434,7 @@ abstract class lists_Abstract extends Database
}
} else {
$query = "SELECT lastname, firstname FROM users WHERE user_id = ?";
-
+
$stmt = $db->query($query, array($_SESSION['filters']['contact']['VALUE']));
$line = $stmt->fetchObject();
@@ -429,7 +449,7 @@ abstract class lists_Abstract extends Database
.'onKeyPress="if(event.keyCode == 9 || event.keyCode == 13)loadList(\''.$this->link
.'&filter=contact&value=\' + $(\'contactidFilters\').value, \''.$this->divListId.'\', '
.$this->modeReturn.');" /> ';
- //Autocompletion script and div
+ //Autocompletion script and div
$filters .='<div id="contactListByName" class="autocomplete"></div>';
$filters .='<script type="text/javascript">initList_hidden_input(\'contact_id\', \'contactListByName\', \''
.$_SESSION['config']['businessappurl'].'index.php?display=true&page='
@@ -444,60 +464,59 @@ abstract class lists_Abstract extends Database
case 'res_id':
$res_id = '['._GED.']';
- $filters .='<input type="text" name="res_id" id="res_id" placeholder="'.$res_id.'" size="15" '
+ $filters .= '<input type="text" name="res_id" id="res_id" placeholder="'.$res_id.'" size="15" '
.'onChange="myFunction(), loadList(\''.$this->link
.'&filter=res_id&value=\' + $(\'residFilters\').value, \''.$this->divListId.'\', '
.$this->modeReturn.');" /> ';
- //Autocompletion script and div
- $filters .='<script type="text/javascript">function myFunction() {';
- $filters .='var x = document.getElementById("res_id").value;';
- $filters .='document.getElementById("residFilters").value = x;';
- $filters .='}</script>';
+ //Autocompletion script and div
+ $filters .= '<script type="text/javascript">function myFunction() {';
+ $filters .= 'var x = document.getElementById("res_id").value;';
+ $filters .= 'document.getElementById("residFilters").value = x;';
+ $filters .= '}</script>';
$filters .= '<input type="hidden" id="residFilters" name="residFilters" ';
- if(isset($_SESSION['filters']['res_id']['VALUE']) && !empty($_SESSION['filters']['res_id']['VALUE'])) {
+ if (isset($_SESSION['filters']['res_id']['VALUE']) && !empty($_SESSION['filters']['res_id']['VALUE'])) {
$filters .= 'value="'.$_SESSION['filters']['res_id']['VALUE'].'"';
}
- $filters .='/>';
+ $filters .= '/>';
break;
case 'subject':
$pos = strpos($this->params['basketClause'], 'r.');
- if($pos){
+ if ($pos) {
$ext = 'r';
$view = 'res_view_letterbox r';
- }else {
+ } else {
$ext = 'res_view_letterbox';
$view = 'res_view_letterbox';
}
- $query = "SELECT distinct(".$ext.".subject), res_id FROM "
- . $view . " WHERE ".$this->params['basketClause'] . " ORDER BY subject ASC";
-
+ $query = 'SELECT distinct('.$ext.'.subject), res_id FROM '
+ .$view.' WHERE '.$this->params['basketClause'].' ORDER BY subject ASC';
+
$stmt = $db->query($query, array());
-
- $filters .='<select id="subjectFilters" name="subjectFilters" onChange="loadList(\''.$this->link
+
+ $filters .= '<select id="subjectFilters" name="subjectFilters" onChange="loadList(\''.$this->link
.'&filter=subject&value=\' + document.filters.subjectFilters.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- $filters .='<option value="none" style="text-align:center;">' . _SUBJECT . '</option>';
+ $filters .= '<option value="none" style="text-align:center;">'._SUBJECT.'</option>';
- while($line = $stmt->fetchObject()){
- $filters .='<option value="'.$line->subject.'" title="'.$line->subject.'"';
- if($_SESSION['filters']['res_id']['VALUE'] == $line->res_id){
- $filters .=' selected="selected" ';
+ while ($line = $stmt->fetchObject()) {
+ $filters .= '<option value="'.$line->subject.'" title="'.$line->subject.'"';
+ if ($_SESSION['filters']['res_id']['VALUE'] == $line->res_id) {
+ $filters .= ' selected="selected" ';
}
- $filters .='>'.$line->subject.'</option>';
-
+ $filters .= '>'.$line->subject.'</option>';
}
- $filters .='</select> ';
+ $filters .= '</select> ';
$filters .= '<script> $j("#subjectFilters").chosen({width:"150px",max_shown_results: "10"});</script>';
/*$subject = '['._SUBJECT.']';
$filters .='<input type="text" name="subject" id="subject" placeholder="'.$subject.'" size="40" '
.'onChange="myFunction(), loadList(\''.$this->link
.'&filter=subject&value=\' + $(\'subjectFilters\').value, \''.$this->divListId.'\', '
.$this->modeReturn.');" /> ';
- //Autocompletion script and div
+ //Autocompletion script and div
$filters .='<script type="text/javascript">function myFunction() {';
$filters .='var x = document.getElementById("subject").value;';
$filters .='document.getElementById("subjectFilters").value = x;';
@@ -508,87 +527,100 @@ abstract class lists_Abstract extends Database
}
$filters .='/>';*/
break;
-
+
case 'type':
- require_once 'core' . DIRECTORY_SEPARATOR . 'core_tables.php';
-
- if (! empty($this->params['basketClause'])) $where = 'where '.$this->params['basketClause'];
-
+ require_once 'core'.DIRECTORY_SEPARATOR.'core_tables.php';
+
+ if (!empty($this->params['basketClause'])) {
+ $where = 'where '.$this->params['basketClause'];
+ }
+
$stmt = $db->query(
- "SELECT distinct(r.type_id), t.description FROM "
- .$this->params['tableName']. " r left join " . DOCTYPES_TABLE
- . " t on t.type_id = r.type_id " .$where
- . " group by t.description, r.type_id order by t.description"
+ 'SELECT distinct(r.type_id), t.description FROM '
+ .$this->params['tableName'].' r left join '.DOCTYPES_TABLE
+ .' t on t.type_id = r.type_id '.$where
+ .' group by t.description, r.type_id order by t.description'
);
while ($res = $stmt->fetchObject()) {
- if (isset($_SESSION['filters']['type']['VALUE'])
+ if (isset($_SESSION['filters']['type']['VALUE'])
&& $_SESSION['filters']['type']['VALUE'] == $res->type_id
- ) $selected = 'selected="selected"'; else $selected = '';
- $options .= '<option value="' . $res->type_id . ' ' .$selected. '">'. $res->description . '</option>';
+ ) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+ $options .= '<option value="'.$res->type_id.' '.$selected.'">'.$res->description.'</option>';
}
- $filters .='<select name="type_id" id="type_id" onChange="loadList(\''.$this->link
+ $filters .= '<select name="type_id" id="type_id" onChange="loadList(\''.$this->link
.'&filter=type&value=\' + document.filters.type_id.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">'
.'<option value="none">'._CHOOSE_TYPE.'</option>'
.$options.'</select> ';
break;
-
+
case 'user':
- if(isset($_SESSION['filters']['user']['VALUE']) && !empty($_SESSION['filters']['user']['VALUE'])) {
+ if (isset($_SESSION['filters']['user']['VALUE']) && !empty($_SESSION['filters']['user']['VALUE'])) {
$user = $_SESSION['filters']['user']['VALUE'];
} else {
$user = '['._USER.']';
}
- $filters .='<input type="text" name="user_id" id="user_id" value="'.$user.'" size="30" '
+ $filters .= '<input type="text" name="user_id" id="user_id" value="'.$user.'" size="30" '
.'onfocus="if(this.value==\'['._USER.']\'){this.value=\'\';}" '
.'onKeyPress="if(event.keyCode == 9 || event.keyCode == 13)loadList(\''.$this->link
.'&filter=user&value=\' + this.value, \''.$this->divListId.'\', '
.$this->modeReturn.');" /> ';
- //Autocompletion script and div
- $filters .='<div id="userListByName" class="autocomplete"></div>';
- $filters .='<script type="text/javascript">initList(\'user_id\', \'userListByName\', \''
+ //Autocompletion script and div
+ $filters .= '<div id="userListByName" class="autocomplete"></div>';
+ $filters .= '<script type="text/javascript">initList(\'user_id\', \'userListByName\', \''
.$_SESSION['config']['businessappurl'].'index.php?display=true&page='
.'users_autocomplete_list\', \'Input\', \'2\');</script>';
break;
-
+
case 'action':
$stmt = $db->query(
- "SELECT id, label_action FROM "
- . $_SESSION['tablename']['actions']
- . " WHERE origin = 'folder' and enabled = 'Y' and history = 'Y'"
+ 'SELECT id, label_action FROM '
+ .$_SESSION['tablename']['actions']
+ ." WHERE origin = 'folder' and enabled = 'Y' and history = 'Y'"
);
while ($res = $stmt->fetchObject()) {
- $id = 'ACTION#' . $res->id;
- if (isset($_SESSION['filters']['action']['VALUE'])
+ $id = 'ACTION#'.$res->id;
+ if (isset($_SESSION['filters']['action']['VALUE'])
&& $_SESSION['filters']['action']['VALUE'] == $id
- ) $selected = 'selected="selected"'; else $selected = '';
- $options .='<option value="'.urlencode($id).'" '.$selected.'>'.$res->label_action.'</option>';
+ ) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+ $options .= '<option value="'.urlencode($id).'" '.$selected.'>'.$res->label_action.'</option>';
}
- $filters .='<select name="action_id" id="action_id" onChange="loadList(\''.$this->link
+ $filters .= '<select name="action_id" id="action_id" onChange="loadList(\''.$this->link
.'&filter=action&value=\' + document.filters.action_id.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">'
.'<option value="none">'._CHOOSE_ACTION.'</option>'
.$options.'</select> ';
break;
-
+
case 'history_action':
- for ($i=0;$i<count($_SESSION['history_keywords']);$i++) {
-
- if (isset($_SESSION['filters']['history_action']['VALUE'])
+ for ($i = 0; $i < count($_SESSION['history_keywords']); ++$i) {
+ if (isset($_SESSION['filters']['history_action']['VALUE'])
&& $_SESSION['filters']['history_action']['VALUE'] == $_SESSION['history_keywords'][$i]['id']
- ) $selected = 'selected="selected"'; else $selected = '';
- $options .='<option value="'.$_SESSION['history_keywords'][$i]['id'].'" '
+ ) {
+ $selected = 'selected="selected"';
+ } else {
+ $selected = '';
+ }
+ $options .= '<option value="'.$_SESSION['history_keywords'][$i]['id'].'" '
.$selected.'>'.$_SESSION['history_keywords'][$i]['label'].'</option>';
}
- $filters .='<select name="history_action_id" id="history_action_id" onChange="loadList(\''.$this->link
+ $filters .= '<select name="history_action_id" id="history_action_id" onChange="loadList(\''.$this->link
.'&filter=history_action&value=\' + document.filters.history_action_id.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">'
.'<option value="none">'._CHOOSE_ACTION.'</option>'
.$options.'</select> ';
break;
-
+
case 'history_date':
- if(isset($_SESSION['filters']['history_date_start']['VALUE']) && !empty($_SESSION['filters']['history_date_start']['VALUE'])) {
+ if (isset($_SESSION['filters']['history_date_start']['VALUE']) && !empty($_SESSION['filters']['history_date_start']['VALUE'])) {
$date_start = $_SESSION['filters']['history_date_start']['VALUE'];
}
$filters .= ' '._SINCE.': <input type="text" name="date_start" '
@@ -596,8 +628,8 @@ abstract class lists_Abstract extends Database
.'onKeyPress="if(event.keyCode == 9 || event.keyCode == 13)loadList(\''.$this->link
.'&filter=history_date_start&value=\' + this.value, \''.$this->divListId.'\', '
.$this->modeReturn.');" value="'.$date_start.'" size="15" />';
-
- if(isset($_SESSION['filters']['history_date_end']['VALUE']) && !empty($_SESSION['filters']['history_date_end']['VALUE'])) {
+
+ if (isset($_SESSION['filters']['history_date_end']['VALUE']) && !empty($_SESSION['filters']['history_date_end']['VALUE'])) {
$date_end = $_SESSION['filters']['history_date_end']['VALUE'];
}
$filters .= ' '._FOR.': <input type="text" name="date_end" '
@@ -606,9 +638,9 @@ abstract class lists_Abstract extends Database
.'&filter=history_date_end&value=\' + this.value, \''.$this->divListId.'\', '
.$this->modeReturn.');" value="'.$date_end.'" size="15" /> ';
break;
-
+
case 'creation_date':
- if(isset($_SESSION['filters']['creation_date_start']['VALUE']) && !empty($_SESSION['filters']['creation_date_start']['VALUE'])) {
+ if (isset($_SESSION['filters']['creation_date_start']['VALUE']) && !empty($_SESSION['filters']['creation_date_start']['VALUE'])) {
$date_start = $_SESSION['filters']['creation_date_start']['VALUE'];
}
$filters .= ' '._SINCE.': <input type="text" name="date_start" '
@@ -616,8 +648,8 @@ abstract class lists_Abstract extends Database
.'onKeyPress="if(event.keyCode == 9 || event.keyCode == 13)loadList(\''.$this->link
.'&filter=creation_date_start&value=\' + this.value, \''.$this->divListId.'\', '
.$this->modeReturn.');" value="'.$date_start.'" size="15" />';
-
- if(isset($_SESSION['filters']['creation_date_end']['VALUE']) && !empty($_SESSION['filters']['creation_date_end']['VALUE'])) {
+
+ if (isset($_SESSION['filters']['creation_date_end']['VALUE']) && !empty($_SESSION['filters']['creation_date_end']['VALUE'])) {
$date_end = $_SESSION['filters']['creation_date_end']['VALUE'];
}
$filters .= ' '._FOR.': <input type="text" name="date_end" '
@@ -626,14 +658,14 @@ abstract class lists_Abstract extends Database
.'&filter=creation_date_end&value=\' + this.value, \''.$this->divListId.'\', '
.$this->modeReturn.');" value="'.$date_end.'" size="15" /> ';
break;
-
+
case 'identifier':
- if(isset($_SESSION['filters']['identifier']['VALUE']) && !empty($_SESSION['filters']['identifier']['VALUE'])) {
+ if (isset($_SESSION['filters']['identifier']['VALUE']) && !empty($_SESSION['filters']['identifier']['VALUE'])) {
$identifier = $_SESSION['filters']['identifier']['VALUE'];
}/* else {
$identifier = '['._CHRONO_NUMBER.']';
}*/
- $filters .='<input type="text" name="identifier" placeholder="'._CHRONO_NUMBER.'" id="identifier" style="width:150px;" value="'.$identifier.'" size="40" '
+ $filters .= '<input type="text" name="identifier" placeholder="'._CHRONO_NUMBER.'" id="identifier" style="width:150px;" value="'.$identifier.'" size="40" '
// .'onfocus="if(this.value==\'['._CHRONO_NUMBER.']\'){this.value=\'\';}" '
.'onChange="loadList(\''.$this->link
.'&filter=identifier&value=\' + this.value, \''.$this->divListId.'\', '.$this->modeReturn.');" '
@@ -641,34 +673,32 @@ abstract class lists_Abstract extends Database
.'&filter=identifier&value=\' + this.value, \''.$this->divListId.'\', '
.$this->modeReturn.');" /> ';
break;
-
}
-
+
return $filters;
}
-
- protected function _haveFilter() {
-
+
+ protected function _haveFilter()
+ {
$haveFilter = false;
-
+
foreach ($_SESSION['filters'] as $key => $val) {
if (!empty($_SESSION['filters'][$key]['VALUE']) || ($key == 'priority' && $_SESSION['filters'][$key]['VALUE'] == 0)) {
$haveFilter = true;
break;
}
}
-
+
return $haveFilter;
}
-
- protected function _resetFilter() {
-
- if($_SESSION['previous_basket']['id'] != $_SESSION['current_basket']['id']){
+ protected function _resetFilter()
+ {
+ if ($_SESSION['previous_basket']['id'] != $_SESSION['current_basket']['id']) {
foreach ($_SESSION['filters'] as $key => $val) {
$_SESSION['filters'][$key]['VALUE'] = '';
$_SESSION['filters'][$key]['CLAUSE'] = '';
- }
+ }
}/*elseif($_SESSION['basket_used'] == $_GET['baskets']){
foreach ($_SESSION['filters'] as $key => $val) {
$_SESSION['filters'][$key]['VALUE'] = '';
@@ -676,29 +706,23 @@ abstract class lists_Abstract extends Database
}
}*/
-
-
}
- public function _resetFilter2() {
-
- foreach ($_SESSION['filters'] as $key => $val) {
- $_SESSION['filters'][$key]['VALUE'] = '';
- $_SESSION['filters'][$key]['CLAUSE'] = '';
- }
-
+ public function _resetFilter2()
+ {
+ foreach ($_SESSION['filters'] as $key => $val) {
+ $_SESSION['filters'][$key]['VALUE'] = '';
+ $_SESSION['filters'][$key]['CLAUSE'] = '';
+ }
}
-
- protected function _manageFilters() {
-
+
+ protected function _manageFilters()
+ {
//Reset all filters
- if ($_REQUEST['filter'] == 'reset'){
-
- $this->_resetFilter2();
-
+ if ($_REQUEST['filter'] == 'reset') {
+ $this->_resetFilter2();
} else { //Init filter value and clause
- if(isset($_REQUEST['value']) && (!empty($_REQUEST['value']) || ($_REQUEST['filter'] == 'priority' && $_REQUEST['value'] == 0))) {
-
+ if (isset($_REQUEST['value']) && (!empty($_REQUEST['value']) || ($_REQUEST['filter'] == 'priority' && $_REQUEST['value'] == 0))) {
if ($_REQUEST['value'] == 'none') {
//Reset if none
$_SESSION['filters'][$_REQUEST['filter']]['VALUE'] = '';
@@ -708,40 +732,34 @@ abstract class lists_Abstract extends Database
$_SESSION['filters'][$_REQUEST['filter']]['VALUE'] = $_REQUEST['value'];
//Build where clause
if ($_REQUEST['filter'] == 'status') {
-
if ($_SESSION['filters']['status']['VALUE'] == 'late') {
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_request.php");
- $request = new request();
- $_SESSION['filters']['status']['CLAUSE'] = "(process_limit_date is not null and "
- .$request->current_datetime()." > "
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_request.php';
+ $request = new request();
+ $_SESSION['filters']['status']['CLAUSE'] = '(process_limit_date is not null and '
+ .$request->current_datetime().' > '
.$request->extract_date('process_limit_date')." ) and status <> 'END'";
} else {
$_SESSION['filters']['status']['CLAUSE'] = "status = '".$_SESSION['filters']['status']['VALUE']."'";
}
-
- } else if ($_REQUEST['filter'] == 'entity') {
-
+ } elseif ($_REQUEST['filter'] == 'entity') {
$_SESSION['filters']['entity_subentities']['VALUE'] = '';
$_SESSION['filters']['entity_subentities']['CLAUSE'] = '';
$_SESSION['filters']['entity_subentities']['checked'] = false;
-
- $_SESSION['filters']['entity']['CLAUSE'] = "destination = '".$_SESSION['filters']['entity']['VALUE']."'";
-
- } else if ($_REQUEST['filter'] == 'entity_subentities') {
+ $_SESSION['filters']['entity']['CLAUSE'] = "destination = '".$_SESSION['filters']['entity']['VALUE']."'";
+ } elseif ($_REQUEST['filter'] == 'entity_subentities') {
//$_SESSION['filters']['entity']['VALUE'] = '';
- if($_SESSION['filters']['entity_subentities']['checked'] == true){
-
+ if ($_SESSION['filters']['entity_subentities']['checked'] == true) {
$_SESSION['filters']['entity_subentities']['checked'] = false;
$_SESSION['filters']['entity_subentities']['VALUE'] = '';
$_SESSION['filters']['entity_subentities']['CLAUSE'] = '';
} else {
$_SESSION['filters']['entity']['CLAUSE'] = '';
- $_SESSION['filters']['entity_subentities']['checked'] = true;
+ $_SESSION['filters']['entity_subentities']['checked'] = true;
}
- require_once "modules" . DIRECTORY_SEPARATOR . "entities" . DIRECTORY_SEPARATOR
- . "class" . DIRECTORY_SEPARATOR . "class_manage_entities.php";
+ require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
$entities = new entity();
$subEntities_tmp = array();
@@ -749,282 +767,256 @@ abstract class lists_Abstract extends Database
$subEntities_tmp = $entities->getEntityChildrenTree($subEntities_tmp, $_SESSION['filters']['entity_subentities']['VALUE']);
- for($iSubEntities=0;$iSubEntities<count($subEntities_tmp);$iSubEntities++){
+ for ($iSubEntities = 0; $iSubEntities < count($subEntities_tmp); ++$iSubEntities) {
array_push($subEntities, "'".$subEntities_tmp[$iSubEntities]['ID']."'");
}
- array_push($subEntities, "'" . $_SESSION['filters']['entity_subentities']['VALUE'] . "'");
-
- $_SESSION['filters']['entity_subentities']['CLAUSE'] = "destination in (" . implode(",",$subEntities) . ")";
-
- } else if ($_REQUEST['filter'] == 'typist') {
-
- $_SESSION['filters']['typist']['CLAUSE'] = "typist = '".$_SESSION['filters']['typist']['VALUE']."'";
-
- } else if ($_REQUEST['filter'] == 'category') {
-
- $_SESSION['filters']['category']['CLAUSE'] = "category_id = '".$_SESSION['filters']['category']['VALUE']."'";
-
- } else if ($_REQUEST['filter'] == 'contact') {
-
- if(is_numeric($_SESSION['filters']['contact']['VALUE'])){
+ array_push($subEntities, "'".$_SESSION['filters']['entity_subentities']['VALUE']."'");
+
+ $_SESSION['filters']['entity_subentities']['CLAUSE'] = 'destination in ('.implode(',', $subEntities).')';
+ } elseif ($_REQUEST['filter'] == 'typist') {
+ $_SESSION['filters']['typist']['CLAUSE'] = "typist = '".$_SESSION['filters']['typist']['VALUE']."'";
+ } elseif ($_REQUEST['filter'] == 'category') {
+ $_SESSION['filters']['category']['CLAUSE'] = "category_id = '".$_SESSION['filters']['category']['VALUE']."'";
+ } elseif ($_REQUEST['filter'] == 'contact') {
+ if (is_numeric($_SESSION['filters']['contact']['VALUE'])) {
$_SESSION['filters']['contact']['CLAUSE'] = "(exp_contact_id = '".$_SESSION['filters']['contact']['VALUE']."' or dest_contact_id = '".$_SESSION['filters']['contact']['VALUE']."')";
} else {
$_SESSION['filters']['contact']['CLAUSE'] = "(exp_user_id = '".$_SESSION['filters']['contact']['VALUE']."' or dest_user_id = '".$_SESSION['filters']['contact']['VALUE']."')";
}
-
- } else if ($_REQUEST['filter'] == 'folder') {
-
- $folderId = $this->protect_string_db(str_replace(')', '',
- substr($_SESSION['filters']['folder']['VALUE'],
+ } elseif ($_REQUEST['filter'] == 'folder') {
+ $folderId = $this->protect_string_db(str_replace(')', '',
+ substr($_SESSION['filters']['folder']['VALUE'],
strrpos($_SESSION['filters']['folder']['VALUE'], '(') + 1)));
$_SESSION['filters']['folder']['CLAUSE'] = "folder_id = '".$folderId."'";
-
- } else if ($_REQUEST['filter'] == 'identifier') {
+ } elseif ($_REQUEST['filter'] == 'identifier') {
$_SESSION['filters']['identifier']['CLAUSE'] = "alt_identifier ilike ('%".$_SESSION['filters']['identifier']['VALUE']."%')";
-
- } else if ($_REQUEST['filter'] == 'type') {
-
+ } elseif ($_REQUEST['filter'] == 'type') {
$_SESSION['filters']['type']['CLAUSE'] = "type_id = '".$_SESSION['filters']['type']['VALUE']."'";
-
- } else if ($_REQUEST['filter'] == 'res_id') {
+ } elseif ($_REQUEST['filter'] == 'res_id') {
/*Permet de filtrer sur le res_id*/
- if(is_numeric($_SESSION['filters']['res_id']['VALUE'])){
+ if (is_numeric($_SESSION['filters']['res_id']['VALUE'])) {
$_SESSION['filters']['res_id']['CLAUSE'] = "res_id = '".$_SESSION['filters']['res_id']['VALUE']."'";
- }
- } else if ($_REQUEST['filter'] == 'subject') {
+ }
+ } elseif ($_REQUEST['filter'] == 'subject') {
/*Permet de filtrer sur le l'objet du courrier et si la valeur saisi est un numérique va rechercher sur le res_id*/
- $_SESSION['filters']['subject']['CLAUSE'] = "upper(subject) like '%".strtoupper($_SESSION['filters']['subject']['VALUE'])."%'";
- if(is_numeric($_SESSION['filters']['subject']['VALUE'])){
- $_SESSION['filters']['subject']['CLAUSE'] .= "or res_id = '".$_SESSION['filters']['subject']['VALUE']."'";
- }
- } else if ($_REQUEST['filter'] == 'isViewed') {
+ $_SESSION['filters']['subject']['CLAUSE'] = "upper(subject) like '%".strtoupper($_SESSION['filters']['subject']['VALUE'])."%'";
+ if (is_numeric($_SESSION['filters']['subject']['VALUE'])) {
+ $_SESSION['filters']['subject']['CLAUSE'] .= "or res_id = '".$_SESSION['filters']['subject']['VALUE']."'";
+ }
+ } elseif ($_REQUEST['filter'] == 'isViewed') {
if ($_SESSION['filters']['isViewed']['VALUE'] == 'yes') {
$_SESSION['filters']['isViewed']['CLAUSE'] = "res_id in (select res_id from listinstance WHERE coll_id = '".$_SESSION['collection_id_choice']."' and item_type = 'user_id' and item_id = '".$_SESSION['user']['UserId']."' and item_mode = 'cc' and viewed > 0)";
-
- } else if ($_SESSION['filters']['isViewed']['VALUE'] == 'no') {
+ } elseif ($_SESSION['filters']['isViewed']['VALUE'] == 'no') {
$_SESSION['filters']['isViewed']['CLAUSE'] = "res_id in (select res_id from listinstance WHERE coll_id = '".$_SESSION['collection_id_choice']."' and item_type = 'user_id' and item_id = '".$_SESSION['user']['UserId']."' and item_mode = 'cc' and viewed = 0 or viewed is null)";
}
-
- } else if ($_REQUEST['filter'] == 'user') {
-
- $userId = $this->protect_string_db(str_replace(')', '',
- substr($_SESSION['filters']['user']['VALUE'],
+ } elseif ($_REQUEST['filter'] == 'user') {
+ $userId = $this->protect_string_db(str_replace(')', '',
+ substr($_SESSION['filters']['user']['VALUE'],
strrpos($_SESSION['filters']['user']['VALUE'], '(') + 1)));
$_SESSION['filters']['user']['CLAUSE'] = $_SESSION['tablename']['users'].".user_id = '".$userId."'";
-
- } else if ($_REQUEST['filter'] == 'action') {
-
+ } elseif ($_REQUEST['filter'] == 'action') {
$_SESSION['filters']['action']['CLAUSE'] = "event_type = '".$_SESSION['filters']['action']['VALUE']."'";
-
- } else if ($_REQUEST['filter'] == 'history_action') {
-
+ } elseif ($_REQUEST['filter'] == 'history_action') {
$_SESSION['filters']['history_action']['CLAUSE'] = "event_type = '".$_SESSION['filters']['history_action']['VALUE']."'";
-
- } else if ($_REQUEST['filter'] == 'history_date_start' || $_REQUEST['filter'] == 'history_date_end') {
-
+ } elseif ($_REQUEST['filter'] == 'history_date_start' || $_REQUEST['filter'] == 'history_date_end') {
//Pattern
- $pattern = "/^[0-3][0-9]-[0-1][0-9]-[1-2][0-9][0-9][0-9]$/";
+ $pattern = '/^[0-3][0-9]-[0-1][0-9]-[1-2][0-9][0-9][0-9]$/';
//Keep the date
$history_date = array();
//date start
if (preg_match($pattern, $_SESSION['filters']['history_date_start']['VALUE']) == false) {
-
$_SESSION['error'] = _DATE.' '._WRONG_FORMAT;
} else {
-
$history_date['start'] = "(date(event_date) >= '"
.$_SESSION['filters']['history_date_start']['VALUE']."')";
}
//date end
if (preg_match($pattern, $_SESSION['filters']['history_date_end']['VALUE']) == false) {
-
$_SESSION['error'] = _DATE.' '._WRONG_FORMAT;
} else {
-
$history_date['end'] = "(date(event_date) <= '"
.$_SESSION['filters']['history_date_end']['VALUE']."')";
}
-
+
$_SESSION['filters']['history_date']['CLAUSE'] = join(' and ', $history_date);
- } else if ($_REQUEST['filter'] == 'creation_date_start' || $_REQUEST['filter'] == 'creation_date_end') {
-
+ } elseif ($_REQUEST['filter'] == 'creation_date_start' || $_REQUEST['filter'] == 'creation_date_end') {
//Pattern
- $pattern = "/^[0-3][0-9]-[0-1][0-9]-[1-2][0-9][0-9][0-9]$/";
+ $pattern = '/^[0-3][0-9]-[0-1][0-9]-[1-2][0-9][0-9][0-9]$/';
//Keep the date
$creation_date = array();
//date start
if (preg_match($pattern, $_SESSION['filters']['creation_date_start']['VALUE']) == false) {
-
$_SESSION['error'] = _DATE.' '._WRONG_FORMAT;
} else {
-
$creation_date['start'] = "(creation_date >= '"
.$_SESSION['filters']['creation_date_start']['VALUE']."')";
}
//date end
if (preg_match($pattern, $_SESSION['filters']['creation_date_end']['VALUE']) == false) {
-
$_SESSION['error'] = _DATE.' '._WRONG_FORMAT;
} else {
-
$creation_date['end'] = "(creation_date <= '"
.$_SESSION['filters']['creation_date_end']['VALUE']."')";
}
-
+
$_SESSION['filters']['creation_date']['CLAUSE'] = join(' and ', $creation_date);
- } else if($_REQUEST['filter'] == 'priority' && isset($_REQUEST['value'])) {
+ } elseif ($_REQUEST['filter'] == 'priority' && isset($_REQUEST['value'])) {
$_SESSION['filters']['priority']['CLAUSE'] = "priority = '".$_REQUEST['value']."'";
-
}
}
}
- }
-
+ }
}
-
- protected function _resetUrlTemplates() {
-
+
+ protected function _resetUrlTemplates()
+ {
unset($_SESSION['url_templates']);
$_SESSION['url_templates'] = array();
}
-
- protected function _getTemplates() {
+
+ protected function _getTemplates()
+ {
$templates = '';
-
+
//Check the selected template
-
-
+
//Show the templates
if (isset($this->params['templates']) && count($this->params['templates']) > 0) {
-
//Default list (no template)
if ($this->params['bool_showTemplateDefaultList'] === true) {
-
//Put none in template array
- if (!in_array('none', $this->params['templates'])) array_unshift($this->params['templates'], 'none');
+ if (!in_array('none', $this->params['templates'])) {
+ array_unshift($this->params['templates'], 'none');
+ }
} else {
-
//Unset none from template array
- if (isset($this->params['templates']['none'])) unset($this->params['templates']['none']);
+ if (isset($this->params['templates']['none'])) {
+ unset($this->params['templates']['none']);
+ }
}
- // $this->show_array($_SESSION['html_templates']);
-
- //Build templates icon and link
- for($i=0; $i < count($this->params['templates']); $i++) {
+ // $this->show_array($_SESSION['html_templates']);
+ //Build templates icon and link
+ for ($i = 0; $i < count($this->params['templates']); ++$i) {
//Template is defined?
if (isset($_SESSION['html_templates'][$this->params['templates'][$i]])) {
-
//Selected template
if ($this->template == $_SESSION['html_templates'][$this->params['templates'][$i]]['ID']) {
- $selected = 'color: #FBC110';
+ $selected = 'color: #FBC110';
} else {
$selected = '';
}
-
+
//Template link
- if (empty($_SESSION['url_templates'][$this->params['templates'][$i]])) {
-
+ if (empty($_SESSION['url_templates'][$this->params['templates'][$i]])) {
if (!empty($_SESSION['html_templates'][$this->params['templates'][$i]]['GOTOLIST'])) {
- //link from template parameters
- $_SESSION['url_templates'][$this->params['templates'][$i]] =
+ //link from template parameters
+ $_SESSION['url_templates'][$this->params['templates'][$i]] =
$_SESSION['html_templates'][$this->params['templates'][$i]]['GOTOLIST']
.'&template='.$_SESSION['html_templates'][$this->params['templates'][$i]]['ID'];
} else {
//
// $this->link = $this->_removeUrlVar($this->link, 'template');
- $_SESSION['url_templates'][$this->params['templates'][$i]] =
+ $_SESSION['url_templates'][$this->params['templates'][$i]] =
$this->link.'&template='.$_SESSION['html_templates'][$this->params['templates'][$i]]['ID'];
-
}
}
//Templates
$templates .= '<a href="javascript://" onClick="loadList(\''
- . $_SESSION['url_templates'][$this->params['templates'][$i]].'\', \''
- . $this->divListId.'\', '.$this->modeReturn.');" title="'
- . $_SESSION['html_templates'][$this->params['templates'][$i]]['LABEL'].'">'
- . '<i class="'
- . $_SESSION['html_templates'][$this->params['templates'][$i]]['IMG'] . '" title="'
- . $_SESSION['html_templates'][$this->params['templates'][$i]]['LABEL'] . '" '
- . 'style="vertical-align: middle;' . $selected . '"></i></a> ';
+ .$_SESSION['url_templates'][$this->params['templates'][$i]].'\', \''
+ .$this->divListId.'\', '.$this->modeReturn.');" title="'
+ .$_SESSION['html_templates'][$this->params['templates'][$i]]['LABEL'].'">'
+ .'<i class="'
+ .$_SESSION['html_templates'][$this->params['templates'][$i]]['IMG'].'" title="'
+ .$_SESSION['html_templates'][$this->params['templates'][$i]]['LABEL'].'" '
+ .'style="vertical-align: middle;'.$selected.'"></i></a> ';
}
}
}
-
+
// $this->show_array($_SESSION['url_templates']);
return $templates;
}
-
- protected function _loadTemplate($templateFile) {
+
+ protected function _loadTemplate($templateFile)
+ {
$templateContent = '';
-
+
//Get tge filecontent
- $templateContent = file_get_contents ($templateFile);
-
+ $templateContent = file_get_contents($templateFile);
+
//Delete all comments
- $templateContent = preg_replace("/(<!--.*?-->)/s","", $templateContent);
+ $templateContent = preg_replace('/(<!--.*?-->)/s', '', $templateContent);
return $templateContent;
}
-
- protected function _tmplt_defineLang($parameter) {
- $my_explode= explode ("|", $parameter);
+
+ protected function _tmplt_defineLang($parameter)
+ {
+ $my_explode = explode('|', $parameter);
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
- } else {
- if (defined($my_explode[1]) && constant($my_explode[1]) <> NULL)
+ } else {
+ if (defined($my_explode[1]) && constant($my_explode[1]) != null) {
return constant($my_explode[1]);
- else
+ } else {
return $my_explode[1];
+ }
}
}
-
- protected function _tmplt_sortColumn($parameter) {
- $my_explode= explode ("|", $parameter);
-
+ protected function _tmplt_sortColumn($parameter)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!isset($my_explode[1])) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
$column = $my_explode[1];
- ($this->order == 'desc' && (strpos($this->orderField, $column) !== false))? $sortImgDown = 'mCdarkOrange' : $sortImgDown = 'mCdarkBlue';
- ($this->order == 'asc' && (strpos($this->orderField, $column) !== false))? $sortImgUp = 'mCdarkOrange' : $sortImgUp = 'mCdarkBlue';
+ ($this->order == 'desc' && (strpos($this->orderField, $column) !== false)) ? $sortImgDown = 'mCdarkOrange' : $sortImgDown = 'mCdarkBlue';
+ ($this->order == 'asc' && (strpos($this->orderField, $column) !== false)) ? $sortImgUp = 'mCdarkOrange' : $sortImgUp = 'mCdarkBlue';
$return .= '<a href="javascript://" onClick="loadList(\''.$this->link
.'&order=desc&order_field='.$column.'\', \''.$this->divListId.'\', '.$this->modeReturn.');" title="'
- ._DESC_SORT.'"><i class="fa fa-angle-down fa-2x ' . $sortImgDown . '" title="'._DESC_SORT.'"></i></a>';
+ ._DESC_SORT.'"><i class="fa fa-angle-down fa-2x '.$sortImgDown.'" title="'._DESC_SORT.'"></i></a>';
$return .= '<a href="javascript://" onClick="loadList(\''.$this->link
.'&order=asc&order_field='.$column.'\', \''.$this->divListId.'\', '.$this->modeReturn.');" title="'
- ._ASC_SORT.'"><i class="fa fa-angle-up fa-2x ' . $sortImgUp . '" title="'._ASC_SORT.'"></i></a>';
+ ._ASC_SORT.'"><i class="fa fa-angle-up fa-2x '.$sortImgUp.'" title="'._ASC_SORT.'"></i></a>';
}
+
return $return;
}
-
- protected function _tmplt_cssLineReload() {
+
+ protected function _tmplt_cssLineReload()
+ {
//Get last css parameter defined for the result list
return $this->tmplt_CurrentCssLine;
}
-
- protected function _tmplt_cssLine($parameter) {
- $my_explode= explode ("|", $parameter);
+
+ protected function _tmplt_cssLine($parameter)
+ {
+ $my_explode = explode('|', $parameter);
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
//Treat
- if (count($my_explode) == 2 ) {
+ if (count($my_explode) == 2) {
return $my_explode[1];
- } else if (count($my_explode) == 3) {
- if ($this->tmplt_CurrentCssLine == '') {
+ } elseif (count($my_explode) == 3) {
+ if ($this->tmplt_CurrentCssLine == '') {
$this->tmplt_CurrentCssLine = $my_explode[1];
+
return $this->tmplt_CurrentCssLine;
- } else if ($this->tmplt_CurrentCssLine == $my_explode[1]) {
+ } elseif ($this->tmplt_CurrentCssLine == $my_explode[1]) {
$this->tmplt_CurrentCssLine = $my_explode[2];
+
return $this->tmplt_CurrentCssLine;
- } else if ($this->tmplt_CurrentCssLine == $my_explode[2]) {
+ } elseif ($this->tmplt_CurrentCssLine == $my_explode[2]) {
$this->tmplt_CurrentCssLine = $my_explode[1];
+
return $this->tmplt_CurrentCssLine;
} else {
return _WRONG_PARAM_FOR_LOAD_VALUE;
@@ -1034,44 +1026,43 @@ abstract class lists_Abstract extends Database
}
}
}
-
- protected function _tmplt_loadImage($parameter) {
-
- $my_explode= explode ("|", $parameter);
-
+
+ protected function _tmplt_loadImage($parameter)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
- if (count($my_explode) == 2 ) {
- return '<i class="fa fa-' . $my_explode[1] . '"></i>';
- } else if (count($my_explode) >= 3) {
- return '<i class="fa fa-' . $my_explode[1] . '"></i>';
+ if (count($my_explode) == 2) {
+ return '<i class="fa fa-'.$my_explode[1].'"></i>';
+ } elseif (count($my_explode) >= 3) {
+ return '<i class="fa fa-'.$my_explode[1].'"></i>';
} else {
return _WRONG_PARAM_FOR_LOAD_VALUE;
}
}
}
-
- protected function _tmplt_loadValue($parameter, $resultTheLine) {
-
- $my_explode= explode ("|", $parameter);
-
- if (!$my_explode[1]){
+
+ protected function _tmplt_loadValue($parameter, $resultTheLine)
+ {
+ $my_explode = explode('|', $parameter);
+
+ if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
-
$column = $my_explode[1];
- for($i= 0; $i <= count($resultTheLine); $i++ ) {
- if($resultTheLine[$i]['column'] == $column) {
-
- if(is_bool($resultTheLine[$i]['value'])) {
+ for ($i = 0; $i <= count($resultTheLine); ++$i) {
+ if ($resultTheLine[$i]['column'] == $column) {
+ if (is_bool($resultTheLine[$i]['value'])) {
//If boolean (convert to string)
- if ($resultTheLine[$i]['value'])
- return "true";
- else
- return "false";
+ if ($resultTheLine[$i]['value']) {
+ return 'true';
+ } else {
+ return 'false';
+ }
} else {
- if($resultTheLine[$i]['column']=='subject'){
+ if ($resultTheLine[$i]['column'] == 'subject') {
return preg_replace('/\s+/', ' ', $resultTheLine[$i]['value']);
} else {
return $resultTheLine[$i]['value'];
@@ -1081,39 +1072,38 @@ abstract class lists_Abstract extends Database
}
}
}
-
- protected function _tmplt_showSmallToolbar () {
-
+
+ protected function _tmplt_showSmallToolbar()
+ {
$this->params['bool_showSmallToolbar'] = true;
-
+
return $this->_createSmallToolbar();
}
-
- protected function _tmplt_checkBox($resultTheLine, $listKey, $lineIsDisabled) {
-
+
+ protected function _tmplt_checkBox($resultTheLine, $listKey, $lineIsDisabled)
+ {
//Get the ListKey value
$keyValue = '';
- for($i= 0; $i <= count($resultTheLine); $i++ ) {
- if($resultTheLine[$i]['column'] == $listKey) {
+ for ($i = 0; $i <= count($resultTheLine); ++$i) {
+ if ($resultTheLine[$i]['column'] == $listKey) {
$keyValue = $resultTheLine[$i]['value'];
}
}
-
- //If checkbox is activated (is it important if template???)
- if ($this->params['bool_checkBox'] === true) {
- if($_SESSION['stockCheckbox'] != null){
+ //If checkbox is activated (is it important if template???)
+ if ($this->params['bool_checkBox'] === true) {
+ if ($_SESSION['stockCheckbox'] != null) {
$key = in_array($keyValue, $_SESSION['stockCheckbox']);
-
+
//If disable or checkbox
- if($key == true){
+ if ($key == true) {
if ($lineIsDisabled === true || empty($keyValue)) {
$return .= '<div align="center"><i class="fa fa-lock fa-2x" title="'._LOCKED.'"></i></div>';
} else {
$return .= '<div align="center"><input type="checkbox" checked="yes" name="field[]" id="field" class="check" onclick="stockCheckbox(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=multiLink\','.$keyValue.');" value="'
.$keyValue.'" /></div>';
}
- }else{
+ } else {
if ($lineIsDisabled === true || empty($keyValue)) {
$return .= '<div align="center"><i class="fa fa-lock fa-2x" title="'._LOCKED.'"></i></div>';
} else {
@@ -1121,8 +1111,7 @@ abstract class lists_Abstract extends Database
.$keyValue.'" /></div>';
}
}
- } else {
-
+ } else {
//If disable or checkbox
if ($lineIsDisabled === true || empty($keyValue)) {
$return .= '<div align="center"><i class="fa fa-lock fa-2x" title="'._LOCKED.'"></i></div>';
@@ -1130,30 +1119,28 @@ abstract class lists_Abstract extends Database
$return .= '<div align="center"><input type="checkbox" name="field[]" id="field" class="check" onclick="stockCheckbox(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=multiLink\','.$keyValue.');" value="'
.$keyValue.'" /></div>';
}
-
}
-
}
+
return $return;
}
-
- protected function _tmplt_checkUncheckAll() {
-
+
+ protected function _tmplt_checkUncheckAll()
+ {
//If checkbox is activated
if ($this->params['bool_checkBox'] === true) {
-
return '<input type="checkbox" id="checkUncheck" name="checkUncheck" value="" onclick="CheckUncheckAll(this);">';
}
}
-
- protected function _tmplt_radioButton($resultTheLine, $listKey, $lineIsDisabled) {
-
+
+ protected function _tmplt_radioButton($resultTheLine, $listKey, $lineIsDisabled)
+ {
$return = '';
-
+
//Get the ListKey value
- $keyValue = '';
- for($i= 0; $i <= count($resultTheLine); $i++ ) {
- if($resultTheLine[$i]['column'] == $listKey) {
+ $keyValue = '';
+ for ($i = 0; $i <= count($resultTheLine); ++$i) {
+ if ($resultTheLine[$i]['column'] == $listKey) {
$keyValue = $resultTheLine[$i]['value'];
}
}
@@ -1166,92 +1153,94 @@ abstract class lists_Abstract extends Database
$return .= '<div align="center"><input type="radio" name="field" id="field" class="check" value="'
.$keyValue.'" /></div>';
}
- }
+ }
+
return $return;
}
-
- protected function _tmplt_showIconProcessDocument($resultTheLine, $listKey) {
-
+
+ protected function _tmplt_showIconProcessDocument($resultTheLine, $listKey)
+ {
$return = '';
//Show document icon
$href = $this->_buildMyLink('index.php?page=view_baskets&module=basket&baskets=MyBasket&directLinkToAction', $resultTheLine, $listKey);
$return .= '<div align="center"><a href="'.$href.'" target="_blank" title="'
._PROCESS.'"><i class="fa fa-gear fa-2x" title="'._PROCESS.'"></i></a></div>';
-
+
return $return;
}
-
- protected function _tmplt_showIconDocument($resultTheLine, $listKey) {
+
+ protected function _tmplt_showIconDocument($resultTheLine, $listKey)
+ {
$core = new core_tools();
$return = '';
//Show document icon
- foreach($resultTheLine as $r){
- if (isset($r['res_id'])) {
- $res_id = $r['res_id'];
- break;
- }
- }
+ foreach ($resultTheLine as $r) {
+ if (isset($r['res_id'])) {
+ $res_id = $r['res_id'];
+ break;
+ }
+ }
$isAttachment = false;
- foreach($resultTheLine as $r){
+ foreach ($resultTheLine as $r) {
if ($r['column'] === 'attachment_type') {
$isAttachment = true;
break;
}
}
-
+
$href = $this->_buildMyLink($this->params['viewDocumentLink'], $resultTheLine, $listKey);
- if ($core->is_module_loaded('thumbnails') === true && !$isAttachment){
- $return .= '<div align="center" class="iconDoc" onmouseover="showThumb(\'thumb_\',\'' . $res_id . '\', \'letterbox_coll\')"><a href="'.$href.'" target="_blank" title="'
- ._VIEW_DOC.'"><i class="tooltip fa fa-download fa-2x" title="' . _VISUALIZE . '"></i><span id="thumb_' . $res_id . '" name="thumb_' . $res_id . '"></span></a></div>';
- }
- else $return .= '<div align="right" class="iconDoc" style="" ><a href="'.$href.'" target="_blank" title="'
- ._VIEW_DOC.'"><i class="tooltip fa fa-download fa-2x" title="' ._VISUALIZE . '"></i></a></div>';
-
+ if ($core->is_module_loaded('thumbnails') === true && !$isAttachment) {
+ $return .= '<div align="center" class="iconDoc" onmouseover="showThumb(\'thumb_\',\''.$res_id.'\', \'letterbox_coll\')"><a href="'.$href.'" target="_blank" title="'
+ ._VIEW_DOC.'"><i class="tooltip fa fa-download fa-2x" title="'._VISUALIZE.'"></i><span id="thumb_'.$res_id.'" name="thumb_'.$res_id.'"></span></a></div>';
+ } else {
+ $return .= '<div align="right" class="iconDoc" style="" ><a href="'.$href.'" target="_blank" title="'
+ ._VIEW_DOC.'"><i class="tooltip fa fa-download fa-2x" title="'._VISUALIZE.'"></i></a></div>';
+ }
+
return $return;
}
- protected function _tmplt_visualizeIconDocument($resultTheLine, $listKey) {
-
+ protected function _tmplt_visualizeIconDocument($resultTheLine, $listKey)
+ {
$href = $this->_buildMyLink($this->params['visualizeDocumentLink'], $resultTheLine, $listKey);
- $return .= '<div align="right" class="iconDoc" style="" ><a href="'.$href.'" target="_blank"><i class="tooltip fa fa-eye fa-2x" title="' . _VISUALIZE . '"></i></a></div>';
-
+ $return .= '<div align="right" class="iconDoc" style="" ><a href="'.$href.'" target="_blank"><i class="tooltip fa fa-eye fa-2x" title="'._VISUALIZE.'"></i></a></div>';
+
return $return;
}
- protected function _tmplt_downloadIconDocument($resultTheLine, $listKey) {
-
+ protected function _tmplt_downloadIconDocument($resultTheLine, $listKey)
+ {
$href = $this->_buildMyLink($this->params['downloadDocumentLink'], $resultTheLine, $listKey);
- $return .= '<div align="right" class="iconDoc" style="" ><a href="'.$href.'" target="_blank"><i class="tooltip fa fa-download fa-2x" title="' . _DOWNLOAD . '"></i></a></div>';
-
+ $return .= '<div align="right" class="iconDoc" style="" ><a href="'.$href.'" target="_blank"><i class="tooltip fa fa-download fa-2x" title="'._DOWNLOAD.'"></i></a></div>';
+
return $return;
}
- protected function _tmplt_showIconDetails($resultTheLine, $listKey) {
-
+ protected function _tmplt_showIconDetails($resultTheLine, $listKey)
+ {
$return = '';
//Show details button
- $href = $this->_buildMyLink($this->params['viewDetailsLink'], $resultTheLine, $listKey);
- $return .= '<div align="center"><a href="javascript://" onClick="javascript:window.top.location=\''
- .$href.'\'; return false;" title="'._DETAILS.'"><i class="fa fa-info-circle fa-2x" title="' . _DETAILS . '"></i></a></div>';
+ $href = $this->_buildMyLink($this->params['viewDetailsLink'], $resultTheLine, $listKey);
+ $return .= '<div align="center"><a href="javascript://" onClick="javascript:window.top.location=\''
+ .$href.'\'; return false;" title="'._DETAILS.'"><i class="fa fa-info-circle fa-2x" title="'._DETAILS.'"></i></a></div>';
-
return $return;
}
-
- protected function _tmplt_showActionIcon($parameter, $resultTheLine) {
-
- $my_explode= explode ("|", $parameter);
-
+
+ protected function _tmplt_showActionIcon($parameter, $resultTheLine)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
- if (count($my_explode) >= 4 ) {
+ if (count($my_explode) >= 4) {
//Init
$actionIsDisabled = false;
-
+
//Check if action is disabled
if (isset($my_explode[4]) && !empty($my_explode[4])) {
$actionIsDisabled = $this->_checkDisabledRules($my_explode[4], $resultTheLine);
@@ -1271,16 +1260,17 @@ abstract class lists_Abstract extends Database
}
}
- protected function _tmplt_showActionFA($parameter, $resultTheLine) {
- $my_explode= explode ("|", $parameter);
-
+ protected function _tmplt_showActionFA($parameter, $resultTheLine)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
- if (count($my_explode) >= 4 ) {
+ if (count($my_explode) >= 4) {
//Init
$actionIsDisabled = false;
-
+
//Check if action is disabled
if (isset($my_explode[4]) && !empty($my_explode[4])) {
$actionIsDisabled = $this->_checkDisabledRules($my_explode[4], $resultTheLine);
@@ -1291,8 +1281,8 @@ abstract class lists_Abstract extends Database
} else {
//return action icon
return '<a href="javascript://" onClick="'.$my_explode[3]
- .'" title="'.$my_explode[1].'"><i class="fa fa-'
- . $my_explode[2] . ' fa-2x" title="' . $my_explode[1] . '"></i></a>';
+ .'" title="'.$my_explode[1].'"><i class="fa fa-'
+ .$my_explode[2].' fa-2x" title="'.$my_explode[1].'"></i></a>';
}
} else {
return _WRONG_PARAM_FOR_LOAD_VALUE;
@@ -1300,13 +1290,14 @@ abstract class lists_Abstract extends Database
}
}
- protected function _tmplt_showActionBasketsFA($parameter, $resultTheLine) {
- $my_explode= explode ("|", $parameter);
+ protected function _tmplt_showActionBasketsFA($parameter, $resultTheLine)
+ {
+ $my_explode = explode('|', $parameter);
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
- if (count($my_explode) >= 4 ) {
+ if (count($my_explode) >= 4) {
//Init
$actionIsDisabled = false;
@@ -1328,7 +1319,7 @@ abstract class lists_Abstract extends Database
//return action icon
return '<a href="javascript://" onClick="'.$my_explode[3]
.'" title="'.$my_explode[1].'"><i class="fa fa-'
- . $my_explode[2] . ' fa-2x" '. $color .' title="' . $my_explode[1] . '"></i></a>';
+ .$my_explode[2].' fa-2x" '.$color.' title="'.$my_explode[1].'"></i></a>';
}
} else {
return _WRONG_PARAM_FOR_LOAD_VALUE;
@@ -1336,40 +1327,40 @@ abstract class lists_Abstract extends Database
}
}
- protected function _tmplt_func_isConfidential($resultTheLine) {
-
- $db = new Database();
- $stmt = $db->query("SELECT confidentiality FROM res_letterbox WHERE res_id = ?",
+ protected function _tmplt_func_isConfidential($resultTheLine)
+ {
+ $db = new Database();
+ $stmt = $db->query('SELECT confidentiality FROM res_letterbox WHERE res_id = ?',
[$resultTheLine[0]['res_id']]);
- $color = '';
- $result = $stmt->fetchObject();
- if ($result->confidentiality == 'Y') {
- return '<span style="position: absolute;transform: rotate(-20deg);color: red;-ms-transform: rotate(7deg);-webkit-transform: rotate(7deg);font-weight: bold;margin-left:-80px;margin-top:10px;">'.strtoupper (_CONFIDENTIAL).'</span>';
- }
-
+ $color = '';
+ $result = $stmt->fetchObject();
+ if ($result->confidentiality == 'Y') {
+ return '<span style="position: absolute;transform: rotate(-20deg);color: red;-ms-transform: rotate(7deg);-webkit-transform: rotate(7deg);font-weight: bold;margin-left:-80px;margin-top:10px;">'.strtoupper(_CONFIDENTIAL).'</span>';
+ }
}
- protected function _tmplt_func_load_case_status($resultTheLine) {
- $db = new Database();
- $stmt = $db->query("SELECT count(*) as total FROM cases WHERE case_closing_date is not NULL and case_id = ?",
+ protected function _tmplt_func_load_case_status($resultTheLine)
+ {
+ $db = new Database();
+ $stmt = $db->query('SELECT count(*) as total FROM cases WHERE case_closing_date is not NULL and case_id = ?',
[$resultTheLine[0]['case_id']]);
- $result = $stmt->fetchObject();
- if($result->total > 0){
- return '<i class="fa fa-briefcase fa-2x" title="'._CLOSED.'"><sup> <i class="fa fa-lock" aria-hidden="true" style="color:red;font-size:10px;"></i></sup></i>';
- }else{
- return '<i class="fa fa-briefcase fa-2x"></i>';
- }
- var_dump($resultTheLine[0]);
-
+ $result = $stmt->fetchObject();
+ if ($result->total > 0) {
+ return '<i class="fa fa-briefcase fa-2x" title="'._CLOSED.'"><sup> <i class="fa fa-lock" aria-hidden="true" style="color:red;font-size:10px;"></i></sup></i>';
+ } else {
+ return '<i class="fa fa-briefcase fa-2x"></i>';
+ }
+ var_dump($resultTheLine[0]);
}
- protected function _tmplt_showActionAdvResultFA($parameter, $resultTheLine) {
- $my_explode= explode ("|", $parameter);
+ protected function _tmplt_showActionAdvResultFA($parameter, $resultTheLine)
+ {
+ $my_explode = explode('|', $parameter);
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
- if (count($my_explode) >= 4 ) {
+ if (count($my_explode) >= 4) {
//Init
$actionIsDisabled = false;
@@ -1385,102 +1376,100 @@ abstract class lists_Abstract extends Database
$color = '';
if (!empty($_SESSION['fullTextAttachments']['letterbox']) &&
in_array($resultTheLine[0]['res_id'], $_SESSION['fullTextAttachments']['letterbox'])) {
- $color = 'style="color: #009dc5;"';
+ $color = 'style="color: #135F7F;"';
}
$db = new Database();
$stmt = $db->query(
- "SELECT count(*) as total FROM res_view_attachments WHERE res_id_master = ? and status not in ('DEL','OBS','TMP') and lower(translate(title,'ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖØÙÚÛÜÃÞßà áâãäåæçèéêëìÃîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')) like lower(?)", array($resultTheLine[0]['res_id'],$_SESSION['searching']['where_request_parameters'][':subject'])
+ "SELECT count(*) as total FROM res_view_attachments WHERE res_id_master = ? and status not in ('DEL','OBS','TMP') and lower(translate(title,'ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖØÙÚÛÜÃÞßà áâãäåæçèéêëìÃîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')) like lower(?)", array($resultTheLine[0]['res_id'], $_SESSION['searching']['where_request_parameters'][':subject'])
);
$res_attach = $stmt->fetchObject();
- if($res_attach->total > 0){
- $color = 'style="color: #009dc5;"';
+ if ($res_attach->total > 0) {
+ $color = 'style="color: #135F7F;"';
}
+
return '<a href="javascript://" onClick="'.$my_explode[3]
.'" title="'.$my_explode[1].'"><i class="fa fa-'
- . $my_explode[2] . ' fa-2x" '. $color .' title="' . $my_explode[1] . '"></i></a>';
-
+ .$my_explode[2].' fa-2x" '.$color.' title="'.$my_explode[1].'"></i></a>';
}
-
} else {
return _WRONG_PARAM_FOR_LOAD_VALUE;
}
}
}
-
- protected function _tmplt_clickOnLine($resultTheLine, $listKey, $lineIsDisabled) {
-
+
+ protected function _tmplt_clickOnLine($resultTheLine, $listKey, $lineIsDisabled)
+ {
$return = '';
-
+
//If there is action on line click
- if($this->params['bool_actionOnLineClick'] &&
- isset($this->params['defaultAction']) && !empty($this->params['defaultAction']) &&
+ if ($this->params['bool_actionOnLineClick'] &&
+ isset($this->params['defaultAction']) && !empty($this->params['defaultAction']) &&
$lineIsDisabled === false
) {
//Get the ListKey value
$keyValue = '';
- for($i= 0; $i <= count($resultTheLine); $i++ ) {
- if($resultTheLine[$i]['column'] == $listKey) {
+ for ($i = 0; $i <= count($resultTheLine); ++$i) {
+ if ($resultTheLine[$i]['column'] == $listKey) {
$keyValue = $resultTheLine[$i]['value'];
}
}
$sAction = \Action\models\ActionModel::getActionPageById(['id' => $this->params['defaultAction']]);
if ($sAction == 'visa_mail') {
- $return = 'onmouseover="this.style.cursor=\'pointer\';" onClick="islockForSignatureBook(\'' .$keyValue. '\', \'' .$_SESSION['current_basket']['id']. '\', \'' .$_SESSION['current_basket']['group_id']. '\')"';
+ $return = 'onmouseover="this.style.cursor=\'pointer\';" onClick="islockForSignatureBook(\''.$keyValue.'\', \''.$_SESSION['current_basket']['id'].'\', \''.$_SESSION['current_basket']['group_id'].'\')"';
} else {
$return = 'onmouseover="this.style.cursor=\'pointer\';" onClick="validForm( \'page\', \''.$keyValue.'\', \''.$this->params['defaultAction'].'\');" ';
}
}
-
- return $return;
+
+ return $return;
}
-
- protected function _tmplt_includeFile($parameter) {
- $my_explode= explode ("|", $parameter);
-
- if (!$my_explode[1]){
+ protected function _tmplt_includeFile($parameter)
+ {
+ $my_explode = explode('|', $parameter);
+
+ if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
//File
$file = $my_explode[1];
-
+
if (count($my_explode) == 3 && isset($my_explode[2]) && !empty($my_explode[2])) {
$module = $my_explode[2];
- include "modules".DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.$file;
+ include 'modules'.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.$file;
} else {
- include "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.$file;
+ include 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.$file;
}
}
}
-
- protected function _tmplt_getBusinessAppUrl() {
-
+
+ protected function _tmplt_getBusinessAppUrl()
+ {
return $_SESSION['config']['businessappurl'];
}
-
- protected function _tmplt_getListParameter($parameter) {
-
- $my_explode= explode ("|", $parameter);
-
+
+ protected function _tmplt_getListParameter($parameter)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
-
return $this->params[$my_explode[1]];
}
}
-
- protected function _tmplt_setListParameter($parameter) {
-
- $my_explode= explode ("|", $parameter);
-
+
+ protected function _tmplt_setListParameter($parameter)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
if (count($my_explode) == 3) {
if ($my_explode[2] == 'true') {
$this->params[$my_explode[1]] = true;
- } else if ($my_explode[2] == 'false') {
+ } elseif ($my_explode[2] == 'false') {
$this->params[$my_explode[1]] = false;
} else {
$this->params[$my_explode[1]] = $my_explode[2];
@@ -1491,108 +1480,106 @@ abstract class lists_Abstract extends Database
}
}
- protected function _tmplt_ifStatement($parameter) {
-
- $my_explode= explode ("|", $parameter);
-
+ protected function _tmplt_ifStatement($parameter)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
if (count($my_explode) >= 4) {
-
$condition = "return($my_explode[1]);";
// $debug .='condition: '.$condition."<br>";
- if(@eval($condition)) {
+ if (@eval($condition)) {
return $my_explode[2];
} else {
return $my_explode[3];
}
-
} else {
return _WRONG_PARAM_FOR_LOAD_VALUE;
}
}
}
-
- protected function _tmplt_isModuleLoaded($parameter) {
-
- $my_explode= explode ("|", $parameter);
-
+
+ protected function _tmplt_isModuleLoaded($parameter)
+ {
+ $my_explode = explode('|', $parameter);
+
if (!$my_explode[1]) {
return _WRONG_PARAM_FOR_LOAD_VALUE;
} else {
$core_tools = new core_tools();
- if($core_tools->is_module_loaded($my_explode[1]) === true) {
- return "true";
+ if ($core_tools->is_module_loaded($my_explode[1]) === true) {
+ return 'true';
} else {
- return "false";
+ return 'false';
}
}
}
- public function tmplt_func_bool_see_notes($resultTheLine)
+ public function tmplt_func_bool_see_notes($resultTheLine)
{
$return = '';
if ($resultTheLine[0]['hasNotes'] || $resultTheLine[1]['hasNotes']) {
- $return .= '<i class="fa fa-pencil fa-2x" style="cursor: pointer;" title="' . _NOTES . '" onclick="loadNoteList(' . $resultTheLine[0]['value'] . ');"></i>';
+ $return .= '<i class="fa fa-pencil fa-2x" style="cursor: pointer;" title="'._NOTES.'" onclick="loadNoteList('.$resultTheLine[0]['value'].');"></i>';
}
+
return $return;
}
public function tmplt_func_delete($resultTheLine)
{
- $return = "";
+ $return = '';
$nbresult_I = count($resultTheLine);
- for($iresults=0;$iresults<$nbresult_I;$iresults++){
- if($resultTheLine[$iresults]['typist_id']){
+ for ($iresults = 0; $iresults < $nbresult_I; ++$iresults) {
+ if ($resultTheLine[$iresults]['typist_id']) {
$typist = $resultTheLine[$iresults]['typist_id'];
}
- if($resultTheLine[$iresults]['fromDetail']){
+ if ($resultTheLine[$iresults]['fromDetail']) {
$fromDetail = $resultTheLine[$iresults]['fromDetail'];
}
}
$core_tools = new core_tools();
if ($core_tools->test_service('delete_attachments', 'attachments', false) || $typist == $_SESSION['user']['UserId']) {
- $return = '<a href="' . $_SESSION['config']['businessappurl'] . 'index.php?display=true'
- . '&module=attachments&page=del_attachment&relation=' . $resultTheLine[1]['value'] . '&id=' . $resultTheLine[0]['value'].'&fromDetail='.$fromDetail.'"'
- . 'onclick="return(confirm(\'' . _REALLY_DELETE . ' ?\n\r\n\r'
- . _DEFINITIVE_ACTION . '\'));"><i class="tooltip fa fa-trash-o fa-2x visaPjDel" style="color:white;font-size: 21px;padding-right: 12px;padding-bottom: 12px;padding-top:11px;margin-right:10px;" title="'._DELETE.'"></i></a>';
-
- }else{
+ $return = '<a href="'.$_SESSION['config']['businessappurl'].'index.php?display=true'
+ .'&module=attachments&page=del_attachment&relation='.$resultTheLine[1]['value'].'&id='.$resultTheLine[0]['value'].'&fromDetail='.$fromDetail.'"'
+ .'onclick="return(confirm(\''._REALLY_DELETE.' ?\n\r\n\r'
+ ._DEFINITIVE_ACTION.'\'));"><i class="tooltip fa fa-trash-o fa-2x visaPjDel" style="color:white;font-size: 21px;padding-right: 12px;padding-bottom: 12px;padding-top:11px;margin-right:10px;" title="'._DELETE.'"></i></a>';
+ } else {
$return = '<a href="" class="delete" style="visibility:hidden;"><i class="tooltip fa fa-trash-o fa-2x" title="'._DELETE.'"></i></a>';
}
$return .= '<script>titleWithTooltipsterClass("tooltip");</script>';
+
return $return;
}
public function tmplt_func_modify($resultTheLine)
{
- $return = "";
+ $return = '';
$nbresult_I = count($resultTheLine);
- for($iresults=0;$iresults<$nbresult_I;$iresults++){
- if($resultTheLine[$iresults]['typist_id']){
+ for ($iresults = 0; $iresults < $nbresult_I; ++$iresults) {
+ if ($resultTheLine[$iresults]['typist_id']) {
$typist = $resultTheLine[$iresults]['typist_id'];
}
- if($resultTheLine[$iresults]['relation']){
+ if ($resultTheLine[$iresults]['relation']) {
$relation = $resultTheLine[$iresults]['relation'];
}
- if($resultTheLine[$iresults]['fromDetail']){
+ if ($resultTheLine[$iresults]['fromDetail']) {
$fromDetail = $resultTheLine[$iresults]['fromDetail'];
}
- if($resultTheLine[$iresults]['value_bis']){
+ if ($resultTheLine[$iresults]['value_bis']) {
$status = $resultTheLine[$iresults]['value_bis'];
}
}
$core_tools = new core_tools();
- if (($core_tools->test_service('modify_attachments', 'attachments', false) || $typist == $_SESSION['user']['UserId']) && $status <> "TRA") {
- $return = '<i style="font-size: 21px;padding-bottom: 11px;padding-left: 13px;margin-right:10px;padding-top:12px" class="tooltip fa fa-pencil-square-o fa-2x visaPjUp" title="'._MODIFY.'" onclick="modifyAttachmentsForm(\'' . $_SESSION['config']['businessappurl']
- . 'index.php?display=true&module=attachments&page=attachments_content&id=' . $resultTheLine[0]['value'] . '&relation='.$relation.'&fromDetail='.$fromDetail.'\',\'98%\',\'auto\');"></i>';
-
- }else{
+ if (($core_tools->test_service('modify_attachments', 'attachments', false) || $typist == $_SESSION['user']['UserId']) && $status != 'TRA') {
+ $return = '<i style="font-size: 21px;padding-bottom: 11px;padding-left: 13px;margin-right:10px;padding-top:12px" class="tooltip fa fa-pencil-square-o fa-2x visaPjUp" title="'._MODIFY.'" onclick="modifyAttachmentsForm(\''.$_SESSION['config']['businessappurl']
+ .'index.php?display=true&module=attachments&page=attachments_content&id='.$resultTheLine[0]['value'].'&relation='.$relation.'&fromDetail='.$fromDetail.'\',\'98%\',\'auto\');"></i>';
+ } else {
$return = '<a href="javascript://" disabled="disabled" class="change" style="visibility:hidden;">
<i class="tooltip fa fa-pencil-square-o fa-2x" title="'._MODIFY.'"></i></a>';
}
@@ -1602,11 +1589,11 @@ abstract class lists_Abstract extends Database
public function tmplt_func_previous_version($resultTheLine)
{
- $return = "";
- if ((int)$resultTheLine[1]['value'] > 1) {
- $return .= '<i class="fa fa-file" onclick="showPreviousAttachments(\'' . $_SESSION['config']['businessappurl']
- . 'index.php?display=true&module=attachments&page=previous_attachments\',\''
- . $resultTheLine[0]['value'] . '\');" style="cursor: pointer;" title="'._SHOW_PREVIOUS_VERSION.'" ></i>';
+ $return = '';
+ if ((int) $resultTheLine[1]['value'] > 1) {
+ $return .= '<i class="fa fa-file" onclick="showPreviousAttachments(\''.$_SESSION['config']['businessappurl']
+ .'index.php?display=true&module=attachments&page=previous_attachments\',\''
+ .$resultTheLine[0]['value'].'\');" style="cursor: pointer;" title="'._SHOW_PREVIOUS_VERSION.'" ></i>';
}
return $return;
@@ -1614,7 +1601,7 @@ abstract class lists_Abstract extends Database
public function tmplt_func_final_version($resultTheLine)
{
- foreach ($resultTheLine as $value){
+ foreach ($resultTheLine as $value) {
if ($value['column'] == 'in_signature_book') {
$inSignatureBook = $value['value'];
}
@@ -1630,28 +1617,28 @@ abstract class lists_Abstract extends Database
if ($resultTheLine[1]['value'] > 1) {
$isVersion = 'true';
}
- $return .= 'onclick="setAttachmentInSignatureBook(' . $resultTheLine[0]['value'] . ', ' . $isVersion . ');"/>Intégrer au parapheur';
+ $return .= 'onclick="setAttachmentInSignatureBook('.$resultTheLine[0]['value'].', '.$isVersion.');"/>Intégrer au parapheur';
return $return;
}
-
- public function tmplt_func_bool_see_multi_contacts($resultTheLine)
+
+ public function tmplt_func_bool_see_multi_contacts($resultTheLine)
{
$return = '';
- $nbresult_I = count($resultTheLine);
-
- for($iresults=0;$iresults<$nbresult_I;$iresults++){
- if($resultTheLine[$iresults]['is_multi_contacts']){
- $isMultiContacts = $resultTheLine[$iresults]['is_multi_contacts'];
- }
- if($resultTheLine[$iresults]['res_multi_contacts']){
- $resMultiContacts = $resultTheLine[$iresults]['res_multi_contacts'];
- }
- }
-
+ $nbresult_I = count($resultTheLine);
+
+ for ($iresults = 0; $iresults < $nbresult_I; ++$iresults) {
+ if ($resultTheLine[$iresults]['is_multi_contacts']) {
+ $isMultiContacts = $resultTheLine[$iresults]['is_multi_contacts'];
+ }
+ if ($resultTheLine[$iresults]['res_multi_contacts']) {
+ $resMultiContacts = $resultTheLine[$iresults]['res_multi_contacts'];
+ }
+ }
+
if ($isMultiContacts == 'Y') {
- $return .= '<i class="fa fa-book fa-2x" style="cursor: pointer;" title="'
- . _VIEW_CONTACTS . '"onclick="loadContactsList(' . $resMultiContacts . ');" ></i>';
+ $return .= '<i class="fa fa-book fa-2x" style="cursor: pointer;" title="'
+ ._VIEW_CONTACTS.'"onclick="loadContactsList('.$resMultiContacts.');" ></i>';
}
return $return;
@@ -1659,44 +1646,44 @@ abstract class lists_Abstract extends Database
public function tmplt_func_cadenas($parameter)
{
- $my_explode= explode ("|", $parameter);
- $now = date("Y-m-d H:i:s");
- $my_explode[2] = str_replace("'","",$my_explode[2]);
- $my_explode[1] = str_replace("'","",$my_explode[1]);
+ $my_explode = explode('|', $parameter);
+ $now = date('Y-m-d H:i:s');
+ $my_explode[2] = str_replace("'", '', $my_explode[2]);
+ $my_explode[1] = str_replace("'", '', $my_explode[1]);
if (!isset($my_explode[2])) {
return '';
- } else if ($my_explode[2] == null || $my_explode[2] == '' || empty($my_explode[2])) {
+ } elseif ($my_explode[2] == null || $my_explode[2] == '' || empty($my_explode[2])) {
return '';
- } else if ($my_explode[1] == $_SESSION['user']['UserId'] ) {
+ } elseif ($my_explode[1] == $_SESSION['user']['UserId']) {
return '';
- } else if ($my_explode[2] > $now ) {
+ } elseif ($my_explode[2] > $now) {
return '<i class="fa fa-lock fa-2x"></i>';
} else {
return '';
}
}
- public function tmplt_showDefaultAction($parameter)
+ public function tmplt_showDefaultAction($parameter)
{
$db = new Database();
- if($_SESSION['current_basket']['default_action'] != ""){
- //Load action name
- $stmt = $db->query(
- "SELECT label_action FROM actions WHERE id = ?", array($_SESSION['current_basket']['default_action'])
+ if ($_SESSION['current_basket']['default_action'] != '') {
+ //Load action name
+ $stmt = $db->query(
+ 'SELECT label_action FROM actions WHERE id = ?', array($_SESSION['current_basket']['default_action'])
);
- $res = $stmt->fetchObject();
+ $res = $stmt->fetchObject();
- return $res->label_action;
+ return $res->label_action;
}
}
-
- public function tmplt_nbNoteAvis($parameter)
+
+ public function tmplt_nbNoteAvis($parameter)
{
- $my_explode = explode ("|", $parameter);
- $res_id = str_replace("'","",$my_explode[1]);
+ $my_explode = explode('|', $parameter);
+ $res_id = str_replace("'", '', $my_explode[1]);
$db = new Database();
- //Load action name
+ //Load action name
$stmt = $db->query(
"SELECT count(*) as total FROM notes WHERE identifier = ? and note_text like '[avis%'", array($res_id)
);
@@ -1705,206 +1692,200 @@ abstract class lists_Abstract extends Database
return $note->total;
}
- protected function _tmplt_loadVarSys($parameter, $resultTheLine=array(), $listKey='', $lineIsDisabled=false) {
- ##loadValue|arg1##: load value in the db; arg1= column's value identifier
- if (preg_match("/^loadValue\|/", $parameter)){
+ protected function _tmplt_loadVarSys($parameter, $resultTheLine = array(), $listKey = '', $lineIsDisabled = false)
+ {
+ //#loadValue|arg1##: load value in the db; arg1= column's value identifier
+ if (preg_match("/^loadValue\|/", $parameter)) {
$var = $this->_tmplt_loadValue($parameter, $resultTheLine);
- ##sortColumn|arg1## : cretate sort in header; arg1 = name of the column
- } else if (preg_match("/^sortColumn\|/", $parameter)) {
+ //#sortColumn|arg1## : cretate sort in header; arg1 = name of the column
+ } elseif (preg_match("/^sortColumn\|/", $parameter)) {
$var = $this->_tmplt_sortColumn($parameter);
- ##defineLang|arg1## : define constant by the lang file; arg1 = constant of lang.php
- } else if (preg_match("/^defineLang\|/", $parameter)){
+ //#defineLang|arg1## : define constant by the lang file; arg1 = constant of lang.php
+ } elseif (preg_match("/^defineLang\|/", $parameter)) {
$var = $this->_tmplt_defineLang($parameter);
- ##cssLineReload## : reload css style for next line
- } else if (preg_match("/^cssLineReload$/", $parameter)) {
+ //#cssLineReload## : reload css style for next line
+ } elseif (preg_match('/^cssLineReload$/', $parameter)) {
$var = $this->_tmplt_cssLineReload($parameter);
- ##cssLine|coll|nonecoll## : load css style for line arg1,arg2 : switch beetwin style on line one or line two
- } else if (preg_match("/^cssLine\|/", $parameter)) {
+ //#cssLine|coll|nonecoll## : load css style for line arg1,arg2 : switch beetwin style on line one or line two
+ } elseif (preg_match("/^cssLine\|/", $parameter)) {
$var = $this->_tmplt_cssLine($parameter);
- ##loadImage|arg1|arg2## :load image; arg1= image name, arg2 = module name (if image in module)
- } else if (preg_match("/^loadImage\|/", $parameter)) {
+ //#loadImage|arg1|arg2## :load image; arg1= image name, arg2 = module name (if image in module)
+ } elseif (preg_match("/^loadImage\|/", $parameter)) {
$var = $this->_tmplt_loadImage($parameter);
- ##showSmallToolbar: swhow small bar for navigation
- } else if (preg_match("/^showSmallToolbar$/", $parameter)) {
+ //#showSmallToolbar: swhow small bar for navigation
+ } elseif (preg_match('/^showSmallToolbar$/', $parameter)) {
$var = $this->_tmplt_showSmallToolbar();
- ##checkBox## : show checkbox
- } elseif (preg_match("/^checkBox$/", $parameter)) {
+ //#checkBox## : show checkbox
+ } elseif (preg_match('/^checkBox$/', $parameter)) {
$var = $this->_tmplt_checkBox($resultTheLine, $listKey, $lineIsDisabled);
- ##checkUncheckAll## : show checkbox check All /uncheck All
- } elseif (preg_match("/^checkUncheckAll$/", $parameter)) {
+ //#checkUncheckAll## : show checkbox check All /uncheck All
+ } elseif (preg_match('/^checkUncheckAll$/', $parameter)) {
$var = $this->_tmplt_checkUncheckAll();
- ##radioButton## : show radio button
- } elseif (preg_match("/^radioButton$/", $parameter)) {
+ //#radioButton## : show radio button
+ } elseif (preg_match('/^radioButton$/', $parameter)) {
$var = $this->_tmplt_radioButton($resultTheLine, $listKey, $lineIsDisabled);
- ##showIconProcessDocument## : show process document icon and link
- } elseif (preg_match("/^showIconProcessDocument$/", $parameter)) {
+ //#showIconProcessDocument## : show process document icon and link
+ } elseif (preg_match('/^showIconProcessDocument$/', $parameter)) {
$var = $this->_tmplt_showIconProcessDocument($resultTheLine, $listKey);
- ##showIconDocument## : show document icon and link
- } elseif (preg_match("/^showIconDocument$/", $parameter)) {
+ //#showIconDocument## : show document icon and link
+ } elseif (preg_match('/^showIconDocument$/', $parameter)) {
$var = $this->_tmplt_showIconDocument($resultTheLine, $listKey);
- ##visualizeIconDocument## : show document icon and link
- } elseif (preg_match("/^visualizeIconDocument$/", $parameter)) {
+ //#visualizeIconDocument## : show document icon and link
+ } elseif (preg_match('/^visualizeIconDocument$/', $parameter)) {
$var = $this->_tmplt_visualizeIconDocument($resultTheLine, $listKey);
- ##downloadIconDocument## : show download document icon and link
- } elseif (preg_match("/^downloadIconDocument$/", $parameter)) {
+ //#downloadIconDocument## : show download document icon and link
+ } elseif (preg_match('/^downloadIconDocument$/', $parameter)) {
$var = $this->_tmplt_downloadIconDocument($resultTheLine, $listKey);
- ##showIconDetails## : show details icon and link
- } elseif (preg_match("/^showIconDetails$/", $parameter)) {
+ //#showIconDetails## : show details icon and link
+ } elseif (preg_match('/^showIconDetails$/', $parameter)) {
$var = $this->_tmplt_showIconDetails($resultTheLine, $listKey);
} elseif (preg_match("/^showActionIcon\|/", $parameter)) {
$var = $this->_tmplt_showActionIcon($parameter, $resultTheLine);
- ##showActionFA## : show action Font Awesome
+ //#showActionFA## : show action Font Awesome
} elseif (preg_match("/^showActionFA\|/", $parameter)) {
$var = $this->_tmplt_showActionFA($parameter, $resultTheLine);
- ##showActionBasketsFA## : show action Font Awesome
+ //#showActionBasketsFA## : show action Font Awesome
} elseif (preg_match("/^showActionBasketsFA\|/", $parameter)) {
$var = $this->_tmplt_showActionBasketsFA($parameter, $resultTheLine);
- ##showActionAdvResultFA## : show action Font Awesome
+ //#showActionAdvResultFA## : show action Font Awesome
} elseif (preg_match("/^showActionAdvResultFA\|/", $parameter)) {
$var = $this->_tmplt_showActionAdvResultFA($parameter, $resultTheLine);
- ##clickOnLine## : Action on click under the line
- } elseif (preg_match("/^clickOnLine$/", $parameter)) {
+ //#clickOnLine## : Action on click under the line
+ } elseif (preg_match('/^clickOnLine$/', $parameter)) {
$var = $this->_tmplt_clickOnLine($resultTheLine, $listKey, $lineIsDisabled);
- ##includeFile## : Action on click under the line
+ //#includeFile## : Action on click under the line
} elseif (preg_match("/^includeFile\|/", $parameter)) {
$var = $this->_tmplt_includeFile($parameter);
- ##getBusinessAppUrl## : Action on click under the line
- } elseif (preg_match("/^getBusinessAppUrl$/", $parameter)) {
+ //#getBusinessAppUrl## : Action on click under the line
+ } elseif (preg_match('/^getBusinessAppUrl$/', $parameter)) {
$var = $this->_tmplt_getBusinessAppUrl();
- ##getListParameter## :
+ //#getListParameter## :
} elseif (preg_match("/^getListParameter\|/", $parameter)) {
$var = $this->_tmplt_getListParameter($parameter);
- ##setListParameter## :
+ //#setListParameter## :
} elseif (preg_match("/^setListParameter\|/", $parameter)) {
- $var = $this->_tmplt_setListParameter($parameter);
- ##isModuleLoaded## :
+ $var = $this->_tmplt_setListParameter($parameter);
+ //#isModuleLoaded## :
} elseif (preg_match("/^isModuleLoaded\|/", $parameter)) {
- $var = $this->_tmplt_isModuleLoaded($parameter);
- ##ifStatement## :
+ $var = $this->_tmplt_isModuleLoaded($parameter);
+ //#ifStatement## :
} elseif (preg_match("/^ifStatement\|/", $parameter)) {
- $var = $this->_tmplt_ifStatement($parameter);
- } elseif (preg_match("/^func_bool_see_multi_contacts$/", $parameter)){
+ $var = $this->_tmplt_ifStatement($parameter);
+ } elseif (preg_match('/^func_bool_see_multi_contacts$/', $parameter)) {
$var = $this->tmplt_func_bool_see_multi_contacts($resultTheLine);
- } elseif (preg_match("/^func_delete$/", $parameter)){
+ } elseif (preg_match('/^func_delete$/', $parameter)) {
$var = $this->tmplt_func_delete($resultTheLine);
- } elseif (preg_match("/^func_modify$/", $parameter)){
+ } elseif (preg_match('/^func_modify$/', $parameter)) {
$var = $this->tmplt_func_modify($resultTheLine);
- } elseif (preg_match("/^func_final_version$/", $parameter)){
+ } elseif (preg_match('/^func_final_version$/', $parameter)) {
$var = $this->tmplt_func_final_version($resultTheLine);
- } elseif (preg_match("/^func_previous_version$/", $parameter)){
+ } elseif (preg_match('/^func_previous_version$/', $parameter)) {
$var = $this->tmplt_func_previous_version($resultTheLine);
- } elseif (preg_match("/^func_bool_see_notes$/", $parameter)){
+ } elseif (preg_match('/^func_bool_see_notes$/', $parameter)) {
$var = $this->tmplt_func_bool_see_notes($resultTheLine);
- } elseif (preg_match("/^func_cadenas\|/", $parameter)){
+ } elseif (preg_match("/^func_cadenas\|/", $parameter)) {
$var = $this->tmplt_func_cadenas($parameter);
- } elseif (preg_match("/^showDefaultAction$/", $parameter)){
+ } elseif (preg_match('/^showDefaultAction$/', $parameter)) {
$var = $this->tmplt_showDefaultAction($parameter);
- }elseif (preg_match("/^nbNoteAvis\|/", $parameter)){
+ } elseif (preg_match("/^nbNoteAvis\|/", $parameter)) {
$var = $this->tmplt_nbNoteAvis($parameter);
- } elseif (preg_match("/^func_isConfidential$/", $parameter)) {
+ } elseif (preg_match('/^func_isConfidential$/', $parameter)) {
$var = $this->_tmplt_func_isConfidential($resultTheLine);
- ##showActionIcon## : show action icon
- } elseif (preg_match("/^func_load_case_status$/", $parameter)) {
+ //#showActionIcon## : show action icon
+ } elseif (preg_match('/^func_load_case_status$/', $parameter)) {
$var = $this->_tmplt_func_load_case_status($resultTheLine);
} else {
$var = _WRONG_FUNCTION_OR_WRONG_PARAMETERS;
}
+
return $var;
}
-
- protected function _buildTemplate($templateFile, $resultArray, $listKey, $parameters = []) {
-
- if (file_exists('custom/' . $_SESSION['custom_override_id'] . '/' . $templateFile)) {
- $templateFile = 'custom/' . $_SESSION['custom_override_id'] . '/' . $templateFile;
+ protected function _buildTemplate($templateFile, $resultArray, $listKey, $parameters = [])
+ {
+ if (file_exists('custom/'.$_SESSION['custom_override_id'].'/'.$templateFile)) {
+ $templateFile = 'custom/'.$_SESSION['custom_override_id'].'/'.$templateFile;
}
//Check if template file exists
if (file_exists($templateFile)) {
-
-
//Load template file
$templateContent = $this->_loadTemplate($templateFile);
//Explode template
- $templateContentArray = explode("#!#", $templateContent);
-
+ $templateContentArray = explode('#!#', $templateContent);
+
//Get value from template
- foreach($templateContentArray as $templateSection) {
-
- if (substr($templateSection , 0, 5) == "TABLE") {
+ foreach ($templateContentArray as $templateSection) {
+ if (substr($templateSection, 0, 5) == 'TABLE') {
//Get table string
$table = substr($templateSection, 5);
$trueTable = $table;
preg_match_all('/##(.*?)##/', $trueTable, $output);
-
+
//Replace functions by values
- for($i=0;$i<count($output[0]);$i++) {
+ for ($i = 0; $i < count($output[0]); ++$i) {
$remplacementTable = $this->_tmplt_loadVarSys($output[1][$i]);
- $table = str_replace($output[0][$i],$remplacementTable, $trueTable);
+ $table = str_replace($output[0][$i], $remplacementTable, $trueTable);
}
- } elseif (substr($templateSection , 0, 4) == "HEAD") {
+ } elseif (substr($templateSection, 0, 4) == 'HEAD') {
//Get head string
$head = substr($templateSection, 4);
$trueHead = $head;
preg_match_all('/##(.*?)##/', $trueHead, $output);
- for($i=0;$i<count($output[0]);$i++) {
-
+ for ($i = 0; $i < count($output[0]); ++$i) {
//If template function is called under template function
$_trueHead = $output[1][$i];
preg_match_all('/#(.*?)#/', $_trueHead, $_output);
- for($j=0;$j<count($_output[0]);$j++) {
+ for ($j = 0; $j < count($_output[0]); ++$j) {
// $debug .='--> '.$_output[0][$j].'<br>';
$_remplacementHead = $this->_tmplt_loadVarSys($_output[1][$j]);
// $debug .='---> '.$_remplacementHead.'<br>';
- $_trueHead = str_replace($_output[0][$j],$_remplacementHead,$_trueHead);
-
+ $_trueHead = str_replace($_output[0][$j], $_remplacementHead, $_trueHead);
}
$output[1][$i] = $_trueHead;
-
+
$remplacementHead = $this->_tmplt_loadVarSys($output[1][$i]);
$trueHead = str_replace($output[0][$i], $remplacementHead, $trueHead);
}
$head = $trueHead;
- } else if (substr($templateSection , 0, 6) == "RESULT") {
+ } elseif (substr($templateSection, 0, 6) == 'RESULT') {
//Get rows content
$content = substr($templateSection, 6);
- } elseif (substr($templateSection , 0, 6) == "FOOTER") {
+ } elseif (substr($templateSection, 0, 6) == 'FOOTER') {
//Get footer string
$footer = substr($templateSection, 6);
}
}
-
+
$rowsContent = '';
//Loop into the set of records
- for($theLine = $this->start; $theLine < $this->end ; $theLine++) {
-
+ for ($theLine = $this->start; $theLine < $this->end; ++$theLine) {
//Check if line is disable
$lineIsDisabled = $this->_checkDisabledRules($this->params['disabledRules'], $resultArray[$theLine]);
-
+
//Treat content
$trueContent = $content;
-
+
preg_match_all('/##(.*?)##/', $trueContent, $output);
-
- for($i=0;$i<count($output[0]);$i++) {
-
+
+ for ($i = 0; $i < count($output[0]); ++$i) {
// echo '-> '.$output[1][$i].'<br>';
$_trueContent = '';
-
+
//If template function is called under template function
$_trueContent = $output[1][$i];
-
+
preg_match_all('/#(.*?)#/', $_trueContent, $_output);
-
- for($j=0;$j<count($_output[0]);$j++) {
+
+ for ($j = 0; $j < count($_output[0]); ++$j) {
// echo '--> '.$_output[0][$j].'<br>';
$_remplacement = $this->_tmplt_loadVarSys($_output[1][$j], $resultArray[$theLine], $listKey, $lineIsDisabled);
// echo '---> '.$_remplacement.'<br>';
- $_trueContent = str_replace($_output[0][$j],$_remplacement,$_trueContent);
+ $_trueContent = str_replace($_output[0][$j], $_remplacement, $_trueContent);
}
$output[1][$i] = $_trueContent;
-
+
// echo '<- '.$output[1][$i].'<br><br>';
if (empty($parameters) || empty($parameters['noModification']) || ($output[1][$i] != 'func_modify' && $output[1][$i] != 'func_delete')) {
@@ -1912,182 +1893,184 @@ abstract class lists_Abstract extends Database
} else {
$remplacement = '';
}
- $trueContent = str_replace($output[0][$i],$remplacement,$trueContent);
-
+ $trueContent = str_replace($output[0][$i], $remplacement, $trueContent);
}
-
+
$rowsContent .= $trueContent;
}
-
- $buildedTemplate = $table.$head.$rowsContent.$footer;
-
+
+ $buildedTemplate = $table.$head.$rowsContent.$footer;
+
//Fix some json line breaks issues
- $buildedTemplate = str_replace(chr(10), "", $buildedTemplate);
- $buildedTemplate = str_replace(chr(13), "", $buildedTemplate);
-
+ $buildedTemplate = str_replace(chr(10), '', $buildedTemplate);
+ $buildedTemplate = str_replace(chr(13), '', $buildedTemplate);
+
return $buildedTemplate;
-
} else {
-
- return _NO_TEMPLATE_FILE_AVAILABLE. ': '.$templateFile;
+ return _NO_TEMPLATE_FILE_AVAILABLE.': '.$templateFile;
}
}
-
- protected function _highlightWords($input, $keyword, $maxLength=30, $minLength=5) {
-
+
+ protected function _highlightWords($input, $keyword, $maxLength = 30, $minLength = 5)
+ {
$output = $input;
-
- if(strlen(trim($keyword)) < $maxLength && strlen(trim($keyword)) > $minLength ) {
-
+
+ if (strlen(trim($keyword)) < $maxLength && strlen(trim($keyword)) > $minLength) {
// $output = preg_replace("/(>|^)([^<]+)(?=<|$)/esx", "'\\1' . str_replace('" . $keyword . "', '<span class=\"highlighted\">" . $keyword . "</span>', '\\2')", $input);
// $output = preg_replace("/(?<!\[)(\b{$keyword}\b)(?!\])/i", '<span class="highlighted">\\1</span>', $input);
- $keywordArray = explode(" ", $keyword);
- for($i = 0; $i < count($keywordArray); $i++) {
- $save_keywordArray = "";
+ $keywordArray = explode(' ', $keyword);
+ for ($i = 0; $i < count($keywordArray); ++$i) {
+ $save_keywordArray = '';
$pos = stripos($input, $keywordArray[$i]);
-
- if($pos !== false) {
+
+ if ($pos !== false) {
$save_keywordArray = substr($input, $pos, strlen($keywordArray[$i]));
}
- $output = preg_replace("/(".$keywordArray[$i].")/i","<span class=\"highlighted\">".$save_keywordArray."</span>",$input);
+ $output = preg_replace('/('.$keywordArray[$i].')/i', '<span class="highlighted">'.$save_keywordArray.'</span>', $input);
}
}
+
return $output;
}
-
- protected function _buildMyLink($link, $resultTheLine, $listKey='') {
-
+
+ protected function _buildMyLink($link, $resultTheLine, $listKey = '')
+ {
//If you want to use different key for action link
- if (strpos($link, "@@") !== false) {
- foreach(array_keys($resultTheLine) as $column) { // for every column
- $key = "@@".$resultTheLine[$column]['column']."@@"; //build the alias
+ if (strpos($link, '@@') !== false) {
+ foreach (array_keys($resultTheLine) as $column) { // for every column
+ $key = '@@'.$resultTheLine[$column]['column'].'@@'; //build the alias
$val = $resultTheLine[$column]['value']; //get the real value
$link = str_replace($key, $val, $link); //replace alias by real value
}
}
-
+
//Use standard id (based on list key)
if (!empty($listKey)) {
//Get the ListKey value
$keyValue = '';
- for($i= 0; $i <= count($resultTheLine); $i++ ) {
- if($resultTheLine[$i]['column'] == $listKey) {
+ for ($i = 0; $i <= count($resultTheLine); ++$i) {
+ if ($resultTheLine[$i]['column'] == $listKey) {
$keyValue = $resultTheLine[$i]['value'];
}
}
- $link .= "&id=".$keyValue;
+ $link .= '&id='.$keyValue;
}
-
+
return $link;
}
-
- protected function _removeUrlVar($url, $varName) {
+ protected function _removeUrlVar($url, $varName)
+ {
$url = html_entity_decode($url);
- $urlArray = parse_url($url);
+ $urlArray = parse_url($url);
parse_str($urlArray['query'], $output);
unset($output[$varName]);
$urlVar = http_build_query($output);
-
- return strtok($url, '?') . '?' . $urlVar;
+
+ return strtok($url, '?').'?'.$urlVar;
}
- protected function _buildPageLink() {
+ protected function _buildPageLink()
+ {
//Get page and module from REQUEST
- if (!isset($this->params['pageName']) || empty($this->params['pageName'])) $this->params['pageName'] = $_REQUEST['page'];
- if (!isset($this->params['moduleName']) || empty($this->params['moduleName'])) $this->params['moduleName'] = $_REQUEST['module'];
-
+ if (!isset($this->params['pageName']) || empty($this->params['pageName'])) {
+ $this->params['pageName'] = $_REQUEST['page'];
+ }
+ if (!isset($this->params['moduleName']) || empty($this->params['moduleName'])) {
+ $this->params['moduleName'] = $_REQUEST['module'];
+ }
+
//Url parameters
if (isset($this->params['urlParameters'])) {
$pos = strpos($this->params['urlParameters'], '&');
//if my urlParameters string have '&'
if ($pos !== false) {
//at the firt position
- if ($pos <> 0) {
+ if ($pos != 0) {
//And page is called by index page
if ($this->params['bool_pageInModule']) {
- //Add '&'
+ //Add '&'
$this->params['urlParameters'] = '&'.$this->params['urlParameters'];
}
}
} else {//my urlParameters string dont have '&' at all
//And page is called by index page
if ($this->params['bool_pageInModule']) {
- //Add '&'
+ //Add '&'
$this->params['urlParameters'] = '&'.$this->params['urlParameters'];
}
- }
+ }
}
-
+
//Page pageName
- if (isset($this->params['pageName'])){
+ if (isset($this->params['pageName'])) {
if ($this->params['bool_pageInModule'] && isset($this->params['moduleName'])) { //If page is called in a module by index page
- $link = $_SESSION['config']['businessappurl'].'index.php?page='.$this->params['pageName']."&module="
+ $link = $_SESSION['config']['businessappurl'].'index.php?page='.$this->params['pageName'].'&module='
.$this->params['moduleName'].$this->params['urlParameters'];
- } elseif(isset($this->params['moduleName']) && !$this->params['bool_pageInModule']) { //Else if page is called inside the module
- $link = $_SESSION['urltomodules'].$this->params['moduleName']."/".$this->params['pageName'].".php?".$this->params['urlParameters'];
+ } elseif (isset($this->params['moduleName']) && !$this->params['bool_pageInModule']) { //Else if page is called inside the module
+ $link = $_SESSION['urltomodules'].$this->params['moduleName'].'/'.$this->params['pageName'].'.php?'.$this->params['urlParameters'];
} else {
$link = $_SESSION['config']['businessappurl'].'index.php?page='.$this->params['pageName'].$this->params['urlParameters'];
}
} else { //Default link (anchor) to prevent error in link if no pageName or module name
- $link = "#";
+ $link = '#';
}
-
+
//String searched in list
- if(!empty($this->whatSearch)) {
- $link = $this->_removeUrlVar($link,'what');
- $link.= '&what='.$this->whatSearch;
+ if (!empty($this->whatSearch)) {
+ $link = $this->_removeUrlVar($link, 'what');
+ $link .= '&what='.$this->whatSearch;
}
-
+
//Column order
- if(!empty($_REQUEST['order']) && !empty($_REQUEST['order_field'])) {
+ if (!empty($_REQUEST['order']) && !empty($_REQUEST['order_field'])) {
//Remove some url parameters
- $link = $this->_removeUrlVar($link,'order');
- $link = $this->_removeUrlVar($link,'order_field');
+ $link = $this->_removeUrlVar($link, 'order');
+ $link = $this->_removeUrlVar($link, 'order_field');
//Init
$this->order = $_REQUEST['order'];
$this->orderField = $_REQUEST['order_field'];
- }
-
+ }
+
//Template
- if(isset($_REQUEST['template'])) {
+ if (isset($_REQUEST['template'])) {
//Remove some url parameters
- $link = $this->_removeUrlVar($link,'template');
- $this->template = $_REQUEST['template'];
- $link.= '&template='.$_REQUEST['template'];
+ $link = $this->_removeUrlVar($link, 'template');
+ $this->template = $_REQUEST['template'];
+ $link .= '&template='.$_REQUEST['template'];
$_SESSION['save_list']['template'] = $_REQUEST['template'];
}
-
+
//Id (used in sublist)
- if(isset($_REQUEST['id'])) {
- $link = $this->_removeUrlVar($link,'id');
- $link.= '&id='.$_REQUEST['id'];
+ if (isset($_REQUEST['id'])) {
+ $link = $this->_removeUrlVar($link, 'id');
+ $link .= '&id='.$_REQUEST['id'];
}
-
+
//Number of lines to show
- if(isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
+ if (isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
$link = $this->_removeUrlVar($link, 'lines');
- $link.= '&lines='.$_REQUEST['lines'];
+ $link .= '&lines='.$_REQUEST['lines'];
}
-
+
//Display = true
if (isset($_REQUEST['display']) && !empty($_REQUEST['display'])) {
- $link = $this->_removeUrlVar($link,'display');
- $link.= '&display=true';
+ $link = $this->_removeUrlVar($link, 'display');
+ $link .= '&display=true';
}
-
+
return $link;
}
-
- protected function _checkDisabledRules($disabledRules, $resultTheLine=array()) {
+
+ protected function _checkDisabledRules($disabledRules, $resultTheLine = array())
+ {
$disabled = false;
-
+
if (!empty($disabledRules)) {
-
- if(is_array($resultTheLine) && count($resultTheLine) > 0) {
- foreach(array_keys($resultTheLine) as $column) { // for every column
- $key = "@@".$resultTheLine[$column]['column']."@@"; //build the alias
- $val = "'".$resultTheLine[$column]['value']."'"; //get the real value with simple quotes
+ if (is_array($resultTheLine) && count($resultTheLine) > 0) {
+ foreach (array_keys($resultTheLine) as $column) { // for every column
+ $key = '@@'.$resultTheLine[$column]['column'].'@@'; //build the alias
+ $val = "'".$resultTheLine[$column]['value']."'"; //get the real value with simple quotes
$disabledRules = str_replace($key, $val, $disabledRules); //replace alias by real value
}
}
@@ -2095,66 +2078,67 @@ abstract class lists_Abstract extends Database
if (!empty($disabledRules)) {
$rules = "return($disabledRules);";
//echo $rules."<br>\n";
- if(@eval($rules)) {
+ if (@eval($rules)) {
$disabled = true;
}
}
}
+
return $disabled;
}
-
- protected function _createHeader($resultFirstRow, $listColumn, $showColumn, $sortColumn) {
+
+ protected function _createHeader($resultFirstRow, $listColumn, $showColumn, $sortColumn)
+ {
$count_td = 0;
$column = '<tr>';
//If sublist
- if($this->params['bool_showSublist'] && !empty($this->params['sublistUrl'])){
+ if ($this->params['bool_showSublist'] && !empty($this->params['sublistUrl'])) {
$column .= '<th width="1%"> </th>';
- $count_td ++;
- }
-
- //If checkbox
- if( $this->params['bool_checkBox'] === true) {
- $column .= '<th width="1%" alt="' . _CHECK_ALL
- . ' / ' . _UNCHECK_ALL
- . '"><div align="center"><input type="checkbox" '
- . 'id="checkUncheck" name="checkUncheck" value="" onclick="CheckUncheckAll(this);"></div></th>';
- $count_td ++;
- //If radio button
- } else if( $this->params['bool_radioButton'] === true) {
+ ++$count_td;
+ }
+
+ //If checkbox
+ if ($this->params['bool_checkBox'] === true) {
+ $column .= '<th width="1%" alt="'._CHECK_ALL
+ .' / '._UNCHECK_ALL
+ .'"><div align="center"><input type="checkbox" '
+ .'id="checkUncheck" name="checkUncheck" value="" onclick="CheckUncheckAll(this);"></div></th>';
+ ++$count_td;
+ //If radio button
+ } elseif ($this->params['bool_radioButton'] === true) {
$column .= '<th width="1%"> </th>';
- $count_td ++;
+ ++$count_td;
}
//If view document
- if($this->params['bool_showIconDocument']) {
+ if ($this->params['bool_showIconDocument']) {
$column .= '<th width="1%"> </th>';
- $count_td ++;
+ ++$count_td;
}
//Print column header
- for($actualColumn = 0;$actualColumn < count($listColumn);$actualColumn++) {
+ for ($actualColumn = 0; $actualColumn < count($listColumn); ++$actualColumn) {
//Show column
- if($showColumn[$actualColumn] === true) {
-
+ if ($showColumn[$actualColumn] === true) {
//Different background on ordered column
- (strpos($this->orderField, $sortColumn[$actualColumn]) !== false)?
+ (strpos($this->orderField, $sortColumn[$actualColumn]) !== false) ?
$columnStyle = ' style="background-image: url(static.php?filename=black_0.1.png);"' : $columnStyle = '';
-
+
//column
$column .= '<th'.$columnStyle.' width="'.$resultFirstRow[$actualColumn]['size']
.'%" valign="'.$resultFirstRow[$actualColumn]['valign']
.'"><div align="'.$resultFirstRow[$actualColumn]['label_align'].'">'
- .$listColumn[$actualColumn];
-
+ .$listColumn[$actualColumn];
+
//Show sort icon
- if($this->params['bool_sortColumn']) {
- if( $sortColumn[$actualColumn] !== false) {
+ if ($this->params['bool_sortColumn']) {
+ if ($sortColumn[$actualColumn] !== false) {
//Change color of sort icon
- ($this->order == 'desc' && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false))?
+ ($this->order == 'desc' && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false)) ?
$sortImgDown = 'mCdarkOrange' : $sortImgDown = 'mCdarkBlue';
- ($this->order == 'asc' && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false))?
+ ($this->order == 'asc' && (strpos($this->orderField, $sortColumn[$actualColumn]) !== false)) ?
$sortImgUp = 'mCdarkOrange' : $sortImgUp = 'mCdarkBlue';
$column .= '<br/><br/>';
@@ -2162,75 +2146,73 @@ abstract class lists_Abstract extends Database
$column .= '<a href="javascript://" onClick="loadList(\''.$this->link
.'&order=desc&order_field='.$sortColumn[$actualColumn].'\', \''
.$this->divListId.'\', '.$this->modeReturn.');" title="'
- ._DESC_SORT.'"><i class="fa fa-angle-down fa-2x '
- . $sortImgDown . '" title="'._DESC_SORT.'"></i></a>';
+ ._DESC_SORT.'"><i class="fa fa-angle-down fa-2x '
+ .$sortImgDown.'" title="'._DESC_SORT.'"></i></a>';
$column .= '<a href="javascript://" onClick="loadList(\''.$this->link
.'&order=asc&order_field='.$sortColumn[$actualColumn].'\', \''
.$this->divListId.'\', '.$this->modeReturn.');" title="'
- ._ASC_SORT.'"><i class="fa fa-angle-up fa-2x '
- . $sortImgUp . '" title="'._ASC_SORT.'"></i></a>';
+ ._ASC_SORT.'"><i class="fa fa-angle-up fa-2x '
+ .$sortImgUp.'" title="'._ASC_SORT.'"></i></a>';
}
}
$column .= '</div></th>';
-
- $count_td ++;
+
+ ++$count_td;
}
}
- //Reserve space for action buttons
- for($i = 0;$i < count($this->actionButtons);$i++) {
+ //Reserve space for action buttons
+ for ($i = 0; $i < count($this->actionButtons); ++$i) {
$column .= '<th width="1%" valign="bottom"> </th>';
- $count_td ++;
+ ++$count_td;
}
//Reserve space for details button
- if($this->params['bool_showIconDetails']) {
+ if ($this->params['bool_showIconDetails']) {
$column .= '<th width="1%" valign="bottom"> </th>';
- $count_td ++;
+ ++$count_td;
}
-
+
$column .= '</tr>';
-
+
//Count the number of columns
$this->countTd = $count_td;
-
+
//Small toolbar
$toolbar = '';
- if($this->params['bool_showSmallToolbar']){
+ if ($this->params['bool_showSmallToolbar']) {
$toolbar = '<tr><th style="padding:0px;" colspan="'.$this->countTd.'">';
$toolbar .= $this->_createSmallToolbar();
$toolbar .= '</th></tr>';
- }
-
+ }
+
//Add button
$addButton = $footer = '';
- if($this->params['bool_showAddButton']) {
- $addButton = $this->_displayAddButton();
+ if ($this->params['bool_showAddButton']) {
+ $addButton = $this->_displayAddButton();
$footer = '<tfoot>'.$addButton.'</tfoot>';
}
-
+
//Header
$header = '<thead>'.$toolbar.$column.'</thead>'.$footer;
-
+
return $header;
}
-
- protected function _getTools($resultFirstRow, $countResult) {
-
+
+ protected function _getTools($resultFirstRow, $countResult)
+ {
//ADD ALWAYS VISISBLE PARAMETERS
$tools = $urlParameters = '';
if (isset($this->params['tools']) && count($this->params['tools']) > 0) {
+ for ($i = 0; $i < count($this->params['tools']); ++$i) {
+ if (!isset($this->params['tools'][$i]['alwaysVisible'])) {
+ $this->params['tools'][$i]['alwaysVisible'] = false;
+ }
- for($i=0; $i < count($this->params['tools']); $i++) {
-
- if (!isset($this->params['tools'][$i]['alwaysVisible'])) $this->params['tools'][$i]['alwaysVisible'] = false;
-
$toolIsDisabled = $this->_checkDisabledRules($this->params['tools'][$i]['disabledRules']);
-
- if (($toolIsDisabled === false && $countResult >0) || $this->params['tools'][$i]['alwaysVisible'] === true) {
-
- if(isset($this->params['tools'][$i]['script']) && !empty($this->params['tools'][$i]['script'])) {
-
+
+ if (($toolIsDisabled === false && $countResult > 0) || $this->params['tools'][$i]['alwaysVisible'] === true) {
+ if (isset($this->params['tools'][$i]['script']) && !empty($this->params['tools'][$i]['script'])) {
$script = $this->_buildMyLink($this->params['tools'][$i]['script'], $resultFirstRow);
$tools .= '<a href="javascript://" onClick="'.$script
.'" title="'.$this->params['tools'][$i]['tooltip'].'">';
@@ -2241,21 +2223,21 @@ abstract class lists_Abstract extends Database
//if my urlParameters string have '&'
if ($pos !== false) {
//at the firt position
- if ($pos <> 0) {
- //Add '&'
- $this->params['tools'][$i]['urlParameters'] = '&'.$this->params['urlParameters'];
+ if ($pos != 0) {
+ //Add '&'
+ $this->params['tools'][$i]['urlParameters'] = '&'.$this->params['urlParameters'];
}
}
- $urlParameters = $this->params['tools'][$i]['urlParameters'];
+ $urlParameters = $this->params['tools'][$i]['urlParameters'];
}
//Href
- if(isset($this->params['tools'][$i]['href']) && !empty($this->params['tools'][$i]['href'])) {
+ if (isset($this->params['tools'][$i]['href']) && !empty($this->params['tools'][$i]['href'])) {
$href = $this->params['tools'][$i]['href'];
} else {
- $href = $this->link.$urlParameters;
+ $href = $this->link.$urlParameters;
}
// If javascript alert box
- if(isset($this->params['tools'][$i]['alertText']) && !empty($this->params['tools'][$i]['alertText'])) {
+ if (isset($this->params['tools'][$i]['alertText']) && !empty($this->params['tools'][$i]['alertText'])) {
$tools .= '<a href="javascript://" onClick="if(confirm(\''
.addslashes($this->params['tools'][$i]['alertText']).'\')) loadList(\''
.$href.'\', \''.$this->divListId.'\', '.
@@ -2265,33 +2247,34 @@ abstract class lists_Abstract extends Database
.$href.'\', \''.$this->divListId.'\', '.$this->modeReturn.');" title="'
.$this->params['tools'][$i]['tooltip'].'">';
}
- }
+ }
//Image
- if(isset($this->params['tools'][$i]['icon'])) {
- $tools .= '<i class="fa fa-' . $this->params['tools'][$i]['icon'] . ' fa-2x" title="' . $this->params['tools'][$i]['tooltip'] . '"></i> ';
+ if (isset($this->params['tools'][$i]['icon'])) {
+ $tools .= '<i class="fa fa-'.$this->params['tools'][$i]['icon'].' fa-2x" title="'.$this->params['tools'][$i]['tooltip'].'"></i> ';
} else {
- $tools .= '<i class="fa fa-ban fa-2x" title="NO_IMAGE"></i> ';
+ $tools .= '<i class="fa fa-ban fa-2x" title="NO_IMAGE"></i> ';
}
$tools .= '</a> ';
}
}
}
+
return $tools;
}
-
- protected function _displaySearchTools() {
-
+
+ protected function _displaySearchTools()
+ {
$searchTools = '';
if ($this->params['bool_showSearchTools']) {
- //Remove old what filter
- $searchToolsLink = $this->_removeUrlVar($this->link,'what');
- //
+ //Remove old what filter
+ $searchToolsLink = $this->_removeUrlVar($this->link, 'what');
+
$searchTools .= '<div id="searchTools" class="listletter"><table width="100%" border="0" cellpadding="0" cellspacing="0" class="forms"><tr>';
//Alphabetical list
$searchTools .= '<td width="65%" height="30"><strong>'._ALPHABETICAL_LIST.'</strong> : ';
- for($i=ord('A'); $i <= ord('Z');$i++) {
+ for ($i = ord('A'); $i <= ord('Z'); ++$i) {
//Highlight selected letter
- (chr($i) == trim($this->whatSearch))? $letter = '<span class="selectedLetter">'.chr($i).'</span>' : $letter = chr($i);
+ (chr($i) == trim($this->whatSearch)) ? $letter = '<span class="selectedLetter">'.chr($i).'</span>' : $letter = chr($i);
$searchTools .= '<a href="javascript://" onClick="loadList(\''.$searchToolsLink.'&what='.chr($i)
.'\', \''.$this->divListId.'\', '.$this->modeReturn.');">'.$letter.'</a> ';
}
@@ -2302,9 +2285,9 @@ abstract class lists_Abstract extends Database
$searchTools .= '<td width="35%" align="right"> ';
if ($this->params['bool_showSearchBox']) {
$searchTools .= '<form id="frmletters" name="frmletters" method="post" action="#"><div>';
- (strlen($this->whatSearch) > 1)? $what = $this->whatSearch : $what ='';
+ (strlen($this->whatSearch) > 1) ? $what = $this->whatSearch : $what = '';
$searchTools .= '<input type="text" name="what" id="what" size="15" value="'.$what.'" onkeyup="erase_contact_external_id(\'what\', \'selectedObject\');"/> ';
- if(isset($this->params['searchBoxAutoCompletionUrl']) && !empty($this->params['searchBoxAutoCompletionUrl'])) {
+ if (isset($this->params['searchBoxAutoCompletionUrl']) && !empty($this->params['searchBoxAutoCompletionUrl'])) {
$searchTools .= '<div id="whatList" class="autocomplete"></div>';
$searchTools .= '<script type="text/javascript">';
if ($this->params['searchBoxAutoCompletionUpdate'] == true) {
@@ -2329,46 +2312,52 @@ abstract class lists_Abstract extends Database
$searchTools .= '</td>';
$searchTools .= '</tr></table></div>';
}
+
return $searchTools;
}
-
- protected function _createToolbar($resultFirstRow) {
- $toolbar = $tools = $templates = $filters = '';
+
+ protected function _createToolbar($resultFirstRow)
+ {
+ $toolbar = $tools = $templates = $filters = '';
$start = $end = 0;
-
+
//Loading image
$loading = '<div id="loading" style="display:none;">'
- . '<i class="fa fa-spinner fa-2x" style="vertical-align: middle;" title="loading..."></i></div>';
-
+ .'<i class="fa fa-spinner fa-2x" style="vertical-align: middle;" title="loading..."></i></div>';
+
//Lines to show
$nbLines = $this->params['linesToShow'];
- if(isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
+ if (isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
$nbLines = $this->params['linesToShow'] = strip_tags($_REQUEST['lines']);
$_SESSION['save_list']['lines'] = $nbLines;
}
//Number of pages
- $nb_pages = ceil($this->countResult/$this->params['linesToShow']);
+ $nb_pages = ceil($this->countResult / $this->params['linesToShow']);
// $debug .='NB total '.$this->countResult.' / NB show: '.$this->params['linesToShow'].' / Pages: '.$nb_pages.' /';
-
- if(isset($_REQUEST['start']) && !empty($_REQUEST['start'])) $start = strip_tags($_REQUEST['start']);
+
+ if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
+ $start = strip_tags($_REQUEST['start']);
+ }
$end = $start + $this->params['linesToShow'];
- if($end > $this->countResult) $end = $this->countResult;
-
+ if ($end > $this->countResult) {
+ $end = $this->countResult;
+ }
+
//Get list of tools (icon and link)
$tools = $this->_getTools($resultFirstRow, $this->countResult);
-
+
//Get templates
$templates = $this->_getTemplates();
-
- //Get Filters
- if(isset($this->params['filters']) && count($this->params['filters']) > 0) {
+
+ //Get Filters
+ if (isset($this->params['filters']) && count($this->params['filters']) > 0) {
$height = '60px';
$filters = '</tr><tr><td colspan="11" class="separator2">'.($this->_displayFilters()).'</td></tr>';
} else {
$height = '30px';
}
-
+
//Build dropdown lines object
$linesDropdownList = '';
if ($this->params['bool_changeLinesToShow']) {
@@ -2378,35 +2367,35 @@ abstract class lists_Abstract extends Database
50,
100,
250,
- 500
+ 500,
);
if (!in_array($this->params['linesToShow'], $nbLinesSelect)) {
array_push($nbLinesSelect, $this->params['linesToShow']);
}
sort($nbLinesSelect);
-
+
$linesDropdownList .= '<i class="fa fa-bars fa-2x" aria-hidden="true" title="'._SHOW.'"></i> <select name="nbLines" id="nbLines" onChange="loadList(\''.$this->link
.'&order='.$this->order.'&order_field='
.$this->orderField.'&lines=\' + this.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- //Array values
- for ($i=0; $i<count($nbLinesSelect); $i++) {
+ //Array values
+ for ($i = 0; $i < count($nbLinesSelect); ++$i) {
if ($nbLinesSelect[$i] >= $this->countResult) {
break;
}
- ($nbLinesSelect[$i] == $nbLines)? $selected = 'selected="selected" ' : $selected = '';
- $linesDropdownList .= '<option value="' . $nbLinesSelect[$i] . '" '.$selected.'>'.$nbLinesSelect[$i]._LINES.'</option>';
+ ($nbLinesSelect[$i] == $nbLines) ? $selected = 'selected="selected" ' : $selected = '';
+ $linesDropdownList .= '<option value="'.$nbLinesSelect[$i].'" '.$selected.'>'.$nbLinesSelect[$i]._LINES.'</option>';
}
//Extra value
- ($this->countResult == $nbLines || $this->countResult < $nbLines)? $selected = 'selected="selected" ' : $selected = '';
- $linesDropdownList .= '<option value="' . $this->countResult . '" '.$selected.'>'._ALL.'('.$this->countResult.')</option>';
+ ($this->countResult == $nbLines || $this->countResult < $nbLines) ? $selected = 'selected="selected" ' : $selected = '';
+ $linesDropdownList .= '<option value="'.$this->countResult.'" '.$selected.'>'._ALL.'('.$this->countResult.')</option>';
$linesDropdownList .= '</select>';
//$linesDropdownList .= '<script>if(!$(\'nbLines_chosen\')){new c($(\'nbLines\'),{width: "auto", disable_search: true});}</script>';
$linesDropdownList .= '<script> $j("#nbLines").chosen({width: "auto", disable_search: true});</script>';
}
-
+
//If there are more than 1 page, pagination
- if($nb_pages > 1) {
+ if ($nb_pages > 1) {
//Build dropdown navigation object
$next_start = 0;
$pageDropdownList .= _GO_TO_PAGE.' <select name="startpage" onChange="loadList(\''.$this->link
@@ -2414,38 +2403,37 @@ abstract class lists_Abstract extends Database
.$this->orderField.'&start=\' + this.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
$lastpage = 0;
- for($i = 0;$i <> $nb_pages; $i++){
+ for ($i = 0; $i != $nb_pages; ++$i) {
$the_line = $i + 1;
- if($start == $next_start)
- $pageDropdownList .= '<option value="'.$next_start.'" selected="selected">'.($i+1).'</option>';
- else
- $pageDropdownList .= '<option value="'.$next_start.'">'.($i+1).'</option>';
-
+ if ($start == $next_start) {
+ $pageDropdownList .= '<option value="'.$next_start.'" selected="selected">'.($i + 1).'</option>';
+ } else {
+ $pageDropdownList .= '<option value="'.$next_start.'">'.($i + 1).'</option>';
+ }
+
$next_start = $next_start + $this->params['linesToShow'];
$lastpage = $next_start;
}
$pageDropdownList .= '</select>';
-
- //
+
$lastpage = $lastpage - $this->params['linesToShow'];
- $previous = " ";
- $next = "";
+ $previous = ' ';
+ $next = '';
//Previous
- if($start > 0) {
+ if ($start > 0) {
$start_prev = $start - $this->params['linesToShow'];
$previous = '<a href="javascript://" onClick="loadList(\''.$this->link.'&order='
.$this->order.'&order_field='.$this->orderField.'&start='.$start_prev
.'\', \''.$this->divListId.'\', '.$this->modeReturn
- .');"><i class="fa fa-backward" title="' . _PREVIOUS . '"></i></a> ';
-
+ .');"><i class="fa fa-backward" title="'._PREVIOUS.'"></i></a> ';
}
//Next link
- if($start <> $lastpage) {
+ if ($start != $lastpage) {
$start_next = $start + $this->params['linesToShow'];
$next = ' <a href="javascript://" onClick="loadList(\''.$this->link.'&order='
.$this->order.'&order_field='.$this->orderField.'&start='
.$start_next.'\', \''.$this->divListId.'\', '.$this->modeReturn
- .');"><i class="fa fa-forward" title="' . _NEXT . '"></i></a> ';
+ .');"><i class="fa fa-forward" title="'._NEXT.'"></i></a> ';
}
$toolbar .= '<div class="block" style="height:'.$height.';" align="center" >';
$toolbar .= '<table width="100%" border="0"><tr>';
@@ -2467,12 +2455,11 @@ abstract class lists_Abstract extends Database
} else {
//Show toolbar if templates, tools or filters
if (
- !empty($templates) ||
- !empty($tools) ||
+ !empty($templates) ||
+ !empty($tools) ||
!empty($filters) ||
($this->params['bool_changeLinesToShow'] && $this->countResult > 0)
- )
- {
+ ) {
// $showToolbar = true;
//if no result
if ($this->countResult == 0) {
@@ -2480,13 +2467,13 @@ abstract class lists_Abstract extends Database
// $templates = ' ';
// $tools = ' ';
//if not caused by filters => list is empty
- if($this->_haveFilter() !== true) {
+ if ($this->_haveFilter() !== true) {
$filters = '';
// $showToolbar = false;
}
}
//Toolbar
- if ($this->params['bool_showToolbar']) {
+ if ($this->params['bool_showToolbar']) {
$toolbar .= '<div class="block" style="height:'.$height.';" align="center" >';
$toolbar .= '<table width="100%" border="0"><tr>';
$toolbar .= '<td align="left" width="20px" nowrap>'.$loading.'</td>';
@@ -2495,7 +2482,7 @@ abstract class lists_Abstract extends Database
$toolbar .= '<td width="10px" class="separator1">|</td>';
$toolbar .= '<td align="center" width="15%" nowrap>'.$pageDropdownList.'</td>';
$toolbar .= '<td width="10px" class="separator1">|</td>';
- $toolbar .= '<td align="center" width="15%" nowrap>'.$linesDropdownList.'</td>';
+ $toolbar .= '<td align="center" width="15%" nowrap>'.$linesDropdownList.'</td>';
$toolbar .= '<td width="10px" class="separator1">|</td>';
$toolbar .= '<td width="210px"align="right">'.$tools.'</td>';
$toolbar .= '<td width="5px" class="separator1">|</td>';
@@ -2504,49 +2491,53 @@ abstract class lists_Abstract extends Database
$toolbar .= $filters;
$toolbar .= '</table>';
$toolbar .= '</div>';
- }
+ }
}
}
-
+
$this->start = $start;
$this->end = $end;
-
+
return $toolbar;
- }
-
- protected function _createBottomToolbar($resultFirstRow) {
+ }
+ protected function _createBottomToolbar($resultFirstRow)
+ {
//Init
- $toolbar = $tools = $templates = '';
+ $toolbar = $tools = $templates = '';
$start = $end = 0;
-
+
//Loading image
$loading = '<div id="loading" style="display:none;">'
- . '<i class="fa fa-spinner fa-2x" style="vertical-align: middle;" title="loading..."></i></div>';
-
+ .'<i class="fa fa-spinner fa-2x" style="vertical-align: middle;" title="loading..."></i></div>';
+
//Lines to show
- if(isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
+ if (isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
$nbLines = $this->params['linesToShow'] = strip_tags($_REQUEST['lines']);
}
-
+
//Number of pages
- $nb_pages = ceil($this->countResult/$this->params['linesToShow']);
+ $nb_pages = ceil($this->countResult / $this->params['linesToShow']);
// $debug .='NB total '.$this->countResult.' / NB show: '.$this->params['linesToShow'].' / Pages: '.$nb_pages.' /';
-
- if(isset($_REQUEST['start']) && !empty($_REQUEST['start'])) $start = strip_tags($_REQUEST['start']);
+
+ if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
+ $start = strip_tags($_REQUEST['start']);
+ }
$end = $start + $this->params['linesToShow'];
- if($end > $this->countResult) $end = $this->countResult;
-
+ if ($end > $this->countResult) {
+ $end = $this->countResult;
+ }
+
//Get list of tools (icon and link)
$tools = $this->_getTools($resultFirstRow, $this->countResult);
-
+
//Get templates
$templates = $this->_getTemplates();
-
+
//Go to top link
- $goToTop ='<a href="javascript://" onclick="new Effect.ScrollTo(\'topOfTheList\');'
- . 'return false;" alt="Top"><i class="fa fa-arrow-up fa-2x" style="vertical-align: middle;" title="Top"></a>';
-
+ $goToTop = '<a href="javascript://" onclick="new Effect.ScrollTo(\'topOfTheList\');'
+ .'return false;" alt="Top"><i class="fa fa-arrow-up fa-2x" style="vertical-align: middle;" title="Top"></a>';
+
//Build dropdown lines object
$linesDropdownList = '';
if ($this->params['bool_changeLinesToShow']) {
@@ -2556,36 +2547,35 @@ abstract class lists_Abstract extends Database
50,
100,
250,
- 500
+ 500,
);
if (!in_array($this->params['linesToShow'], $nbLinesSelect)) {
array_push($nbLinesSelect, $this->params['linesToShow']);
}
sort($nbLinesSelect);
-
+
$linesDropdownList .= '<i class="fa fa-bars fa-2x" aria-hidden="true" title="'._SHOW.'"></i> <select name="nbLines" id="nbLines" onChange="loadList(\''.$this->link
.'&order='.$this->order.'&order_field='
.$this->orderField.'&lines=\' + this.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- //Array values
- for ($i=0; $i<count($nbLinesSelect); $i++) {
+ //Array values
+ for ($i = 0; $i < count($nbLinesSelect); ++$i) {
if ($nbLinesSelect[$i] >= $this->countResult) {
break;
}
- ($nbLinesSelect[$i] == $nbLines)? $selected = 'selected="selected" ' : $selected = '';
- $linesDropdownList .= '<option value="' . $nbLinesSelect[$i] . '" '.$selected.'>'.$nbLinesSelect[$i]._LINES.'</option>';
+ ($nbLinesSelect[$i] == $nbLines) ? $selected = 'selected="selected" ' : $selected = '';
+ $linesDropdownList .= '<option value="'.$nbLinesSelect[$i].'" '.$selected.'>'.$nbLinesSelect[$i]._LINES.'</option>';
}
//Extra value
- ($this->countResult == $nbLines || $this->countResult < $nbLines)? $selected = 'selected="selected" ' : $selected = '';
- $linesDropdownList .= '<option value="' . $this->countResult . '" '.$selected.'>'._ALL.'('.$this->countResult.')</option>';
+ ($this->countResult == $nbLines || $this->countResult < $nbLines) ? $selected = 'selected="selected" ' : $selected = '';
+ $linesDropdownList .= '<option value="'.$this->countResult.'" '.$selected.'>'._ALL.'('.$this->countResult.')</option>';
$linesDropdownList .= '</select>';
//$linesDropdownList .= '<script>if(!$(\'nbLines_chosen\')){new c($(\'nbLines\'),{width: "auto", disable_search: true});}</script>';
$linesDropdownList .= '<script> $j("#nbLines").chosen({width: "auto", disable_search: true});</script>';
}
-
+
//If there are more than 1 page, pagination
- if($nb_pages > 1) {
-
+ if ($nb_pages > 1) {
//Build dropdown navigation object
$next_start = 0;
$pageDropdownList .= _GO_TO_PAGE.' <select name="startpage" onChange="loadList(\''.$this->link
@@ -2593,38 +2583,38 @@ abstract class lists_Abstract extends Database
.$this->orderField.'&start=\' + this.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
$lastpage = 0;
- for($i = 0;$i <> $nb_pages; $i++){
+ for ($i = 0; $i != $nb_pages; ++$i) {
$the_line = $i + 1;
- if($start == $next_start)
- $pageDropdownList .= '<option value="'.$next_start.'" selected="selected">'.($i+1).'</option>';
- else
- $pageDropdownList .= '<option value="'.$next_start.'">'.($i+1).'</option>';
-
+ if ($start == $next_start) {
+ $pageDropdownList .= '<option value="'.$next_start.'" selected="selected">'.($i + 1).'</option>';
+ } else {
+ $pageDropdownList .= '<option value="'.$next_start.'">'.($i + 1).'</option>';
+ }
+
$next_start = $next_start + $this->params['linesToShow'];
$lastpage = $next_start;
}
- $pageDropdownList .= '</select>' ;
-
- //
+ $pageDropdownList .= '</select>';
+
$lastpage = $lastpage - $this->params['linesToShow'];
- $previous = " ";
- $next = "";
+ $previous = ' ';
+ $next = '';
//Previous
- if($start > 0) {
+ if ($start > 0) {
$start_prev = $start - $this->params['linesToShow'];
$previous = '<a href="javascript://" onClick="loadList(\''.$this->link.'&order='
.$this->order.'&order_field='.$this->orderField.'&start='.$start_prev
.'\', \''.$this->divListId.'\', '.$this->modeReturn
- .');"><i class="fa fa-backward" title="' . _PREVIOUS . '"></i></a> ';
+ .');"><i class="fa fa-backward" title="'._PREVIOUS.'"></i></a> ';
}
-
+
//Next link
- if($start <> $lastpage) {
+ if ($start != $lastpage) {
$start_next = $start + $this->params['linesToShow'];
$next = ' <a href="javascript://" onClick="loadList(\''.$this->link.'&order='
.$this->order.'&order_field='.$this->orderField.'&start='
.$start_next.'\', \''.$this->divListId.'\', '.$this->modeReturn
- .');"><i class="fa fa-forward" title="' . _NEXT . '"></i></a>';
+ .');"><i class="fa fa-forward" title="'._NEXT.'"></i></a>';
}
//Toolbar
@@ -2650,11 +2640,10 @@ abstract class lists_Abstract extends Database
} else {
//Show toolbar if templates or tools
if (
- !empty($templates) ||
+ !empty($templates) ||
!empty($tools) ||
$this->params['bool_changeLinesToShow']
- )
- {
+ ) {
//Toolbar
$bottomToolbar .= '<div class="block_bottom" align="center" >';
$bottomToolbar .= '<table width="100%" border="0"><tr>';
@@ -2664,7 +2653,7 @@ abstract class lists_Abstract extends Database
$bottomToolbar .= '<td width="10px" class="separator1">|</td>';
$bottomToolbar .= '<td align="center" width="15%" nowrap>'.$pageDropdownList.'</td>';
$bottomToolbar .= '<td width="10px" class="separator1">|</td>';
- $bottomToolbar .= '<td align="center" width="15%" nowrap>'.$linesDropdownList.'</td>';
+ $bottomToolbar .= '<td align="center" width="15%" nowrap>'.$linesDropdownList.'</td>';
$bottomToolbar .= '<td width="10px" class="separator1">|</td>';
$bottomToolbar .= '<td width="210px"align="right">'.$tools.'</td>';
$bottomToolbar .= '<td width="5px" class="separator1">|</td>';
@@ -2676,32 +2665,35 @@ abstract class lists_Abstract extends Database
$bottomToolbar .= '</div>';
}
}
-
+
$this->start = $start;
$this->end = $end;
-
+
return $bottomToolbar;
}
-
- protected function _createSmallToolbar () {
+
+ protected function _createSmallToolbar()
+ {
//Init
$toolbar = '';
$start = $end = 0;
-
+
//Lines to show
- if(isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
+ if (isset($_REQUEST['lines']) && !empty($_REQUEST['lines'])) {
$nbLines = $this->params['linesToShow'] = strip_tags($_REQUEST['lines']);
}
-
+
//Number of pages
- $nb_pages = ceil($this->countResult/$this->params['linesToShow']);
-
- if(isset($_REQUEST['start']) && !empty($_REQUEST['start'])) $start = strip_tags($_REQUEST['start']);
+ $nb_pages = ceil($this->countResult / $this->params['linesToShow']);
+
+ if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
+ $start = strip_tags($_REQUEST['start']);
+ }
$end = $start + $this->params['linesToShow'];
- if($end > $this->countResult) {
+ if ($end > $this->countResult) {
$end = $this->countResult;
}
-
+
//Build dropdown lines object
$linesDropdownList = '';
if ($this->params['bool_changeLinesToShow']) {
@@ -2711,38 +2703,38 @@ abstract class lists_Abstract extends Database
50,
100,
250,
- 500
+ 500,
);
if (!in_array($this->params['linesToShow'], $nbLinesSelect)) {
array_push($nbLinesSelect, $this->params['linesToShow']);
}
sort($nbLinesSelect);
-
+
$linesDropdownList = '<form name="nbLinesToShow" method="get" >';
$linesDropdownList .= '<i class="fa fa-bars fa-2x" aria-hidden="true" title="'._SHOW.'"></i>
<select name="nbLines" id="nbLines" onChange="loadList(\''.$this->link
.'&order='.$this->order.'&order_field='
.$this->orderField.'&lines=\' + document.nbLinesToShow.nbLines.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
- //Array values
- for ($i=0; $i<count($nbLinesSelect); $i++) {
+ //Array values
+ for ($i = 0; $i < count($nbLinesSelect); ++$i) {
if ($nbLinesSelect[$i] >= $this->countResult) {
break;
}
- ($nbLinesSelect[$i] == $nbLines)? $selected = 'selected="selected" ' : $selected = '';
- $linesDropdownList .= '<option value="' . $nbLinesSelect[$i] . '" '.$selected.'>'.$nbLinesSelect[$i]._LINES.'</option>';
+ ($nbLinesSelect[$i] == $nbLines) ? $selected = 'selected="selected" ' : $selected = '';
+ $linesDropdownList .= '<option value="'.$nbLinesSelect[$i].'" '.$selected.'>'.$nbLinesSelect[$i]._LINES.'</option>';
}
//Extra value
- ($this->countResult == $nbLines || $this->countResult < $nbLines)? $selected = 'selected="selected" ' : $selected = '';
- $linesDropdownList .= '<option value="' . $this->countResult . '" '.$selected.'>'._ALL.'('.$this->countResult.')</option>';
+ ($this->countResult == $nbLines || $this->countResult < $nbLines) ? $selected = 'selected="selected" ' : $selected = '';
+ $linesDropdownList .= '<option value="'.$this->countResult.'" '.$selected.'>'._ALL.'('.$this->countResult.')</option>';
$linesDropdownList .= '</select>';
//$linesDropdownList .= '<script>if(!$(\'nbLines_chosen\')){new c($(\'nbLines\'),{width: "auto"});}</script>';
$linesDropdownList .= '<script> $j("#nbLines").chosen({width: "auto"});</script>';
- $linesDropdownList .= '</form>' ;
+ $linesDropdownList .= '</form>';
}
-
+
//If there are more than 1 page, pagination
- if($nb_pages > 1) {
+ if ($nb_pages > 1) {
//Build dropdown navigation object
$next_start = 0;
$pageDropdownList = ''
@@ -2751,44 +2743,45 @@ abstract class lists_Abstract extends Database
.$this->orderField.'&start=\' + document.'.$this->formId.'.startpage.value, \''
.$this->divListId.'\', '.$this->modeReturn.');">';
$lastpage = 0;
- for($i = 0;$i <> $nb_pages; $i++){
+ for ($i = 0; $i != $nb_pages; ++$i) {
$the_line = $i + 1;
- if($start == $next_start)
- $pageDropdownList .= '<option value="'.$next_start.'" selected="selected">'.($i+1).'</option>';
- else
- $pageDropdownList .= '<option value="'.$next_start.'">'.($i+1).'</option>';
-
+ if ($start == $next_start) {
+ $pageDropdownList .= '<option value="'.$next_start.'" selected="selected">'.($i + 1).'</option>';
+ } else {
+ $pageDropdownList .= '<option value="'.$next_start.'">'.($i + 1).'</option>';
+ }
+
$next_start = $next_start + $this->params['linesToShow'];
$lastpage = $next_start;
}
- $pageDropdownList .= "</select>" ;
-
+ $pageDropdownList .= '</select>';
+
$lastpage = $lastpage - $this->params['linesToShow'];
- $previous = " ";
- $next = "";
-
+ $previous = ' ';
+ $next = '';
+
//Previous
- if($start > 0) {
+ if ($start > 0) {
$start_prev = $start - $this->params['linesToShow'];
$previous .= '<a href="javascript://" alt="'._PREVIOUS.'" onClick="loadList(\''.$this->link.'&order='
.$this->order.'&order_field='.$this->orderField.'&start='.$start_prev
.'\', \''.$this->divListId.'\', '.$this->modeReturn
- .');"><i class="fa fa-backward" title="' . _PREVIOUS . '"></i></a> ';
+ .');"><i class="fa fa-backward" title="'._PREVIOUS.'"></i></a> ';
}
-
+
//Next
- if($start <> $lastpage) {
+ if ($start != $lastpage) {
$start_next = $start + $this->params['linesToShow'];
$next = ' <a href="javascript://" alt="'._NEXT.'" onClick="loadList(\''.$this->link.'&order='
.$this->order.'&order_field='.$this->orderField.'&start='
.$start_next.'\', \''.$this->divListId.'\', '.$this->modeReturn
- .');"><i class="fa fa-forward" title="' . _NEXT . '"></i></a>';
+ .');"><i class="fa fa-forward" title="'._NEXT.'"></i></a>';
}
-
+
//Loading image
$loading = '<div id="loading" style="display:none;">'
- . '<i class="fa fa-spinner fa-2x" style="vertical-align: middle;" title="loading..."></i></div>';
-
+ .'<i class="fa fa-spinner fa-2x" style="vertical-align: middle;" title="loading..."></i></div>';
+
//Small toolbar
$toolbar .= '<table width="100%" border="0" cellspacing="0" class="zero_padding"><tr>';
$toolbar .= '<td align="left" width="15px" nowrap>'.$loading.'</td>';
@@ -2798,89 +2791,101 @@ abstract class lists_Abstract extends Database
$toolbar .= '<td align="left" width="94%">'.$pageDropdownList.'</td>';
$toolbar .= '</tr></table>';
}
-
+
$this->start = $start;
$this->end = $end;
-
+
return $toolbar;
}
-
- protected function _displayFilters() {
+
+ protected function _displayFilters()
+ {
$filters = $filtersControl = '';
- if(isset($this->params['filters']) && count($this->params['filters']) > 0) {
- $found = false;
+ if (isset($this->params['filters']) && count($this->params['filters']) > 0) {
+ $found = false;
- for ($i =0; $i<count($this->params['filters']); $i++) {
+ for ($i = 0; $i < count($this->params['filters']); ++$i) {
if (isset($_SESSION['filters'][$this->params['filters'][$i]])) {
$filtersControl .= $this->_buildFilter($this->params['filters'][$i]);
- $found = true;
+ $found = true;
}
}
if ($found) {
//Display filter
- $filters .='<div style="padding-bottom: 15px;"><form name="filters" id="filters" '
+ $filters .= '<div style="padding-bottom: 15px;"><form name="filters" id="filters" '
.'onsubmit="return false;" action="#" method="post"><i class="fa fa-filter fa-2x" title="'._FILTER_BY.'" aria-hidden="true" style="position: relative;top: 3px;"></i>: ';
$filters .= $filtersControl;
//Clear icon
- $filters .='| <a href="javascript://" title="'._CLEAR_SEARCH.'" onfocus="this.blur()" '
+ $filters .= '| <a href="javascript://" title="'._CLEAR_SEARCH.'" onfocus="this.blur()" '
.'onclick="javascript:loadList2(\''.$this->link
.'&filter=reset\', \''.$this->divListId.'\', '
.$this->modeReturn.');">'
- .'<i class="fa fa-refresh fa-2x" style="position: relative;top: 6px;" title="' . _CLEAR_SEARCH . '"></i></a>';
- $filters .='</form></div>';
+ .'<i class="fa fa-refresh fa-2x" style="position: relative;top: 6px;" title="'._CLEAR_SEARCH.'"></i></a>';
+ $filters .= '</form></div>';
} else {
$filters = _NO_CORRESPONDING_FILTERS;
}
}
+
return $filters;
}
-
- protected function _createHiddenFields() {
+
+ protected function _createHiddenFields()
+ {
$hiddenFields = '';
//Action management hidden fields
if ($this->withForm) {
- if (!empty($this->params['collId'])) $hiddenFields
+ if (!empty($this->params['collId'])) {
+ $hiddenFields
.= '<input type="hidden" id="coll_id" name="coll_id" value="'.$this->params['collId'].'">';
- if (!empty($this->params['moduleName'])) $hiddenFields
+ }
+ if (!empty($this->params['moduleName'])) {
+ $hiddenFields
.= '<input type="hidden" id="module" name="module" value="'.$this->params['moduleName'].'">';
- if (!empty($this->params['tableName'])) $hiddenFields
+ }
+ if (!empty($this->params['tableName'])) {
+ $hiddenFields
.= '<input type="hidden" id="table" name="table" value="'.$this->params['tableName'].'">';
+ }
}
//Regular hidden fields
- if(isset($this->params['hiddenFormFields']) && count($this->params['hiddenFormFields']) > 0) {
- for ($i =0; $i<count($this->params['hiddenFormFields']); $i++) {
- $hiddenFields .= '<input type="hidden" id="'
+ if (isset($this->params['hiddenFormFields']) && count($this->params['hiddenFormFields']) > 0) {
+ for ($i = 0; $i < count($this->params['hiddenFormFields']); ++$i) {
+ $hiddenFields .= '<input type="hidden" id="'
.$this->params['hiddenFormFields'][$i]['ID']
.'" name="'.$this->params['hiddenFormFields'][$i]['NAME']
.'" value="'.$this->params['hiddenFormFields'][$i]['VALUE'].'">';
}
}
+
return $hiddenFields;
}
-
- protected function _displayAddButton() {
+
+ protected function _displayAddButton()
+ {
$addButton = '';
//$addButton .= '<tr><td class="price" colspan="'.$this->countTd.'"><span class="add clearfix">';
$addButton .= '<tr><td class="price" colspan="'.$this->countTd.'">';
- if(isset($this->params['addButtonScript']) && !empty($this->params['addButtonScript'])) { //Script
+ if (isset($this->params['addButtonScript']) && !empty($this->params['addButtonScript'])) { //Script
$addButtonScript = 'onClick="javascript:'.$this->params['addButtonScript'].'"';
$addButtonLink = 'javascript://';
- } else if(isset($this->params['addButtonLink']) && !empty($this->params['addButtonLink'])) { //Link
+ } elseif (isset($this->params['addButtonLink']) && !empty($this->params['addButtonLink'])) { //Link
$addButtonScript = '';
$addButtonLink = $this->params['addButtonLink'];
} else { //Error
- $addButtonLink = '#';
+ $addButtonLink = '#';
//ERROR RETURN
}
//$addButton .= '<a href="'.$addButtonLink.'" '.$addButtonScript.'><span>'.$this->params['addButtonLabel'].'</span></a></span>';
$addButton .= '<a href="'.$addButtonLink.'" '.$addButtonScript
- .'><span><i class="fa fa-plus-square fa-3x" title="' . $this->params['addButtonLabel'] . '"></i></span></a>';
+ .'><span><i class="fa fa-plus-square fa-3x" title="'.$this->params['addButtonLabel'].'"></i></span></a>';
$addButton .= '</td></tr>';
-
+
return $addButton;
}
-
- protected function _createExtraJavascript() {
+
+ protected function _createExtraJavascript()
+ {
$str .= '<script type="text/javascript">';
$str .= ' var arr_msg_error = {\'confirm_title\' : \''.addslashes(_ACTION_CONFIRM).'\',';
$str .= ' \'validate\' : \''.addslashes(_VALIDATE).'\',';
@@ -2940,72 +2945,81 @@ abstract class lists_Abstract extends Database
$str .= '}';
$str .= '}';
$str .= ' </script>';
-
+
return $str;
}
-
- protected function _createActionsList($currentBasket) {
-
- if (count($currentBasket) > 0 ) {
-
+
+ protected function _createActionsList($currentBasket)
+ {
+ if (count($currentBasket) > 0) {
//Default action
- if(!empty($currentBasket['default_action'])) {
+ if (!empty($currentBasket['default_action'])) {
$this->params['bool_actionOnLineClick'] = true;
//Enable action management
$this->haveAction = true;
$this->params['defaultAction'] = $currentBasket['default_action'];
}
-
+
//Collection
- if(!empty($currentBasket['coll_id'])) $this->params['collId'] = $currentBasket['coll_id'];
+ if (!empty($currentBasket['coll_id'])) {
+ $this->params['collId'] = $currentBasket['coll_id'];
+ }
//Table name
- if(!empty($currentBasket['table'])) $this->params['tableName'] = $currentBasket['table'];
+ if (!empty($currentBasket['table'])) {
+ $this->params['tableName'] = $currentBasket['table'];
+ }
//Lock list
- if (!empty ($currentBasket['lock_list'])) $this->params['disabledRules'] = $currentBasket['lock_list'];
+ if (!empty($currentBasket['lock_list'])) {
+ $this->params['disabledRules'] = $currentBasket['lock_list'];
+ }
//Basket clause
- if (!empty ($currentBasket['clause'])) $this->params['basketClause'] = $currentBasket['clause'];
-
+ if (!empty($currentBasket['clause'])) {
+ $this->params['basketClause'] = $currentBasket['clause'];
+ }
+
//Actions list
if (count($currentBasket['actions']) > 0) {
$this->params['actions'] = array();
- for($i=0; $i<count($currentBasket['actions']);$i++) {
- if($currentBasket['actions'][$i]['MASS_USE'] == 'Y') {
- array_push($this->params['actions'], array('ID' => $currentBasket['actions'][$i]['ID'],
- 'LABEL' => $currentBasket['actions'][$i]['LABEL']));
+ for ($i = 0; $i < count($currentBasket['actions']); ++$i) {
+ if ($currentBasket['actions'][$i]['MASS_USE'] == 'Y') {
+ array_push($this->params['actions'], array('ID' => $currentBasket['actions'][$i]['ID'],
+ 'LABEL' => $currentBasket['actions'][$i]['LABEL'], ));
}
}
}
}
-
+
//If no action disable all form input
- if ((!isset($this->params['actions']) || count($this->params['actions']) == 0)
+ if ((!isset($this->params['actions']) || count($this->params['actions']) == 0)
&& $this->params['bool_standaloneForm'] === false
) {
$this->params['bool_checkBox'] = false;
$this->params['bool_radioButton'] = false;
} else {
//Display checkbox if both checkbox and radio type are disabled
- if ($this->params['bool_checkBox'] === false
+ if ($this->params['bool_checkBox'] === false
&& $this->params['bool_radioButton'] === false
&& $this->params['bool_standaloneForm'] === false
) {
$this->params['bool_checkBox'] = true;
}
-
+
//Enable action management
$this->haveAction = true;
}
}
-
- protected function _displayButtons() {
+
+ protected function _displayButtons()
+ {
$buttons = '';
if (isset($this->params['buttons']) && count($this->params['buttons']) > 0) {
- for($i=0; $i < count($this->params['buttons']); $i++) {
+ for ($i = 0; $i < count($this->params['buttons']); ++$i) {
//Button type
- if (isset($this->params['buttons'][$i]['TYPE']))
- $type = $this->params['buttons'][$i]['TYPE'];
- else
+ if (isset($this->params['buttons'][$i]['TYPE'])) {
+ $type = $this->params['buttons'][$i]['TYPE'];
+ } else {
$type = 'button';
+ }
$buttons .= ' <input type="'
.$type.'" name="'
.$this->params['buttons'][$i]['ID'].'" id="'
@@ -3014,18 +3028,19 @@ abstract class lists_Abstract extends Database
.$this->params['buttons'][$i]['ACTION'].'" class="button" />';
}
}
+
return $buttons;
}
-
- protected function _displayActionsList() {
+
+ protected function _displayActionsList()
+ {
$actionsList = '';
$actionsList .= ' <p align="center">';
if (count($this->params['actions']) > 0) {
-
$actionsList .= ' <b>'._ACTIONS.' :</b>';
$actionsList .= ' <select name="action" id="action">';
- $actionsList .= ' <option value="">'. _CHOOSE_ACTION.'</option>';
- for($i = 0; $i < count($this->params['actions']);$i++){
+ $actionsList .= ' <option value="">'._CHOOSE_ACTION.'</option>';
+ for ($i = 0; $i < count($this->params['actions']); ++$i) {
$actionsList .= ' <option value="'.$this->params['actions'][$i]['ID'].'">'
.$this->params['actions'][$i]['LABEL'].'</option>';
}
@@ -3033,14 +3048,15 @@ abstract class lists_Abstract extends Database
$actionsList .= ' <input type="button" name="send" id="send_mass" value="'._VALIDATE
.'" onClick="validForm(\'mass\');window.location.href=\'#top\'" class="button" />';
}
-
+
$actionsList .= $this->_displayButtons();
$actionsList .= ' </p>';
+
return $actionsList;
}
-
- protected function _createPreviewDiv() {
-
+
+ protected function _createPreviewDiv()
+ {
$str_previsualise = '<div ';
$str_previsualise .= 'id="return_previsualise" ';
$str_previsualise .= 'style="';
@@ -3060,49 +3076,51 @@ abstract class lists_Abstract extends Database
$str_previsualise .= '>';
$str_previsualise .= '<input type="hidden" id="identifierDetailFrame" value="" />';
$str_previsualise .= '</div>';
-
+
return $str_previsualise;
}
-
- protected function _buildPreviewContent($resultTheLine, $listKey, $jsonIdentifier = 'identifierDetailFrame') {
+
+ protected function _buildPreviewContent($resultTheLine, $listKey, $jsonIdentifier = 'identifierDetailFrame')
+ {
$contentArray = array();
-
+
//Get the ListKey value
$keyValue = '';
- for($i= 0; $i <= count($resultTheLine); $i++ ) {
- if($resultTheLine[$i]['column'] == $listKey) {
+ for ($i = 0; $i <= count($resultTheLine); ++$i) {
+ if ($resultTheLine[$i]['column'] == $listKey) {
$keyValue = $resultTheLine[$i]['value'];
break;
}
}
-
- foreach(array_keys($resultTheLine) as $column) { // for every column
+
+ foreach (array_keys($resultTheLine) as $column) { // for every column
$contentArray[$jsonIdentifier] = $keyValue;
$contentArray[$resultTheLine[$column]['column']] = $resultTheLine[$column]['value'];
}
-
+
/*
//If you want to use different key for action link
if (strpos($link, "@@") !== false) {
-
+
$key = "@@".$resultTheLine[$column]['column']."@@"; //build the alias
$val = $resultTheLine[$column]['value']; //get the real value
$link = str_replace($key, $val, $link); //replace alias by real value
}
}
*/
-
+
return json_encode($contentArray);
}
-
- protected function _createActionIcon($actualLine, $actualButton, $listKey='') {
+
+ protected function _createActionIcon($actualLine, $actualButton, $listKey = '')
+ {
$icon = '';
-
+
if (isset($actualButton['type']) && $actualButton['type'] == 'preview') {
if (!isset($actualButton['content']) || empty($actualButton['content'])) {
$content = $this->_buildPreviewContent($actualLine, $listKey);
} else {
- $content = $this->_buildMyLink($actualButton['content'], $actualLine);
+ $content = $this->_buildMyLink($actualButton['content'], $actualLine);
}
// $icon .= $content;
$icon .= '<a href="javascript://"';
@@ -3111,122 +3129,130 @@ abstract class lists_Abstract extends Database
.'$(\'return_previsualise\').style.display=\'none\';" ';
$icon .= ' title="'.$actualButton['tooltip'].'"';
} else {
- if(isset($actualButton['script']) && !empty($actualButton['script'])) {
+ if (isset($actualButton['script']) && !empty($actualButton['script'])) {
$script = $this->_buildMyLink($actualButton['script'], $actualLine);
$icon .= '<a href="javascript://" ';
-
+
//If javascript alert box
- if(isset($actualButton['alertText']) && !empty($actualButton['alertText'])) {
+ if (isset($actualButton['alertText']) && !empty($actualButton['alertText'])) {
$alertText = $this->_buildMyLink($actualButton['alertText'], $actualLine);
$icon .= 'onClick="if(confirm(\''.addslashes($alertText).'\')){'.$script.';} else {return false;};" ';
} else {
$icon .= 'onClick="'.$script.'" ';
}
if ($this->_checkTypeOfActionIcon($this->actionButtons, 'preview') === true) {
- $icon .= ' onMouseOver="$(\'identifierDetailFrame\').setValue(\'\'); '
- .'$(\'return_previsualise\').style.display=\'none\';" ';
- }
+ $icon .= ' onMouseOver="$(\'identifierDetailFrame\').setValue(\'\'); '
+ .'$(\'return_previsualise\').style.display=\'none\';" ';
+ }
$icon .= ' title="'.$actualButton['tooltip'].'"';
} else {
$href = $this->_buildMyLink($actualButton['href'], $actualLine, $listKey);
$icon .= '<a href="'.$href.'" title="'.$actualButton['tooltip'].'"';
-
+
//If javascript alert box
- if(isset($actualButton['alertText']) && !empty($actualButton['alertText'])) {
+ if (isset($actualButton['alertText']) && !empty($actualButton['alertText'])) {
$alertText = $this->_buildMyLink($actualButton['alertText'], $actualLine);
$icon .= ' onClick="return(confirm(\''.addslashes($alertText).'\'));" ';
if ($this->_checkTypeOfActionIcon($this->actionButtons, 'preview') === true) {
- $icon .= ' onMouseOver="$(\'identifierDetailFrame\').setValue(\'\'); '
- .'$(\'return_previsualise\').style.display=\'none\';" ';
- }
+ $icon .= ' onMouseOver="$(\'identifierDetailFrame\').setValue(\'\'); '
+ .'$(\'return_previsualise\').style.display=\'none\';" ';
+ }
}
}
}
//Style
$showLabel = true;
- if (isset($actualButton['class'])) {
+ if (isset($actualButton['class'])) {
//$icon .= ' class="'.$actualButton['class'].'">';
$icon .= '>';
if ($actualButton['class'] == 'change') {
- $icon .= '<i class="fa fa-edit fa-2x" title="' . _MODIFY . '"></i>';
+ $icon .= '<i class="fa fa-edit fa-2x" title="'._MODIFY.'"></i>';
$showLabel = false;
- } elseif($actualButton['class'] == 'delete') {
- $icon .= '<i class="fa fa-remove fa-2x" title="' . _DELETE . '"></i>';
+ } elseif ($actualButton['class'] == 'delete') {
+ $icon .= '<i class="fa fa-remove fa-2x" title="'._DELETE.'"></i>';
$showLabel = false;
- } elseif($actualButton['class'] == 'suspend') {
- $icon .= '<i class="fa fa-pause fa-2x" title="' . _SUSPEND . '"></i>';
+ } elseif ($actualButton['class'] == 'suspend') {
+ $icon .= '<i class="fa fa-pause fa-2x" title="'._SUSPEND.'"></i>';
$showLabel = false;
- } elseif($actualButton['class'] == 'authorize') {
- $icon .= '<i class="fa fa-check fa-2x" title="' . _AUTHORIZE . '"></i>';
+ } elseif ($actualButton['class'] == 'authorize') {
+ $icon .= '<i class="fa fa-check fa-2x" title="'._AUTHORIZE.'"></i>';
$showLabel = false;
- } elseif($actualButton['class'] == 'view') {
- $icon .= '<i class="fa fa-eye fa-2x" title="' . _VIEW . '"></i>';
+ } elseif ($actualButton['class'] == 'view') {
+ $icon .= '<i class="fa fa-eye fa-2x" title="'._VIEW.'"></i>';
$showLabel = false;
- } elseif($actualButton['class'] == 'use') {
- $icon .= '<i class="fa fa-dot-circle-o fa-2x" title="' . _USE . '"></i>';
+ } elseif ($actualButton['class'] == 'use') {
+ $icon .= '<i class="fa fa-dot-circle-o fa-2x" title="'._USE.'"></i>';
$showLabel = false;
}
- } else {
- $icon .= '>';
+ } else {
+ $icon .= '>';
}
//Image
- if(isset($actualButton['icon'])) {
- $icon .= '<i class="fa fa-'.$actualButton['icon'].' fa-2x" title="'.$actualButton['tooltip'].'"></i>';
+ if (isset($actualButton['icon'])) {
+ $icon .= '<i class="fa fa-'.$actualButton['icon'].' fa-2x" title="'.$actualButton['tooltip'].'"></i>';
}
//Label
- if (isset($actualButton['label']) && $showLabel) {
- $icon .= ' '.$actualButton['label'];
+ if (isset($actualButton['label']) && $showLabel) {
+ $icon .= ' '.$actualButton['label'];
}
$icon .= '</a>';
-
+
return $icon;
}
-
- protected function _checkTypeOfActionIcon($actionButtons, $type) {
- $isThisType = false;
- for($button = 0; $button < count($actionButtons); $button++) {
- if($actionButtons[$button]['type'] == $type) {
- $isThisType = true;
- break;
- }
- }
-
- return $isThisType;
- }
-
- protected function _createContent($resultArray, $listColumn, $listKey) {
+
+ protected function _checkTypeOfActionIcon($actionButtons, $type)
+ {
+ $isThisType = false;
+ for ($button = 0; $button < count($actionButtons); ++$button) {
+ if ($actionButtons[$button]['type'] == $type) {
+ $isThisType = true;
+ break;
+ }
+ }
+
+ return $isThisType;
+ }
+
+ protected function _createContent($resultArray, $listColumn, $listKey)
+ {
$content = $lineCss = '';
-
+
$content .= '<tbody>';
-
+
//Loop into the set of records
- for($theLine = $this->start; $theLine < $this->end ; $theLine++) {
+ for ($theLine = $this->start; $theLine < $this->end; ++$theLine) {
//Init
$href = '';
$resultTheLine = array();
-
+
//Simplify some values
$resultTheLine = $resultArray[$theLine];
-
+
//Get the ListKey value
$keyValue = '';
- for($i= 0; $i <= count($resultTheLine); $i++ ) {
- if($resultTheLine[$i]['column'] == $listKey) {
+ for ($i = 0; $i <= count($resultTheLine); ++$i) {
+ if ($resultTheLine[$i]['column'] == $listKey) {
$keyValue = $resultTheLine[$i]['value'];
}
}
-
+
//Check if line is disable
$lineIsDisabled = $this->_checkDisabledRules($this->params['disabledRules'], $resultTheLine);
-
+
//Alternate css for each line
- if($lineCss == '') $lineCss = 'col'; elseif($lineCss == 'col') $lineCss = '';
- if ($lineIsDisabled === true && $this->haveAction) $content .= '<tr class="disabled">';
- else $content .= '<tr class="'.$lineCss.'">';
-
-
+ if ($lineCss == '') {
+ $lineCss = 'col';
+ } elseif ($lineCss == 'col') {
+ $lineCss = '';
+ }
+ if ($lineIsDisabled === true && $this->haveAction) {
+ $content .= '<tr class="disabled">';
+ } else {
+ $content .= '<tr class="'.$lineCss.'">';
+ }
+
//Show sublist toggle icon
- if($this->params['bool_showSublist'] && !empty($this->params['sublistUrl'])){
+ if ($this->params['bool_showSublist'] && !empty($this->params['sublistUrl'])) {
if ($lineIsDisabled === true) {
$content .= '<td width="1%"><div align="center"><i class="fa fa-minus fa-2x" style="vertical-align: middle;"></i></div></td>';
} else {
@@ -3236,75 +3262,72 @@ abstract class lists_Abstract extends Database
.'"><i class="fa fa-minus fa-2x" style="vertical-align: middle;"></i></a></div></td>';
}
}
-
+
//If disable or checkbox or radio button
- if ($lineIsDisabled === true && ($this->params['bool_checkBox'] === true|| $this->params['bool_radioButton'] === true)) {
+ if ($lineIsDisabled === true && ($this->params['bool_checkBox'] === true || $this->params['bool_radioButton'] === true)) {
$content .= '<td width="1%"><div align="center"><i class="fa fa-lock fa-2x" style="vertical-align: middle;" title="'._LOCKED.'"></i></div></td>';
- } else if($this->params['bool_checkBox'] === true) {
+ } elseif ($this->params['bool_checkBox'] === true) {
$content .= '<td width="1%"><div align="center"><input type="checkbox" name="field[]" id="field" class="check" value="'
.$keyValue.'" /></div></td>';
- } else if($this->params['bool_radioButton'] === true) {
- if($_SESSION['stockCheckbox'] != null){
- $key = in_array($keyValue, $_SESSION['stockCheckbox']);
- if($key==true){
- $content .= '<td width="1%"><div align="center"><input type="Checkbox" checked="yes" name="field[]" id="field" class="check" onclick="stockCheckbox(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=multiLink\','.$keyValue.');" value="'
- .$keyValue.'" /></div></td>';
- }else{
-
- $content .= '<td width="1%"><div align="center"><input type="Checkbox" name="field[]" id="field" class="check" onclick="stockCheckbox(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=multiLink\','.$keyValue.');" value="'
+ } elseif ($this->params['bool_radioButton'] === true) {
+ if ($_SESSION['stockCheckbox'] != null) {
+ $key = in_array($keyValue, $_SESSION['stockCheckbox']);
+ if ($key == true) {
+ $content .= '<td width="1%"><div align="center"><input type="Checkbox" checked="yes" name="field[]" id="field" class="check" onclick="stockCheckbox(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=multiLink\','.$keyValue.');" value="'
+ .$keyValue.'" /></div></td>';
+ } else {
+ $content .= '<td width="1%"><div align="center"><input type="Checkbox" name="field[]" id="field" class="check" onclick="stockCheckbox(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=multiLink\','.$keyValue.');" value="'
.$keyValue.'" /></div></td>';
}
- }else{
+ } else {
$content .= '<td width="1%"><div align="center"><input type="Checkbox" name="field[]" id="field" class="check" onclick="stockCheckbox(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=multiLink\','.$keyValue.');" value="'
.$keyValue.'" /></div></td>';
}
-
}
-
+
//Show document icon
- if($this->params['bool_showIconDocument']){
+ if ($this->params['bool_showIconDocument']) {
$href = $this->_buildMyLink($this->params['viewDocumentLink'], $resultTheLine, $listKey);
$content .= '<td width="1%"><div align="center"><a href="'.$href.'" target="_blank" title="'
._VIEW_DOC.'"><i class="fa fa-download fa-2x"></i></a></div></td>';
}
-
+
//Show the rows (loop into columns)
- for($column = 0;$column < count($listColumn); $column++)
- {
+ for ($column = 0; $column < count($listColumn); ++$column) {
//If show column
- if($resultTheLine[$column]['show']==true) {
- $class ='';
-
+ if ($resultTheLine[$column]['show'] == true) {
+ $class = '';
+
//Column content
$columnValue = $this->_highlightWords($resultTheLine[$column]['value'], $this->whatSearch);
-
+
//CSS
- if (isset($resultTheLine[$column]['class']) &&
+ if (isset($resultTheLine[$column]['class']) &&
!empty($resultTheLine[$column]['class'])
) {
- $class ='class="'.$resultTheLine[$column]['class'].'"';
+ $class = 'class="'.$resultTheLine[$column]['class'].'"';
}
-
+
//Different background on ordered column
- (strpos($this->orderField, $resultTheLine[$column]['order']) !== false)?
+ (strpos($this->orderField, $resultTheLine[$column]['order']) !== false) ?
$columnStyle = ' style="background-image: url(static.php?filename=black_0.1.png);"' : $columnStyle = '';
-
+
//If there is action on line click
- if($this->params['bool_actionOnLineClick'] &&
- isset($this->params['defaultAction']) &&
- !empty($this->params['defaultAction']) &&
+ if ($this->params['bool_actionOnLineClick'] &&
+ isset($this->params['defaultAction']) &&
+ !empty($this->params['defaultAction']) &&
$lineIsDisabled === false
) {
$sAction = \Action\models\ActionModel::getActionPageById(['id' => $this->params['defaultAction']]);
if ($sAction == 'visa_mail') {
if (PROD_MODE) {
$content .= '<td'.$columnStyle.' onmouseover="this.style.cursor=\'pointer\';" '
- .'onClick="islockForSignatureBook(\'' .$keyValue. '\', \'' .$_SESSION['current_basket']['id']. '\', \'' .$_SESSION['current_basket']['group_id']. '\', true);" width="'.$resultTheLine[$column]['size'].'%" '
+ .'onClick="islockForSignatureBook(\''.$keyValue.'\', \''.$_SESSION['current_basket']['id'].'\', \''.$_SESSION['current_basket']['group_id'].'\', true);" width="'.$resultTheLine[$column]['size'].'%" '
.$class.'><div align="'.$resultTheLine[$column]['align'].'">'
.$columnValue.'</div></td>';
} else {
$content .= '<td'.$columnStyle.' onmouseover="this.style.cursor=\'pointer\';" '
- .'onClick="islockForSignatureBook(\'' .$keyValue. '\', \'' .$_SESSION['current_basket']['id']. '\', \'' .$_SESSION['current_basket']['group_id']. '\', false);" width="'.$resultTheLine[$column]['size'].'%" '
+ .'onClick="islockForSignatureBook(\''.$keyValue.'\', \''.$_SESSION['current_basket']['id'].'\', \''.$_SESSION['current_basket']['group_id'].'\', false);" width="'.$resultTheLine[$column]['size'].'%" '
.$class.'><div align="'.$resultTheLine[$column]['align'].'">'
.$columnValue.'</div></td>';
}
@@ -3322,48 +3345,45 @@ abstract class lists_Abstract extends Database
}
}
}
-
+
//Show action buttons
- for($button = 0; $button < count($this->actionButtons); $button++) {
+ for ($button = 0; $button < count($this->actionButtons); ++$button) {
$actionIsDisabled = $this->_checkDisabledRules($this->actionButtons[$button]['disabledRules'], $resultTheLine);
if ($actionIsDisabled) {
$content .= '<td width="1%"> </td>';
} else {
$content .= '<td width="1%" nowrap><div style="font-size:10px;">';
//Chceck type of action
- if(!isset($this->actionButtons[$button]['type']) or $this->actionButtons[$button]['type'] == 'standard') { //Standard icon
-
+ if (!isset($this->actionButtons[$button]['type']) or $this->actionButtons[$button]['type'] == 'standard') { //Standard icon
$content .= $this->_createActionIcon($resultTheLine, $this->actionButtons[$button], $listKey);
- } else if($this->actionButtons[$button]['type'] == 'preview') { //View icon
-
- $content .= $this->_createActionIcon($resultTheLine, $this->actionButtons[$button], $listKey);
- } else if($this->actionButtons[$button]['type'] == 'switch') { //Switch icon
-
+ } elseif ($this->actionButtons[$button]['type'] == 'preview') { //View icon
+ $content .= $this->_createActionIcon($resultTheLine, $this->actionButtons[$button], $listKey);
+ } elseif ($this->actionButtons[$button]['type'] == 'switch') { //Switch icon
//Switch rules to be ON
$switchIsOn = $this->_checkDisabledRules($this->actionButtons[$button]['switchRules'], $resultTheLine);
- //
- if(isset($this->actionButtons[$button]['on']) && $switchIsOn) { //Switch ON
- $content .= $this->_createActionIcon($resultTheLine,$this->actionButtons[$button]['on'], $listKey);
- } else if(isset($this->actionButtons[$button]['off'])) { //Switch OFF
- $content .= $this->_createActionIcon($resultTheLine,$this->actionButtons[$button]['off'], $listKey);
+
+ if (isset($this->actionButtons[$button]['on']) && $switchIsOn) { //Switch ON
+ $content .= $this->_createActionIcon($resultTheLine, $this->actionButtons[$button]['on'], $listKey);
+ } elseif (isset($this->actionButtons[$button]['off'])) { //Switch OFF
+ $content .= $this->_createActionIcon($resultTheLine, $this->actionButtons[$button]['off'], $listKey);
}
}
$content .= '</div></td>';
}
}
-
+
//Show details button
- if($this->params['bool_showIconDetails']) {
+ if ($this->params['bool_showIconDetails']) {
$href = $this->_buildMyLink($this->params['viewDetailsLink'], $resultTheLine, $listKey);
$content .= '<td width="1%"><div align="center"><a href="javascript://" onClick="javascript:window.top.location=\''
- .$href.'\'; return false;" title="'._DETAILS.'"><i class="fa fa-info-circle fa-2x" title="' . _DETAILS . '"></i></a></div></td>';
+ .$href.'\'; return false;" title="'._DETAILS.'"><i class="fa fa-info-circle fa-2x" title="'._DETAILS.'"></i></a></div></td>';
}
-
+
//End of line
$content .= '</tr>';
-
+
//Show sublist content (in another hidden line)
- if($this->params['bool_showSublist'] && !empty($this->params['sublistUrl'])){
+ if ($this->params['bool_showSublist'] && !empty($this->params['sublistUrl'])) {
$content .= '<tr class="" id="subList_'.$keyValue.'" name="subList_'
.$keyValue.'" style="display: none;"><td colspan="'
.$this->countTd.'" style="background-color: white;"><div id="div_'
@@ -3371,370 +3391,461 @@ abstract class lists_Abstract extends Database
}
}
$content .= '</tbody>';
-
+
return $content;
}
-
- public function showList($resultArray, $parameters=array(), $listKey='', $currentBasket=array()) {
+ public function showList($resultArray, $parameters = array(), $listKey = '', $currentBasket = array())
+ {
//Put in different arrays: label, show, sort of columns
if (count($resultArray) > 0 && isset($resultArray[0])) {
$listColumn = array();
$showColumn = array();
$sortColumn = array();
- for ($j=0;$j<count($resultArray[0]);$j++) {
- array_push($listColumn,$resultArray[0][$j]["label"]);
- array_push($showColumn,$resultArray[0][$j]["show"]);
- array_push($sortColumn,$resultArray[0][$j]["order"]);
+ for ($j = 0; $j < count($resultArray[0]); ++$j) {
+ array_push($listColumn, $resultArray[0][$j]['label']);
+ array_push($showColumn, $resultArray[0][$j]['show']);
+ array_push($sortColumn, $resultArray[0][$j]['order']);
}
}
-
+
//Default values
- if (!isset($parameters['bool_showToolbar'])){ $parameters['bool_showToolbar'] = true; }
- if (!isset($parameters['bool_bigPageTitle'])){ $parameters['bool_bigPageTitle'] = true; }
- if (!isset($parameters['bool_checkBox'])){ $parameters['bool_checkBox']= false; }
- if (!isset($parameters['bool_radioButton'])){ $parameters['bool_radioButton']= false; }
- if (!isset($parameters['bool_showSublist'])){ $parameters['bool_showSublist']= false; }
- if (!isset($parameters['bool_showIconDocument'])){ $parameters['bool_showIconDocument']= false; }
- if (!isset($parameters['bool_sortColumn'])){ $parameters['bool_sortColumn']= true; }
- if (!isset($parameters['bool_showIconDetails'])){ $parameters['bool_showIconDetails']= false; }
- if (!isset($parameters['bool_showAddButton'])){ $parameters['bool_showAddButton']= false; }
- if (!isset($parameters['bool_actionOnLineClick'])){ $parameters['bool_actionOnLineClick'] = false; }
- if (!isset($parameters['bool_pageInModule'])){ $parameters['bool_pageInModule']= true; }
- if (!isset($parameters['bool_showSearchTools'])){ $parameters['bool_showSearchTools']= false; }
- if (!isset($parameters['bool_showSearchBox'])){ $parameters['bool_showSearchBox']= true; }
- if (!isset($parameters['bool_showSmallToolbar'])){ $parameters['bool_showSmallToolbar']= false; }
- if (!isset($parameters['bool_showBottomToolbar'])){ $parameters['bool_showBottomToolbar']= true; }
- if (!isset($parameters['bool_showTemplateDefaultList'])){ $parameters['bool_showTemplateDefaultList']= false; }
- if (!isset($parameters['bool_standaloneForm'])){ $parameters['bool_standaloneForm']= false; }
- if (!isset($parameters['bool_modeReturn'])){ $parameters['bool_modeReturn'] = true; }
- if (!isset($parameters['divListId'])){ $parameters['divListId']= 'divList'; }
- if (!isset($parameters['searchBoxAutoCompletionParamName'])){ $parameters['searchBoxAutoCompletionParamName']= 'what'; }
- if (!isset($parameters['searchBoxAutoCompletionMinChars'])){ $parameters['searchBoxAutoCompletionMinChars']= 1; }
- if (!isset($parameters['searchBoxAutoCompletionUpdate'])){ $parameters['searchBoxAutoCompletionUpdate']= false; }
- if (!isset($parameters['viewDocumentLink'])){ $parameters['viewDocumentLink'] = $_SESSION['config']['businessappurl']
- .'index.php?display=true&editingMode=true&dir=indexing_searching&page=view_resource_controler';}
- if (!isset($parameters['viewDetailsLink'])){ $parameters['viewDetailsLink'] = $_SESSION['config']['businessappurl']
- .'index.php?page=details&dir=indexing_searching';}
- if (!isset($parameters['bool_changeLinesToShow'])){ $parameters['bool_changeLinesToShow'] = true;}
- if (!isset($parameters['linesToShow'])){ $parameters['linesToShow'] = $_SESSION['config']['nblinetoshow']; }
- if (!isset($parameters['listCss']) || empty($parameters['listCss'])){ $parameters['listCss'] = 'listing spec'; }
- if (!isset($parameters['addButtonLabel']) || empty($parameters['addButtonLabel'])){ $parameters['addButtonLabel'] = _ADD; }
- if (!isset($parameters['formId'])){ $parameters['formId']= 'formList'; $parameters['formName']= 'formList'; } else { $parameters['formName']= $parameters['formId']; }
- if (!isset($parameters['formAction'])){ $parameters['formAction']= '#'; }
- if (!isset($parameters['formMethod'])){ $parameters['formMethod']= 'POST'; }
- if (!isset($parameters['formClass'])){ $parameters['formClass']= 'forms'; }
- if (!isset($parameters['processInstructions'])){ $parameters['processInstructions'] = _CLICK_LINE_TO_PROCESS;}
-
+ if (!isset($parameters['bool_showToolbar'])) {
+ $parameters['bool_showToolbar'] = true;
+ }
+ if (!isset($parameters['bool_bigPageTitle'])) {
+ $parameters['bool_bigPageTitle'] = true;
+ }
+ if (!isset($parameters['bool_checkBox'])) {
+ $parameters['bool_checkBox'] = false;
+ }
+ if (!isset($parameters['bool_radioButton'])) {
+ $parameters['bool_radioButton'] = false;
+ }
+ if (!isset($parameters['bool_showSublist'])) {
+ $parameters['bool_showSublist'] = false;
+ }
+ if (!isset($parameters['bool_showIconDocument'])) {
+ $parameters['bool_showIconDocument'] = false;
+ }
+ if (!isset($parameters['bool_sortColumn'])) {
+ $parameters['bool_sortColumn'] = true;
+ }
+ if (!isset($parameters['bool_showIconDetails'])) {
+ $parameters['bool_showIconDetails'] = false;
+ }
+ if (!isset($parameters['bool_showAddButton'])) {
+ $parameters['bool_showAddButton'] = false;
+ }
+ if (!isset($parameters['bool_actionOnLineClick'])) {
+ $parameters['bool_actionOnLineClick'] = false;
+ }
+ if (!isset($parameters['bool_pageInModule'])) {
+ $parameters['bool_pageInModule'] = true;
+ }
+ if (!isset($parameters['bool_showSearchTools'])) {
+ $parameters['bool_showSearchTools'] = false;
+ }
+ if (!isset($parameters['bool_showSearchBox'])) {
+ $parameters['bool_showSearchBox'] = true;
+ }
+ if (!isset($parameters['bool_showSmallToolbar'])) {
+ $parameters['bool_showSmallToolbar'] = false;
+ }
+ if (!isset($parameters['bool_showBottomToolbar'])) {
+ $parameters['bool_showBottomToolbar'] = true;
+ }
+ if (!isset($parameters['bool_showTemplateDefaultList'])) {
+ $parameters['bool_showTemplateDefaultList'] = false;
+ }
+ if (!isset($parameters['bool_standaloneForm'])) {
+ $parameters['bool_standaloneForm'] = false;
+ }
+ if (!isset($parameters['bool_modeReturn'])) {
+ $parameters['bool_modeReturn'] = true;
+ }
+ if (!isset($parameters['divListId'])) {
+ $parameters['divListId'] = 'divList';
+ }
+ if (!isset($parameters['searchBoxAutoCompletionParamName'])) {
+ $parameters['searchBoxAutoCompletionParamName'] = 'what';
+ }
+ if (!isset($parameters['searchBoxAutoCompletionMinChars'])) {
+ $parameters['searchBoxAutoCompletionMinChars'] = 1;
+ }
+ if (!isset($parameters['searchBoxAutoCompletionUpdate'])) {
+ $parameters['searchBoxAutoCompletionUpdate'] = false;
+ }
+ if (!isset($parameters['viewDocumentLink'])) {
+ $parameters['viewDocumentLink'] = $_SESSION['config']['businessappurl']
+ .'index.php?display=true&editingMode=true&dir=indexing_searching&page=view_resource_controler';
+ }
+ if (!isset($parameters['viewDetailsLink'])) {
+ $parameters['viewDetailsLink'] = $_SESSION['config']['businessappurl']
+ .'index.php?page=details&dir=indexing_searching';
+ }
+ if (!isset($parameters['bool_changeLinesToShow'])) {
+ $parameters['bool_changeLinesToShow'] = true;
+ }
+ if (!isset($parameters['linesToShow'])) {
+ $parameters['linesToShow'] = $_SESSION['config']['nblinetoshow'];
+ }
+ if (!isset($parameters['listCss']) || empty($parameters['listCss'])) {
+ $parameters['listCss'] = 'listing spec';
+ }
+ if (!isset($parameters['addButtonLabel']) || empty($parameters['addButtonLabel'])) {
+ $parameters['addButtonLabel'] = _ADD;
+ }
+ if (!isset($parameters['formId'])) {
+ $parameters['formId'] = 'formList';
+ $parameters['formName'] = 'formList';
+ } else {
+ $parameters['formName'] = $parameters['formId'];
+ }
+ if (!isset($parameters['formAction'])) {
+ $parameters['formAction'] = '#';
+ }
+ if (!isset($parameters['formMethod'])) {
+ $parameters['formMethod'] = 'POST';
+ }
+ if (!isset($parameters['formClass'])) {
+ $parameters['formClass'] = 'forms';
+ }
+ if (!isset($parameters['processInstructions'])) {
+ $parameters['processInstructions'] = _CLICK_LINE_TO_PROCESS;
+ }
+
//Reset
$grid = $gridContent = '';
-
+
//Init some global vars
- $this->params = array();
+ $this->params = array();
$this->params = $parameters;
- $this->actionButtons = array();
- $this->actionButtons = $parameters['actionIcons'];
+ $this->actionButtons = array();
+ $this->actionButtons = $parameters['actionIcons'];
$this->divListId = $parameters['divListId'];
- $this->modeReturn = ($parameters['bool_modeReturn'] === true)? 'true' : 'false';
- if(isset($parameters['height']) && !empty($parameters['height'])) $this->height = $parameters['height'];
+ $this->modeReturn = ($parameters['bool_modeReturn'] === true) ? 'true' : 'false';
+ if (isset($parameters['height']) && !empty($parameters['height'])) {
+ $this->height = $parameters['height'];
+ }
$this->formId = $parameters['formId'];
$this->haveAction = false;
$this->countResult = count($resultArray);
- if(count($currentBasket) > 0) $this->currentBasket = $currentBasket;
+ if (count($currentBasket) > 0) {
+ $this->currentBasket = $currentBasket;
+ }
if ((isset($this->params['collId']) && !empty($this->params['collId']))) {
$this->collId = $this->params['collId'];
- } else if ((isset($currentBasket['coll_id']) && !empty($currentBasket['coll_id']))) {
+ } elseif ((isset($currentBasket['coll_id']) && !empty($currentBasket['coll_id']))) {
$this->collId = $currentBasket['coll_id'];
}
-
+
//Selected template or default template
- if(empty($this->template)) {
-
- if(isset($this->params['defaultTemplate']) && !empty($this->params['defaultTemplate'])) {
- $this->template = $this->params['defaultTemplate'];
- }
+ if (empty($this->template)) {
+ if (isset($this->params['defaultTemplate']) && !empty($this->params['defaultTemplate'])) {
+ $this->template = $this->params['defaultTemplate'];
+ }
}
//Action par defaut
- if(isset($parameters['defaultAction']) && !empty($parameters['defaultAction'])) {
+ if (isset($parameters['defaultAction']) && !empty($parameters['defaultAction'])) {
$this->params['bool_actionOnLineClick'] = true;
$this->haveAction = true;
}
-
+
//Standalone form
if ($parameters['bool_standaloneForm'] === true) {
- $this->params['bool_actionOnLineClick'] = false;
+ $this->params['bool_actionOnLineClick'] = false;
}
-
+
//Page picto
- if(isset($parameters['pagePicto'])) $picto_path = '<i class="fa fa-' . $parameters['pagePicto'] . ' fa-2x"></i> ';
-
+ if (isset($parameters['pagePicto'])) {
+ $picto_path = '<i class="fa fa-'.$parameters['pagePicto'].' fa-2x"></i> ';
+ }
+
//Top anchor
$grid .= '<div id="topOfTheList"></div>';
-
+
//Check ih there is a preview button before show preview div
- if ($this->_checkTypeOfActionIcon($this->actionButtons, 'preview') === true) {
- $grid .= $this->_createPreviewDiv();
+ if ($this->_checkTypeOfActionIcon($this->actionButtons, 'preview') === true) {
+ $grid .= $this->_createPreviewDiv();
}
-
+
//Page title
- if(isset($parameters['pageTitle'])) {
- if($parameters['bool_bigPageTitle'])
+ if (isset($parameters['pageTitle'])) {
+ if ($parameters['bool_bigPageTitle']) {
$grid .= '<h1>'.$picto_path.$parameters['pageTitle'].'</h1>';
- else
- $grid .= '<b>'.$picto_path.$parameters['pageTitle'].'</b><br />';
+ } else {
+ $grid .= '<b>'.$picto_path.$parameters['pageTitle'].'</b><br />';
+ }
}
-
+
//Actions list
- if(count($currentBasket) > 0) $this->_createActionsList($currentBasket);
-
+ if (count($currentBasket) > 0) {
+ $this->_createActionsList($currentBasket);
+ }
+
//Build page link
$this->link = $this->_buildPageLink();
// $grid .= 'Link = '. $this->link.''; //debug
-
+
//Search tools
$grid .= $this->_displaySearchTools();
-
+
//Toolbar
if ($this->params['bool_showSmallToolbar'] === false) {
$grid .= $this->_createToolbar($resultArray[0]);
}
-
+
//Show bottom toolbar
if (
- $this->params['bool_showSmallToolbar'] === false
+ $this->params['bool_showSmallToolbar'] === false
&& $this->params['bool_showBottomToolbar'] === true
&& $this->params['linesToShow'] > $_SESSION['config']['nblinetoshow']
&& (
- $this->countResult > $this->params['linesToShow']
+ $this->countResult > $this->params['linesToShow']
|| $this->countResult > $_SESSION['config']['nblinetoshow']
)
- )
- {
+ ) {
$bottomToolbar = $this->_createBottomToolbar($resultArray[0]);
}
-
- //If there some results
+
+ //If there some results
if (count($resultArray) > 0 || $this->params['bool_showAddButton']) {
-
//Need a form?
$this->withForm = false;
- if(
+ if (
$this->params['bool_checkBox'] === true ||
$this->params['bool_radioButton'] === true ||
count($parameters['actions'] > 0) ||
count($parameters['buttons'] > 0) ||
!empty($parameters['defaultAction'])
- )
- {
+ ) {
//Need a form!
$this->withForm = true;
$B_form = $E_form = '';
//Extra javascript to handle form
- $grid.= $this->_createExtraJavascript();
-
+ $grid .= $this->_createExtraJavascript();
+
//Build form
$B_form .= '<form name="'.$parameters['formName'].'" id="'
.$this->formId.'" action="'.$parameters['formAction'].'" method="'
.$parameters['formMethod'].'" class="'.$parameters['formClass'].'">';
- $B_form .='<input type="hidden" value=""/>';
-
+ $B_form .= '<input type="hidden" value=""/>';
+
//Get hidden fields
$gridContent .= $this->_createHiddenFields();
-
+
//Actions (list or buttons)
$E_form .= $this->_displayActionsList();
-
+
//End form
$E_form .= '</form>';
}
-
+
//Height
$B_height = $E_height = '';
- if(isset($parameters['listHeight']) && !empty($parameters['listHeight'])) {
+ if (isset($parameters['listHeight']) && !empty($parameters['listHeight'])) {
$B_height .= '<div style="height:'.$parameters['listHeight'].';overflow-x: hidden;overflow-y: auto;"><div style="height:97%;">';
// $B_height .= '<div class="fixed-table-container"><div class="header-height"></div><div class="fixed-table-container-inner">';
$E_height .= '</div></div>';
}
-
+
//Template mode
- if (!empty($this->template) && $this->template <> 'none') {
+ if (!empty($this->template) && $this->template != 'none') {
//Build the grid from template
$gridContent .= $this->_buildTemplate($_SESSION['html_templates'][$this->template]['PATH'], $resultArray, $listKey, $parameters);
-
+
//Build the list
- $grid .= $B_form . $B_height . $gridContent . $E_height . $E_form;
-
- //Normal mode
+ $grid .= $B_form.$B_height.$gridContent.$E_height.$E_form;
+
+ //Normal mode
} else {
//Header
$gridContent .= $this->_createHeader($resultArray[0], $listColumn, $showColumn, $sortColumn);
-
+
//Content
- $gridContent.= $this->_createContent($resultArray, $listColumn, $listKey) ;
-
+ $gridContent .= $this->_createContent($resultArray, $listColumn, $listKey);
+
//Build the list
- (!empty($this->params['listCss']))? $listCss = 'class="'.$this->params['listCss'].'"' : $listCss = '';
- $grid .= $B_form . $B_height . '<table cellspacing="0" border="0" cellpadding="0" align="center" '
- .$listCss.'>' . $gridContent . '</table>' . $E_height . $E_form. $bottomToolbar ;
+ (!empty($this->params['listCss'])) ? $listCss = 'class="'.$this->params['listCss'].'"' : $listCss = '';
+ $grid .= $B_form.$B_height.'<table cellspacing="0" border="0" cellpadding="0" align="center" '
+ .$listCss.'>'.$gridContent.'</table>'.$E_height.$E_form.$bottomToolbar;
}
-
+
//Process instructions
- if($this->params['bool_actionOnLineClick'] === true) $grid .= '<em>'.$parameters['processInstructions'].'</em>';
+ if ($this->params['bool_actionOnLineClick'] === true) {
+ $grid .= '<em>'.$parameters['processInstructions'].'</em>';
+ }
}
-
+
//Show the list
- if ($this->params['bool_modeReturn'] === true){
+ if ($this->params['bool_modeReturn'] === true) {
return $this->_parse($grid);
} else {
echo $this->_parse($grid);
}
}
-
- protected function _parse($text) {
+
+ protected function _parse($text)
+ {
//...
$text = str_replace("\r\n", "\n", $text);
$text = str_replace("\r", "\n", $text);
- //
- $text = str_replace("\n", "\\n ", $text);
+ $text = str_replace("\n", '\\n ', $text);
+
return $text;
}
-
- public function loadList($target, $showLoading=true, $divListId='divList', $returnMode = 'true', $init='true') {
+
+ public function loadList($target, $showLoading = true, $divListId = 'divList', $returnMode = 'true', $init = 'true')
+ {
$list = "\n";
- $loading ='';
-
+ $loading = '';
+
//Reset filters
$this->_resetFilter();
-
+
//Reset html template list url
$this->_resetUrlTemplates();
-
+
//Create javascript load list function
$list .= '<script type="text/javascript">loadList(\''.$target.'&display=true\', \''.$divListId.'\', '.$returnMode.', '.$init.');</script>';
-
+
//Show loading image?
if ($showLoading === true) {
$loading = '<i class="fa fa-spinner fa-2x"></i>';
}
-
+
//Content div
$list .= '<div id="'.$divListId.'" name="'.$divListId.'">'.$loading.'</div>';
-
+
return $list;
-
}
- public function loadList2($target, $showLoading=true, $divListId='divList', $returnMode = 'true', $init='true') {
+
+ public function loadList2($target, $showLoading = true, $divListId = 'divList', $returnMode = 'true', $init = 'true')
+ {
$list = "\n";
- $loading ='';
+ $loading = '';
//Reset filters
$this->_resetFilter2();
-
+
//Reset html template list url
$this->_resetUrlTemplates();
-
+
//Create javascript load list function
$list .= '<script type="text/javascript">loadList2(\''.$target.'&display=true\', \''.$divListId.'\', '.$returnMode.', '.$init.');</script>';
-
+
//Show loading image?
if ($showLoading === true) {
$loading = '<i class="fa fa-spinner fa-2x"></i>';
}
-
+
//Content div
$list .= '<div id="'.$divListId.'" name="'.$divListId.'">'.$loading.'</div>';
-
+
return $list;
-
}
-
- public function debug($viewAll=true) {
-
- $debug .='<br/><pre>';
- $debug .='<b>Request:</b><br />';
+
+ public function debug($viewAll = true)
+ {
+ $debug .= '<br/><pre>';
+ $debug .= '<b>Request:</b><br />';
$debug .= print_r($_REQUEST, true);
- $debug .='<br/><b>Return mode:</b> '.$this->modeReturn;
- $debug .='<br/><b>Link:</b> '.$this->link.'<br/>';
- $debug .='<b>Have action:</b> '.$this->haveAction.'<br />';
- $debug .='<b>With form:</b> '.$this->withForm.'<br />';
- $debug .='<b>Selected template:</b> '.$this->template.'<br />';
- $debug .='<b>Parameters:</b><br />';
+ $debug .= '<br/><b>Return mode:</b> '.$this->modeReturn;
+ $debug .= '<br/><b>Link:</b> '.$this->link.'<br/>';
+ $debug .= '<b>Have action:</b> '.$this->haveAction.'<br />';
+ $debug .= '<b>With form:</b> '.$this->withForm.'<br />';
+ $debug .= '<b>Selected template:</b> '.$this->template.'<br />';
+ $debug .= '<b>Parameters:</b><br />';
$debug .= print_r($this->params, true);
if ($viewAll) {
- $debug .='<br/><b>Current basket:</b><br />';
+ $debug .= '<br/><b>Current basket:</b><br />';
$debug .= print_r($this->currentBasket, true);
// $debug .='<br/><b>Lists:</b></br>';
- // $debug .= print_r($_SESSION['lists'], true);
- $debug .='<br/><b>Filters:</b><br />';
+ // $debug .= print_r($_SESSION['lists'], true);
+ $debug .= '<br/><b>Filters:</b><br />';
$debug .= print_r($_SESSION['filters'], true);
- $debug .='<br/><b>Filter clause:</b> '.$this->getFilters().'<br />';
- $debug .='<b>Templates:</b><br />';
+ $debug .= '<br/><b>Filter clause:</b> '.$this->getFilters().'<br />';
+ $debug .= '<b>Templates:</b><br />';
$debug .= print_r($_SESSION['html_templates'], true);
}
- $debug .='</pre>';
+ $debug .= '</pre>';
if ($this->params['bool_modeReturn']) {
-
//Fix some json line breaks issues
- $debug = str_replace(chr(10), "", $debug);
- $debug = str_replace(chr(13), "", $debug);
+ $debug = str_replace(chr(10), '', $debug);
+ $debug = str_replace(chr(13), '', $debug);
+
return $debug;
} else {
echo $debug;
}
}
-
- public function getLink() {
+
+ public function getLink()
+ {
return $this->link;
}
-
- public function getStart() {
+
+ public function getStart()
+ {
return $this->start;
- }
-
- public function getOrder() {
+ }
+
+ public function getOrder()
+ {
return $this->order;
}
-
- public function getOrderField() {
+
+ public function getOrderField()
+ {
return $this->orderField;
}
-
- public function setOrder($order='desc') {
+
+ public function setOrder($order = 'desc')
+ {
$this->order = $order;
}
-
- public function setOrderField($field) {
+
+ public function setOrderField($field)
+ {
$this->orderField = $field;
}
-
- public function getWhatSearch() {
+
+ public function getWhatSearch()
+ {
return $this->whatSearch;
}
-
- public function getFilters() {
+
+ public function getFilters()
+ {
$filtersClause = '';
$filtersArray = array();
-
+
foreach ($_SESSION['filters'] as $key => $val) {
if (!empty($_SESSION['filters'][$key]['CLAUSE'])) {
array_push($filtersArray, $_SESSION['filters'][$key]['CLAUSE']);
}
}
- if (count($filtersArray) > 0) $filtersClause .= '('.implode(' and ', $filtersArray).')'; //Build
-
+ if (count($filtersArray) > 0) {
+ $filtersClause .= '('.implode(' and ', $filtersArray).')';
+ } //Build
+
return $filtersClause;
}
-
- public function getTemplate() {
- return $this->template;
+
+ public function getTemplate()
+ {
+ return $this->template;
}
-
- public function setTemplate($template) {
- $this->template = $template;
+
+ public function setTemplate($template)
+ {
+ $this->template = $template;
}
-
- public function setCollection($collId) {
- $this->collId = $collId;
+
+ public function setCollection($collId)
+ {
+ $this->collId = $collId;
}
}
diff --git a/apps/maarch_entreprise/css/engine.css b/apps/maarch_entreprise/css/engine.css
index 3b24f6ac15937aa754f48e69ba86d5b592c595ee..36035cf4f125d4913d007ae02fb8c12b534833e4 100755
--- a/apps/maarch_entreprise/css/engine.css
+++ b/apps/maarch_entreprise/css/engine.css
@@ -77,7 +77,7 @@ table tr:not(.filters) .mat-input-container {
/* modal part */
.modal-content {
- background-color: #009DC5 !important;
+ background-color: #135F7F !important;
}
.modal-header h4 {
@@ -94,7 +94,7 @@ table tr:not(.filters) .mat-input-container {
}
.modal-body .list-group li {
- /*border-color: #009DC5 !important;*/
+ /*border-color: #135F7F !important;*/
font-weight: bold;
}
diff --git a/apps/maarch_entreprise/css/profile.component.css b/apps/maarch_entreprise/css/profile.component.css
index 5b0297a92351fc3647274df34d77cec24f0da50e..ec1a5e4c16c0dc52bec414f1561503195f69e3ec 100755
--- a/apps/maarch_entreprise/css/profile.component.css
+++ b/apps/maarch_entreprise/css/profile.component.css
@@ -7,7 +7,7 @@ h1 {
}
h2{
- background-color: #009DC5 !important;
+ background-color: #135F7F !important;
color: white !important;
margin-top: -10px !important;
margin-left: -10px !important;
diff --git a/apps/maarch_entreprise/css/reports.css b/apps/maarch_entreprise/css/reports.css
index 16a7a33742633b10a6562020c896df343e732732..349cdc9e868b95d6c98a2fc5128e411ef657202b 100755
--- a/apps/maarch_entreprise/css/reports.css
+++ b/apps/maarch_entreprise/css/reports.css
@@ -29,7 +29,7 @@ width: 15%;
h2 {
font-size: 16px;
clear: both;
- background-color: #009DC5;
+ background-color: #135F7F;
padding: 0.5em;
margin-left: -10px;
margin-right: -10px;
@@ -39,7 +39,7 @@ h2 {
}
.block h2 {
- background-color: #009DC5;
+ background-color: #135F7F;
padding: 0.5em;
margin-left: -10px;
margin-right: -10px;
diff --git a/apps/maarch_entreprise/css/styles.css b/apps/maarch_entreprise/css/styles.css
index 44ad4ac2248c53ab8c3dd19593f4c86f9921d2c9..089d169536d000d829922bf5749263767c1869e8 100755
--- a/apps/maarch_entreprise/css/styles.css
+++ b/apps/maarch_entreprise/css/styles.css
@@ -16,15 +16,15 @@ html {
width: auto;
/*padding: 0px;
color: #666;
-background-color: #CEE9F1;
-border-top: solid 2px #FDD16C;
-border-bottom: solid 2px #FDD16C;
+background-color: #F2F2F2;
+border-top: solid 2px #F99830;
+border-bottom: solid 2px #F99830;
padding: 10px;*/
}
.func {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -37,7 +37,7 @@ padding: 10px;*/
}
.detailsTab {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -51,7 +51,7 @@ padding: 10px;*/
}
.whole-panel{
- background: #009DC5;
+ background: #135F7F;
border: 1px solid #000;
display: inline-block;
height: 650px;
@@ -72,7 +72,7 @@ padding: 10px;*/
.diffusion-list{
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -87,7 +87,7 @@ padding: 10px;*/
.print-folder {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -101,7 +101,7 @@ padding: 10px;*/
.visa-circuit{
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -114,7 +114,7 @@ padding: 10px;*/
}
.opinion-circuit {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -127,7 +127,7 @@ padding: 10px;*/
}
.attached-files {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -140,7 +140,7 @@ padding: 10px;*/
}
.answers-done{
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -153,7 +153,7 @@ padding: 10px;*/
}
.history{
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -166,7 +166,7 @@ padding: 10px;*/
}
.notes {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -179,7 +179,7 @@ padding: 10px;*/
}
.matter{
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -192,7 +192,7 @@ padding: 10px;*/
}
.email{
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -205,7 +205,7 @@ padding: 10px;*/
}
.versions{
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -218,7 +218,7 @@ padding: 10px;*/
}
.links {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -252,7 +252,7 @@ body {
}
select{
background: white;
- border: solid 1px #009DC5;
+ border: solid 1px #135F7F;
}
#validation_page
@@ -296,7 +296,7 @@ a, a:link, a:visited, a:hover {
}
a:hover {
- color: #1B99C4;
+ color: #135F7F;
}
.bloc {
@@ -398,11 +398,11 @@ acronym, abbr {
}
.maarch, a.maarch {
- color: #1B99C4;
+ color: #135F7F;
}
.maarch2, a.maarch2 {
- color: #FFC200;
+ color: #F99830;
}
.oblig {
@@ -424,7 +424,7 @@ acronym, abbr {
.sstit {
- color: #1B99C4;
+ color: #135F7F;
font-size: 1em;
font-weight: normal;
padding-bottom: 1em;
@@ -443,7 +443,7 @@ a.next, a.change, a.suspend, a.delete, a.authorize, a.prev, a.up, a.down, a.view
padding-left: 20px;
/*background: transparent url(static.php?filename=puce_prev.gif) 10px center no-repeat;*/
background: transparent 10px center no-repeat;
- color: #16ADEB;
+ color: #135F7F;
}
a.up {
@@ -507,7 +507,7 @@ a.authorize {
.add span {
padding: 4px 0 5px 4px;
background-color: White;
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
border-left: none;
border-right: none;
}
@@ -698,7 +698,7 @@ input.medium2 {
}
#newpage1, #newpage2 {
text-align: center;
- color: #16ADEB;
+ color: #135F7F;
}
input.detail_box {
@@ -711,7 +711,7 @@ input.detail_box {
}
#frmletters a:hover, #frmletters a.on {
- color: #16ADEB;
+ color: #135F7F;
}
#frmletters fieldset {
@@ -767,10 +767,10 @@ input.detail_box {
input.button {
- border: 1px solid #FDD16C;
+ border: 1px solid #F8BB30;
color: #756666;
- background-color: #FDD16C;
+ background-color: #F8BB30;
border-radius: 3px;
cursor: pointer;
@@ -908,21 +908,21 @@ width: 770px;
}
.listing th {
- color: #16ADEB;
+ color: #135F7F;
}
.listingIndex th {
- color: #16ADEB;
+ color: #135F7F;
}
.listingsmall th {
- color: #16ADEB;
+ color: #135F7F;
}
.listing2 th {
- color: #16ADEB;
+ color: #135F7F;
}
.listing3 th {
- color: #16ADEB;
+ color: #135F7F;
}
.listing th .add {
font-weight: normal;
@@ -1009,11 +1009,11 @@ width: 770px;
}
.listing2 td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listing3 td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listingsmall td {
@@ -1021,11 +1021,11 @@ width: 770px;
}
.listing .col td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listingIndex .col td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listing .white td {
@@ -1041,7 +1041,7 @@ width: 770px;
}
.listingsmall .col td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
td.picto, th.picto, td.action {
@@ -1211,7 +1211,7 @@ th.ref {
text-align: left;
}
.detail .col th {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.detail td.void {
@@ -1268,7 +1268,7 @@ th.ref {
#head {
padding-top: 1px;
width: 100%;
- background-color: #16ADEB;
+ background-color: #135F7F;
height: 70px;
}
@@ -1351,8 +1351,8 @@ th.ref {
height: 70px;
margin-top: 3px;
min-width: 1000px;
- border:solid 2px #009DC5;
- background: #009DC5;
+ border:solid 2px #135F7F;
+ background: #135F7F;
/*border-radius: 10px;*/
}
@@ -1403,16 +1403,16 @@ th.ref {
#menunav {
overflow: hidden;
width: 260px;
- background: #CEE9F1;
+ background: #F2F2F2;
position: absolute;
left: -12px;
padding: 0px;
z-index: 10;
margin: 0px;
- border: 2px solid #009DC5;
+ border: 2px solid #135F7F;
top: 28px;
border-bottom: none;
- border-top: solid 3px #009DC5;
+ border-top: solid 3px #135F7F;
}
#menunav li {
@@ -1422,7 +1422,7 @@ th.ref {
#menunav li a {
padding-right: 3px;
- color: #0094D0;
+ color: #135F7F;
display: block;
position: relative;
}
@@ -1450,147 +1450,7 @@ th.ref {
}
#menunav li.on span {
- background-image: url(static.php?filename=bg_menu_span_on.gif);
-}
-li#admin .menu_item {
- background-image: url(static.php?filename=picto_menu_admin.gif);
-}
-li#admin.on .menu_item {
- background-image: url(static.php?filename=picto_menu_admin_on.gif);
-}
-td#admin {
- background: url(static.php?filename=picto_menu_admin.gif) no-repeat;
-}
-
-
-li#aide .menu_item {
- background-image: url(static.php?filename=picto_menu_help.gif);
-}
-li#aide.on .menu_item {
- background-image: url(static.php?filename=picto_menu_help_on.gif);
-}
-td#aide {
- background: url(static.php?filename=picto_menu_help.gif) no-repeat;
-}
-
-li#add .menu_item {
- background-image: url(static.php?filename=picto_menu_fileindex.gif);
-}
-li#add.on .menu_item{
- background-image: url(static.php?filename=picto_menu_fileindex_on.gif);
-}
-td#add {
- background: url(static.php?filename=picto_menu_fileindex.gif) no-repeat;
-}
-
-li#post .menu_item {
- background-image: url(static.php?filename=picto_menu_postindex.gif);
-}
-li#post.on .menu_item {
- background-image: url(static.php?filename=picto_menu_postindex_on.gif);
-}
-td#post {
- background: url(static.php?filename=picto_menu_postindex.gif) no-repeat;
-}
-
-li#browse .menu_item {
- background-image: url(static.php?filename=stats_menu_off.gif);
-}
-li#browse.on .menu_item {
- background-image: url(static.php?filename=stats_menu_on.gif);
-}
-td#browse {
- background: url(static.php?filename=stats_menu_off.gif) no-repeat;
-}
-
-li#valid_mail .menu_item {
- background-image: url(static.php?filename=valid_menu_off.gif);
-}
-li#valid_mail.on .menu_item {
- background-image: url(static.php?filename=valid_menu_on.gif);
-}
-td#valid_mail {
- background: url(static.php?filename=valid_menu_off.gif) no-repeat;
-}
-
-li#maarch_credits .menu_item {
- background-image: url(static.php?filename=picto_menu_help.gif);
-}
- li#maarch_credits.on .menu_item {
- background-image: url(static.php?filename=picto_menu_help_on.gif);
-}
-td#maarch_credits {
- background: url(static.php?filename=picto_menu_help.gif) no-repeat;
-}
-
-li#logout .menu_item {
- background-image: url(static.php?filename=logout_off.gif);
-}
-li#logout.on .menu_item {
- background-image: url(static.php?filename=logout_on.gif);
-}
-td#logout {
- background: url(static.php?filename=logout_off.gif) no-repeat;
-}
-
-li#manbask .menu_item {
- background-image: url(static.php?filename=manage_baskets_off.gif);
-}
-li#manbask.on .menu_item {
- background-image: url(static.php?filename=manage_baskets_on.gif);
-}
-td#manbask {
- background: url(static.php?filename=manage_baskets_off.gif) no-repeat;
-}
-
-li#searching .menu_item {
- background-image: url(static.php?filename=searching_off.gif);
-}
-li#searching.on .menu_item {
- background-image: url(static.php?filename=searching_on.gif);
-}
-td#searching {
- background: url(static.php?filename=searching_off.gif) no-repeat;
-}
-
-li#market_search .menu_item {
- background-image: url(static.php?filename=search_proj_off.gif);
-}
-li#market_search.on .menu_item {
- background-image: url(static.php?filename=search_proj_on.gif);
-}
-td#market_search {
- background: url(static.php?filename=search_proj_off.gif) no-repeat;
-}
-
-li#account .menu_item{
- background-image: url(static.php?filename=account_off.gif);
-}
-li#account.on .menu_item {
- background-image: url(static.php?filename=account_on.gif);
-}
-td#account {
- background: url(static.php?filename=account_off.gif) no-repeat;
-}
-
-li#my_contacts .menu_item{
- background-image: url(static.php?filename=my_contacts_off.gif);
-}
-li#my_contacts.on .menu_item {
- background-image: url(static.php?filename=my_contacts_on.gif);
-}
-td#my_contacts {
- background: url(static.php?filename=my_contacts_off.gif) no-repeat;
-}
-
-li#indexing .menu_item{
- background-image: url(static.php?filename=indexing_off.gif);
-}
-li#indexing.on .menu_item{
- background-image: url(static.php?filename=indexing_on.gif);
-}
-td#indexing {
- background: url(static.php?filename=indexing_off.gif) no-repeat;
+ background: #135F7F;
}
#menunav li ol {
@@ -1611,7 +1471,7 @@ td#indexing {
}
#menunav li ol li a, #menunav li.on ol li a {
- color: #16ADEB;
+ color: #135F7F;
display: inline;
}
@@ -1664,7 +1524,7 @@ td#indexing {
}
#content h1 {
- color: #009dc5;
+ color: #135F7F;
/*font-style: italic;*/
font-weight: bold;
font-size: 1.3em;
@@ -1679,7 +1539,7 @@ td#indexing {
width: auto;
}
#nav h1 {
- color: #16ADEB;
+ color: #135F7F;
font-style: italic;
font-weight: bold;
font-size: 1.5em;
@@ -1831,7 +1691,7 @@ vertical-align: middle;
#infos_box #postpagin #count {
font-size: 1.2em;
- color: #16ADEB;
+ color: #135F7F;
font-weight: bold;
float: right;
}
@@ -1959,7 +1819,7 @@ padding-left :15px;
}
#list .file .on a {
- color: #1b99c4;
+ color: #135F7F;
}
#list .file .on li a {
@@ -2072,7 +1932,7 @@ padding-left :15px;
}
#summary a {
- color: #1B99C4;
+ color: #135F7F;
}
#summary a:hover {
@@ -2144,7 +2004,7 @@ margin-bottom: 3px;
#calender .week .today {
background-color: #dbf0fb;
font-weight: bold;
- color: #1B99C4;
+ color: #135F7F;
}
#calender .week .holiday {
@@ -2154,7 +2014,7 @@ color: #CCC;
#calender .week .hoverEle {
background-color: #dbf0fb;
- color: #1B99C4;
+ color: #135F7F;
}
#basis #calender select {
@@ -2298,7 +2158,7 @@ color: #CCC;
.red_asterisk
{
- color: #FFC200;
+ color: #F99830;
font-weight: bold;
font-size: 7px;
vertical-align:middle;
@@ -2314,7 +2174,7 @@ color: #CCC;
.blue_asterisk
{
- color: #1B99C4;
+ color: #135F7F;
font-weight: bold;
font-size: 14px;
vertical-align:top;
@@ -2395,7 +2255,7 @@ color: #CCC;
#guide_summary .tit a
{
- color: #1B99C4;
+ color: #135F7F;
}
#guide_summary .tit a:hover
@@ -2528,7 +2388,7 @@ margin-left: 10px;
#folder_tree
{
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
padding: 2px 5px 5px 2px;
vertical-align:top;
@@ -2541,14 +2401,14 @@ text-align:left;
#form1
{
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
padding-top:10px;
margin-bottom: 10px;
}
#form2
{
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
padding-top:10px;
text-align:left;
padding-left: 5px;
@@ -2777,11 +2637,11 @@ input[type="checkbox"] , input[type="radio"]
}
.listing .col td input[type="radio"]{
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listingsmall .col td input[type="radio"]{
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
#folder_out_form
@@ -2800,16 +2660,16 @@ input[type="checkbox"] , input[type="radio"]
{
padding: 0px;
color: #666;
-background-color: #CEE9F1;
-border-top: solid 2px #FDD16C;
-border-bottom: solid 2px #FDD16C;
+background-color: #F2F2F2;
+border-top: solid 2px #F99830;
+border-bottom: solid 2px #F99830;
padding:10px;
}
.block h2
{
/*background-color: #2980b9;*/
-background-color: #009DC5;
+background-color: #135F7F;
padding: 0.5em;
margin-left: -10px;
margin-right: -10px;
@@ -2834,7 +2694,7 @@ padding-top : 5px;
padding-left : 5px;
padding-right : 5px;
padding-bottom : 5px;
-background-color: #deedf3;
+background-color: #F2F2F2;
}
.block_end{
@@ -2859,7 +2719,7 @@ color: #333333;
/*font-style: italic;*/
font-weight: bold;
letter-spacing: 0.1em;
-border: 1px solid #FFC200;
+border: 1px solid #F99830;
position: absolute;
padding: 2px;
top: 0px;
@@ -2898,7 +2758,7 @@ cursor:pointer;
margin-top: 15px;
margin-left: 55px;
display:block;
- color: #1B99C4;
+ color: #135F7F;
}
.welcome{
@@ -2908,7 +2768,7 @@ font-size: 14px;
.header_menu{
display:none;
- background-color: #009DC5;
+ background-color: #135F7F;
height:23px;
color:white;
@@ -2919,7 +2779,7 @@ font-size: 14px;
}
.footer_menu{
- background-color: #1B91BA;
+ background-color: #135F7F;
height:15px;
width:100%;
font-weight: bold;
@@ -3017,7 +2877,7 @@ div.autocomplete ul li span.informal {
/* HR */
hr{
border: none;
- background-color: #FFC200;
+ background-color: #F99830;
height: 2px;
width: 100%;
}
@@ -3098,12 +2958,12 @@ hr{
display: block;
float: left;
cursor: pointer;
- /*background-color: #deedf3;*/
+ /*background-color: #F2F2F2;*/
text-align:center;
}
.admin_item:hover {
- color: #009DC5;
+ color: #135F7F;
}
.admin_item div
@@ -3185,13 +3045,13 @@ hr{
margin-top: 10px;
margin-bottom: 10px;
height: 30px;
- /*color: #1B91BA;*/
+ /*color: #135F7F;*/
/*text-decoration: underline;*/
font-weight: bold;
font-size: 18px;
/*background-color: #CFD3FF;*/
text-align: center;
- background-color: #deedf3;
+ background-color: #F2F2F2;
}
/* Modal */
@@ -3216,9 +3076,9 @@ height: 100%;*/
margin-left:auto;
margin-right:auto;
background-color:white;
- background-color: #DEEDF3;
- border-top: solid 2px #FDD16C;
- border-bottom: solid 2px #FDD16C;
+ background-color: #F2F2F2;
+ border-top: solid 2px #F99830;
+ border-bottom: solid 2px #F99830;
overflow: auto;
-webkit-box-shadow: 0px 0px 21px 0px rgba(0,0,0,0.75);
-moz-box-shadow: 0px 0px 21px 0px rgba(0,0,0,0.75);
@@ -3227,7 +3087,7 @@ height: 100%;*/
}
.modal h2 {
-background-color: #009DC5;
+background-color: #135F7F;
padding: 0.5em;
color: #ffffff;
margin-top: -10px;
@@ -3394,7 +3254,7 @@ div.autocomplete ul li.selected {
}
div.autocomplete ul li {
- /*background-color: #DEEDF3;*/
+ /*background-color: #F2F2F2;*/
list-style-type:none;
display: block;
margin: 0;
@@ -3425,7 +3285,7 @@ padding : 4px 3px 1px 1px;
.block .check
{
- background-color: #deedf3;
+ background-color: #F2F2F2;
}
.indexing_error
@@ -3605,7 +3465,7 @@ a.legend hr
}
.selectedLetter {
- background:#16ADEB;
+ background:#135F7F;
color:#FFFFFF;
padding: 2px;
}
@@ -3681,7 +3541,7 @@ table.listing {
a.actionList {
padding-left: 20px;
background: transparent 10px center no-repeat;
- color: #16ADEB;
+ color: #135F7F;
}
.nbResZero{
@@ -3692,7 +3552,7 @@ a.actionList {
}
.nbRes{
- background: #FFC200;
+ background: #F99830;
color: white;
padding: 3px;
border-radius: 7px;
@@ -3719,15 +3579,15 @@ a.actionList {
}
.mClightBlue{
- color: #CEE9F1;
+ color: #F2F2F2;
}
.mCpaleBlue{
- color: #DEEDF3;
+ color: #F2F2F2;
}
.mCdarkOrange{
- color: #FFC200;
+ color: #F99830;
}
.mCsoDarkOrange{
@@ -3783,7 +3643,7 @@ width:auto;
}
.DetailsTabFunc {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -3796,7 +3656,7 @@ width:auto;
}
.detailsTab {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -3810,7 +3670,7 @@ width:auto;
}
.whole-panel{
- background: #009DC5;
+ background: #135F7F;
border: 1px solid #000;
display: inline-block;
height: 650px;
@@ -3825,7 +3685,7 @@ width:auto;
}
.attachmentIcon .iconDoc a i {
- color:#16ADEB;
+ color:#135F7F;
}
.typeahead__list {
diff --git a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
index 691cb60bec0a6dc8095d045f04c3fc13bf667bbc..48a4f11b9b04a40cf6a35825166744b5cad6b931 100755
--- a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
@@ -20,81 +20,80 @@
*/
/**
-* @brief Displays document list in search mode
-*
-* @file
-* @author Yves Christian Kpakpo <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup apps
-*/
+ * @brief Displays document list in search mode
+ *
+ * @file
+ *
+ * @author Yves Christian Kpakpo <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup apps
+ */
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_request.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR.'class_contacts_v2.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR.'class_lists.php';
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_request.php";
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_security.php";
-require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_contacts_v2.php";
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php";
-require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_lists.php";
-
$status_obj = new manage_status();
-$sec = new security();
+$sec = new security();
$core_tools = new core_tools();
-$request = new request();
-$contact = new contacts_v2();
-$list = new lists();
+$request = new request();
+$contact = new contacts_v2();
+$list = new lists();
//Labels
-if($core_tools->is_module_loaded('labels')) {
- require_once "modules" . DIRECTORY_SEPARATOR . "labels" . DIRECTORY_SEPARATOR
- . "class" . DIRECTORY_SEPARATOR
- . "class_modules_tools.php";
- $labels = new labels();
+if ($core_tools->is_module_loaded('labels')) {
+ require_once 'modules'.DIRECTORY_SEPARATOR.'labels'.DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR
+ .'class_modules_tools.php';
+ $labels = new labels();
}
//Include definition fields
-include_once('apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'definition_mail_categories.php');
+include_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'definition_mail_categories.php';
//Parameters
$urlParameters = '';
//Mode
$mode = 'normal';
- if(isset($_REQUEST['mode'])&& !empty($_REQUEST['mode']))
- {
- $mode = $core_tools->wash($_REQUEST['mode'], "alphanum", _MODE);
+ if (isset($_REQUEST['mode']) && !empty($_REQUEST['mode'])) {
+ $mode = $core_tools->wash($_REQUEST['mode'], 'alphanum', _MODE);
}
$urlParameters .= '&mode='.$mode;
//No details
$showIconDetails = true;
- if(isset($_REQUEST['nodetails'])) {
+ if (isset($_REQUEST['nodetails'])) {
$showIconDetails = false;
$urlParameters .= '&nodetails';
}
//module
- if(isset($_REQUEST['modulename'])) {
+ if (isset($_REQUEST['modulename'])) {
$urlParameters .= '&modulename='.$_REQUEST['modulename'];
}
//Form
- if(isset($_REQUEST['action_form'])) {
+ if (isset($_REQUEST['action_form'])) {
$urlParameters .= '&action_form='.$_REQUEST['action_form'];
}
-//Start
-if($mode == 'normal') {
-
- $saveTool = true;
- $useTemplate = true;
- $exportTool = true;
- $printTool = true;
- $bigPageTitle = true;
+//Start
+if ($mode == 'normal') {
+ $saveTool = true;
+ $useTemplate = true;
+ $exportTool = true;
+ $printTool = true;
+ $bigPageTitle = true;
$standaloneForm = false;
- $radioButton = false;
-
+ $radioButton = false;
+
//Templates
$defaultTemplate = 'documents_list_search_adv';
$selectedTemplate = $list->getTemplate();
- if (empty($selectedTemplate)) {
+ if (empty($selectedTemplate)) {
if (!empty($defaultTemplate)) {
$list->setTemplate($defaultTemplate);
$selectedTemplate = $list->getTemplate();
@@ -102,99 +101,99 @@ if($mode == 'normal') {
}
$template_list = array();
array_push($template_list, 'documents_list_search_adv');
- if($core_tools->is_module_loaded('cases')) array_push($template_list, 'cases_list_search_adv');
-
+ if ($core_tools->is_module_loaded('cases')) {
+ array_push($template_list, 'cases_list_search_adv');
+ }
+
//For status icon
$extension_icon = '';
- if($selectedTemplate <> 'none') $extension_icon = "_big";
-
+ if ($selectedTemplate != 'none') {
+ $extension_icon = '_big';
+ }
+
//error and search url
$url_error = $_SESSION['config']['businessappurl'].'index.php?page=search_adv_error&dir=indexing_searching';
$url_search = $_SESSION['config']['businessappurl'].'index.php?page=search_adv&dir=indexing_searching';
- //error
+ //error
$_SESSION['error_search'] = '<p style="text-align:center;color:red;"><i class="fa fa-remove fa-2x"></i><br />'
._NO_RESULTS.'</p><br/><br/><div align="center"><strong><a href="javascript://" '
.' onclick = "window.top.location.href=\''.$url_search.'\'">'._MAKE_NEW_SEARCH.'</a></strong></div>';
-
-
-} elseif($mode == 'popup' || $mode == 'frame') {
-
+} elseif ($mode == 'popup' || $mode == 'frame') {
$core_tools->load_html();
$core_tools->load_header('', true, false);
$core_tools->load_js();
- $time = $core_tools->get_session_time_expire();
- ?><body>
+ $time = $core_tools->get_session_time_expire(); ?><body>
<div id="container" style="height:auto;">
<div class="error" id="main_error">
- <?php functions::xecho($_SESSION['error']);?>
+ <?php functions::xecho($_SESSION['error']); ?>
</div>
<div class="info" id="main_info">
- <?php functions::xecho($_SESSION['info']);?>
+ <?php functions::xecho($_SESSION['info']); ?>
</div>
<div id="divList"><?php
-
- $saveTool = false;
- $useTemplate = false;
- $exportTool = false;
- $printTool = false;
- $bigPageTitle = false;
- $radioButton = true;
-
- if($mode == 'popup') {
+
+ $saveTool = false;
+ $useTemplate = false;
+ $exportTool = false;
+ $printTool = false;
+ $bigPageTitle = false;
+ $radioButton = true;
+
+ if ($mode == 'popup') {
//Form object
$standaloneForm = true;
$formMethod = 'get';
- $hiddenFormFields = array();
- array_push($hiddenFormFields, array( "ID" => "display", "NAME" => "display", "VALUE"=> "true"));
- array_push($hiddenFormFields, array( "ID" => "page", "NAME" => "page", "VALUE"=> $_REQUEST['action_form']));
- if(isset($_REQUEST['modulename'])&& !empty($_REQUEST['modulename'])){
- array_push($hiddenFormFields, array( "ID" => "module", "NAME" => "module", "VALUE"=> $_REQUEST['modulename']));
- $formAction = $_SESSION['config']['businessappurl']
- ."index.php?display=true&page="
- .$_REQUEST['action_form']."&module=".$_REQUEST['modulename'];
+ $hiddenFormFields = array();
+ array_push($hiddenFormFields, array('ID' => 'display', 'NAME' => 'display', 'VALUE' => 'true'));
+ array_push($hiddenFormFields, array('ID' => 'page', 'NAME' => 'page', 'VALUE' => $_REQUEST['action_form']));
+ if (isset($_REQUEST['modulename']) && !empty($_REQUEST['modulename'])) {
+ array_push($hiddenFormFields, array('ID' => 'module', 'NAME' => 'module', 'VALUE' => $_REQUEST['modulename']));
+ $formAction = $_SESSION['config']['businessappurl']
+ .'index.php?display=true&page='
+ .$_REQUEST['action_form'].'&module='.$_REQUEST['modulename'];
} else {
$formAction = $_SESSION['config']['businessappurl']
- ."index.php?display=true&page="
+ .'index.php?display=true&page='
.$_REQUEST['action_form'];
}
-
+
$buttons = array();
if (isset($_REQUEST['fromValidateMail'])) {
- array_push( $buttons, array('ID' => 'valid',
- 'LABEL' => _VALIDATE,
- 'ACTION' => 'formList.submit();opener.$(\'to_link\').click();'
+ array_push($buttons, array('ID' => 'valid',
+ 'LABEL' => _VALIDATE,
+ 'ACTION' => 'formList.submit();opener.$(\'to_link\').click();',
)
);
- } else if ($_SESSION['fromValidateMail'] == "ok") {
- array_push( $buttons, array('ID' => 'valid',
- 'LABEL' => _VALIDATE,
- 'ACTION' => 'formList.submit();'
+ } elseif ($_SESSION['fromValidateMail'] == 'ok') {
+ array_push($buttons, array('ID' => 'valid',
+ 'LABEL' => _VALIDATE,
+ 'ACTION' => 'formList.submit();',
)
);
} else {
- array_push( $buttons, array('ID' => 'valid',
- 'LABEL' => _VALIDATE,
+ array_push($buttons, array('ID' => 'valid',
+ 'LABEL' => _VALIDATE,
//'ACTION' => 'formList.submit();opener.$(\'attach\').click();'
- 'ACTION' => 'formList.submit();'
+ 'ACTION' => 'formList.submit();',
)
- );
- }
+ );
+ }
- array_push( $buttons, array('ID' => 'close',
- 'LABEL' => _CLOSE_WINDOW,
- 'ACTION' => 'window.top.close();'
+ array_push($buttons, array('ID' => 'close',
+ 'LABEL' => _CLOSE_WINDOW,
+ 'ACTION' => 'window.top.close();',
)
);
}
-
+
//error and search url
-
- if($_REQUEST['mode'] == 'popup'){
+
+ if ($_REQUEST['mode'] == 'popup') {
$url_error = $_SESSION['config']['businessappurl']
.'index.php?page=search_adv_error'
.'&dir=indexing_searching&display=true&mode='.$_REQUEST['mode'];
- }else{
+ } else {
$url_error = $_SESSION['config']['businessappurl']
.'index.php?page=search_adv_error'
.'&dir=indexing_searching';
@@ -210,7 +209,7 @@ if($mode == 'normal') {
$url_search = $_SESSION['config']['businessappurl']
.'index.php?display=true&dir=indexing_searching'
.'&page=search_adv&load&mode='.$mode.$urlParameters;
-
+
//Displayed error text
$_SESSION['error_search'] = '<p style="color:red;text-align:center;"><i class="fa fa-remove fa-2x"></i><br />'
._NO_RESULTS.'</p><br/><br/><div align="center"><strong><a href="javascript://" '
@@ -222,31 +221,31 @@ if($mode == 'normal') {
$_SESSION['collection_id_choice'] = 'letterbox_coll';
$view = $sec->retrieve_view_from_coll_id($_SESSION['collection_id_choice']);
$select = array();
- $select[$view]= array();
+ $select[$view] = array();
//Fields
//Documents
- array_push($select[$view], "res_id", "res_id as is_labeled", "alt_identifier", "priority", "status", "subject", "category_id as category_img",
- "contact_firstname", "contact_lastname", "contact_society",
- "user_lastname", "user_firstname", "category_id", "dest_user", "type_label",
- "creation_date", "entity_label", "address_id", "exp_user_id", "doc_custom_n1 as count_attachment", "is_multicontacts","filename");
+ array_push($select[$view], 'res_id', 'res_id as is_labeled', 'alt_identifier', 'priority', 'status', 'subject', 'category_id as category_img',
+ 'contact_firstname', 'contact_lastname', 'contact_society',
+ 'user_lastname', 'user_firstname', 'category_id', 'dest_user', 'type_label',
+ 'creation_date', 'entity_label', 'address_id', 'exp_user_id', 'doc_custom_n1 as count_attachment', 'is_multicontacts', 'filename');
//Cases
- if($core_tools->is_module_loaded("cases") == true) {
- array_push($select[$view], "case_id", "case_label", "case_description");
+ if ($core_tools->is_module_loaded('cases') == true) {
+ array_push($select[$view], 'case_id', 'case_label', 'case_description');
}
//Folder
- if ($core_tools->is_module_loaded("folder")) {
- array_push($select[$view], "folders_system_id", "folder_name");
+ if ($core_tools->is_module_loaded('folder')) {
+ array_push($select[$view], 'folders_system_id', 'folder_name');
}
//Where clause
$where_tab = array();
$arrayPDO = array();
//From search
if (!empty($_SESSION['searching']['where_request'])) {
- $where_tab[] = $_SESSION['searching']['where_request']. '(1=1)';
+ $where_tab[] = $_SESSION['searching']['where_request'].'(1=1)';
$arrayPDO = array_merge($arrayPDO, $_SESSION['searching']['where_request_parameters']);
}
-
+
if (isset($_REQUEST['exclude'])) {
$_SESSION['excludeId'] = $_REQUEST['exclude'];
}
@@ -254,54 +253,52 @@ if($mode == 'normal') {
//From popup excluding some id
if ($_REQUEST['mode'] == 'popup' && isset($_SESSION['excludeId'])) {
$where_tab[] = 'res_id <> :excludeId and '
- . '(res_id not in (SELECT res_parent FROM res_linked WHERE res_child = :excludeId) and '
- . 'res_id not in (SELECT res_child FROM res_linked WHERE res_parent = :excludeId))';
- $arrayPDO = array_merge($arrayPDO, array(":excludeId" => $_SESSION['excludeId']));
+ .'(res_id not in (SELECT res_parent FROM res_linked WHERE res_child = :excludeId) and '
+ .'res_id not in (SELECT res_child FROM res_linked WHERE res_parent = :excludeId))';
+ $arrayPDO = array_merge($arrayPDO, array(':excludeId' => $_SESSION['excludeId']));
unset($_SESSION['excludeId']);
}
- $status = $status_obj->get_not_searchable_status();
+ $status = $status_obj->get_not_searchable_status();
- if(count($status) > 0) {
+ if (count($status) > 0) {
$status_tab = array();
// $status_str = '';
- for($i=0; $i<count($status);$i++){
- array_push($status_tab, $status[$i]['ID']);
+ for ($i = 0; $i < count($status); ++$i) {
+ array_push($status_tab, $status[$i]['ID']);
}
// $status_str = implode(' ,', $status_tab);
- $where_tab[] = "status not in (:statustab)";
- $arrayPDO = array_merge($arrayPDO, array(":statustab" => $status_tab));
+ $where_tab[] = 'status not in (:statustab)';
+ $arrayPDO = array_merge($arrayPDO, array(':statustab' => $status_tab));
}
-
- if (isset($_SESSION['where_from_contact_check']) && $_SESSION['where_from_contact_check'] <> '' && (isset($_REQUEST['fromContactCheck']) || $_SESSION['fromContactCheck'] == 'ok')) {
- for($ind_bask = 0; $ind_bask < count($_SESSION['user']['baskets']); $ind_bask++) {
- if ($_SESSION['user']['baskets'][$ind_bask]['coll_id'] == $_SESSION['collection_id_choice']
+
+ if (isset($_SESSION['where_from_contact_check']) && $_SESSION['where_from_contact_check'] != '' && (isset($_REQUEST['fromContactCheck']) || $_SESSION['fromContactCheck'] == 'ok')) {
+ for ($ind_bask = 0; $ind_bask < count($_SESSION['user']['baskets']); ++$ind_bask) {
+ if ($_SESSION['user']['baskets'][$ind_bask]['coll_id'] == $_SESSION['collection_id_choice']
&& $_SESSION['user']['baskets'][$ind_bask]['is_folder_basket'] == 'N') {
- if(isset($_SESSION['user']['baskets'][$ind_bask]['clause']) && trim($_SESSION['user']['baskets'][$ind_bask]['clause']) <> '') {
+ if (isset($_SESSION['user']['baskets'][$ind_bask]['clause']) && trim($_SESSION['user']['baskets'][$ind_bask]['clause']) != '') {
$_SESSION['searching']['comp_query'] .= ' or ('.$_SESSION['user']['baskets'][$ind_bask]['clause'].')';
}
- }
+ }
}
$_SESSION['searching']['comp_query'] = preg_replace('/^ or/', '', $_SESSION['searching']['comp_query']);
}
//From searching comp query
- if(isset($_SESSION['searching']['comp_query']) && trim($_SESSION['searching']['comp_query']) <> '') {
-
+ if (isset($_SESSION['searching']['comp_query']) && trim($_SESSION['searching']['comp_query']) != '') {
$where_clause = $sec->get_where_clause_from_coll_id($_SESSION['collection_id_choice']);
- if(count($where_tab) <> 0) {
+ if (count($where_tab) != 0) {
$where = implode(' and ', $where_tab);
$where_request = '('.$where.') and (('.$where_clause.') or ('.$_SESSION['searching']['comp_query'].'))';
} else {
$where_request = '('.$where_clause.' or '.$_SESSION['searching']['comp_query'].')';
}
$add_security = false;
-
} else {
$where_request = implode(' and ', $where_tab);
$add_security = true;
}
-
+
//Order
$order = $order_field = '';
$order = $list->getOrder();
@@ -309,481 +306,454 @@ if($mode == 'normal') {
$_SESSION['save_list']['order'] = $order;
$_SESSION['save_list']['order_field'] = $order_field;
- if (!empty($order_field) && !empty($order)){
- if($_REQUEST['order_field'] == 'alt_identifier'){
- $orderstr = "order by order_alphanum(alt_identifier)"." ".$order;
- }else{
- $orderstr = "order by ".$order_field." ".$order;
+ if (!empty($order_field) && !empty($order)) {
+ if ($_REQUEST['order_field'] == 'alt_identifier') {
+ $orderstr = 'order by order_alphanum(alt_identifier)'.' '.$order;
+ } else {
+ $orderstr = 'order by '.$order_field.' '.$order;
}
} else {
$list->setOrder();
$list->setOrderField('res_id');
- $orderstr = "order by res_id desc";
+ $orderstr = 'order by res_id desc';
}
-
-//URL extra Parameters
+
+//URL extra Parameters
$parameters = '';
$start = $list->getStart();
- if (!empty($order_field) && !empty($order)) $parameters .= '&order='.$order.'&order_field='.$order_field;
- if (!empty($what)) $parameters .= '&what='.$what;
- if (!empty($selectedTemplate)) $parameters .= '&template='.$selectedTemplate;
- if (!empty($start)) $parameters .= '&start='.$start;
+ if (!empty($order_field) && !empty($order)) {
+ $parameters .= '&order='.$order.'&order_field='.$order_field;
+ }
+ if (!empty($what)) {
+ $parameters .= '&what='.$what;
+ }
+ if (!empty($selectedTemplate)) {
+ $parameters .= '&template='.$selectedTemplate;
+ }
+ if (!empty($start)) {
+ $parameters .= '&start='.$start;
+ }
$_SESSION['save_list']['start'] = $start;
-
- if (isset($_SESSION['where_from_contact_check']) && $_SESSION['where_from_contact_check'] <> '' && (isset($_REQUEST['fromContactCheck']) || $_SESSION['fromContactCheck'] == 'ok')) {
- $_SESSION['fromContactCheck'] = "ok";
+
+ if (isset($_SESSION['where_from_contact_check']) && $_SESSION['where_from_contact_check'] != '' && (isset($_REQUEST['fromContactCheck']) || $_SESSION['fromContactCheck'] == 'ok')) {
+ $_SESSION['fromContactCheck'] = 'ok';
$where_request .= $_SESSION['where_from_contact_check'];
}
-//Query
- $tab=$request->PDOselect($select,$where_request,$arrayPDO, $orderstr,$_SESSION['config']['databasetype'],"default", false, "", "", "", $add_security);
+//Query
+ $tab = $request->PDOselect($select, $where_request, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], 'default', false, '', '', '', $add_security);
// $request->show();
//Result array
$tabI = count($tab);
- for ($i=0;$i<$tabI;$i++)
- {
+ for ($i = 0; $i < $tabI; ++$i) {
$tabJ = count($tab[$i]);
- for ($j=0;$j<$tabJ;$j++)
- {
- foreach(array_keys($tab[$i][$j]) as $value)
- {
- if($tab[$i][$j][$value]=='is_labeled'
+ for ($j = 0; $j < $tabJ; ++$j) {
+ foreach (array_keys($tab[$i][$j]) as $value) {
+ if ($tab[$i][$j][$value] == 'is_labeled'
&& $core_tools->is_module_loaded('labels')
&& (isset($_SESSION['user']['services']['labels'])
&& $_SESSION['user']['services']['labels'] === true)
- )
- {
+ ) {
$str_label = $labels->get_labels_resid($tab[$i][$j]['value'], $_SESSION['collection_id_choice']);
- if (!empty($str_label)) $tab[$i][$j]['value'] = ''; else $tab[$i][$j]['value'] = ' ';
- $tab[$i][$j]["label"] = _LABELS;
- $tab[$i][$j]["size"] = "4";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["order"] = false;
+ if (!empty($str_label)) {
+ $tab[$i][$j]['value'] = '';
+ } else {
+ $tab[$i][$j]['value'] = ' ';
+ }
+ $tab[$i][$j]['label'] = _LABELS;
+ $tab[$i][$j]['size'] = '4';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = false;
}
- if($tab[$i][$j][$value]=='res_id')
- {
- $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
- $tab[$i][$j]["label"] = _GED_NUM;
- $tab[$i][$j]["size"] = "4";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- if($_REQUEST['mode'] == 'popup'){
- $tab[$i][$j]["show"]=false;
- }else{
- $tab[$i][$j]["show"]=true;
+ if ($tab[$i][$j][$value] == 'res_id') {
+ $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _GED_NUM;
+ $tab[$i][$j]['size'] = '4';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ if ($_REQUEST['mode'] == 'popup') {
+ $tab[$i][$j]['show'] = false;
+ } else {
+ $tab[$i][$j]['show'] = true;
}
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]='res_id';
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'res_id';
$_SESSION['mlb_search_current_res_id'] = $tab[$i][$j]['value'];
- // notes
- $db = new Database();
-
- $arrayPDO = array();
- $query = "SELECT ";
- $query .= "notes.id ";
- $query .= "FROM ";
- $query .= "notes ";
- $query .= "left join ";
- $query .= "note_entities ";
- $query .= "on ";
- $query .= "notes.id = note_entities.note_id ";
- $query .= "WHERE ";
- $query .= "tablename = 'res_letterbox' ";
- $query .= "AND ";
- $query .= "coll_id = 'letterbox_coll' ";
- $query .= "AND ";
- $query .= "identifier = ? ";
- $arrayPDO = array($tab[$i][$j]['value']);
-
- $query .= "AND ";
- $query .= "( ";
- $query .= "( ";
- $query .= "item_id IN (";
-
- foreach($_SESSION['user']['entities'] as $entitiestmpnote) {
- $query .= "?, ";
- $arrayPDO = array_merge($arrayPDO, array($entitiestmpnote['ENTITY_ID']));
- }
-
- if ($_SESSION['user']['UserId'] == 'superadmin') {
- $query .= " null ";
- } else {
- $query = substr($query, 0, -2);
- }
-
- $query .= ") ";
- $query .= "OR ";
- $query .= "item_id IS NULL ";
- $query .= ") ";
- $query .= "OR ";
- $query .= "user_id = ? ";
- $query .= ") ";
- $arrayPDO = array_merge($arrayPDO, array($_SESSION['user']['UserId']));
-
- $stmt = $db->query($query, $arrayPDO);
- $tab[$i][$j]['hasNotes'] = $stmt->fetchObject();
- $tab[$i][$j]['res_multi_contacts'] = $_SESSION['mlb_search_current_res_id'];
+ // notes
+ $db = new Database();
+
+ $arrayPDO = array();
+ $query = 'SELECT ';
+ $query .= 'notes.id ';
+ $query .= 'FROM ';
+ $query .= 'notes ';
+ $query .= 'left join ';
+ $query .= 'note_entities ';
+ $query .= 'on ';
+ $query .= 'notes.id = note_entities.note_id ';
+ $query .= 'WHERE ';
+ $query .= "tablename = 'res_letterbox' ";
+ $query .= 'AND ';
+ $query .= "coll_id = 'letterbox_coll' ";
+ $query .= 'AND ';
+ $query .= 'identifier = ? ';
+ $arrayPDO = array($tab[$i][$j]['value']);
+
+ $query .= 'AND ';
+ $query .= '( ';
+ $query .= '( ';
+ $query .= 'item_id IN (';
+
+ foreach ($_SESSION['user']['entities'] as $entitiestmpnote) {
+ $query .= '?, ';
+ $arrayPDO = array_merge($arrayPDO, array($entitiestmpnote['ENTITY_ID']));
+ }
+
+ if ($_SESSION['user']['UserId'] == 'superadmin') {
+ $query .= ' null ';
+ } else {
+ $query = substr($query, 0, -2);
+ }
+
+ $query .= ') ';
+ $query .= 'OR ';
+ $query .= 'item_id IS NULL ';
+ $query .= ') ';
+ $query .= 'OR ';
+ $query .= 'user_id = ? ';
+ $query .= ') ';
+ $arrayPDO = array_merge($arrayPDO, array($_SESSION['user']['UserId']));
+
+ $stmt = $db->query($query, $arrayPDO);
+ $tab[$i][$j]['hasNotes'] = $stmt->fetchObject();
+ $tab[$i][$j]['res_multi_contacts'] = $_SESSION['mlb_search_current_res_id'];
}
- if($tab[$i][$j][$value]=="alt_identifier")
- {
- $tab[$i][$j]["value"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["label"] = _CHRONO_NUMBER;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- if($_REQUEST['mode'] == 'popup'){
- $tab[$i][$j]["show"]=true;
- }else{
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'alt_identifier') {
+ $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _CHRONO_NUMBER;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ if ($_REQUEST['mode'] == 'popup') {
+ $tab[$i][$j]['show'] = true;
+ } else {
+ $tab[$i][$j]['show'] = false;
}
- $tab[$i][$j]["order"]='alt_identifier';
+ $tab[$i][$j]['order'] = 'alt_identifier';
}
- if($tab[$i][$j][$value]=="type_label")
- {
-
- if(!empty($_SESSION['searching']['where_request_parameters'][':doctypesChosen'])){
-
- $doctype = '<i style="background: #009dc5 none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$tab[$i][$j]['value'].'</i>';
- }else{
+ if ($tab[$i][$j][$value] == 'type_label') {
+ if (!empty($_SESSION['searching']['where_request_parameters'][':doctypesChosen'])) {
+ $doctype = '<i style="background: #135F7F none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$tab[$i][$j]['value'].'</i>';
+ } else {
$doctype = $tab[$i][$j]['value'];
}
- $tab[$i][$j]["label"] = _TYPE;
- $tab[$i][$j]['value'] = $doctype;
- $tab[$i][$j]["size"] = "15";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "type_label";
+ $tab[$i][$j]['label'] = _TYPE;
+ $tab[$i][$j]['value'] = $doctype;
+ $tab[$i][$j]['size'] = '15';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'type_label';
}
-
- if($tab[$i][$j][$value]=="status")
- {
- $style="style='color:".$_SESSION['mail_priorities_color'][$priority].";'";
-
- $tab[$i][$j]["label"]=_STATUS;
- $res_status = $status_obj->get_status_data($tab[$i][$j]['value'],$extension_icon);
+
+ if ($tab[$i][$j][$value] == 'status') {
+ $style = "style='color:".$_SESSION['mail_priorities_color'][$priority].";'";
+
+ $tab[$i][$j]['label'] = _STATUS;
+ $res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
$statusCmp = $tab[$i][$j]['value'];
$img_class = substr($res_status['IMG_SRC'], 0, 2);
// $tab[$i][$j]['value'] = '<img src = "'.$res_status['IMG_SRC'].'" alt = "'.$res_status['LABEL'].'" title = "'.$res_status['LABEL'].'">';
- if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])){
- $tab[$i][$j]['value'] = "<i ".$style." class = 'fm fm-letter-status-new fm-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+ if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])) {
+ $tab[$i][$j]['value'] = '<i '.$style." class = 'fm fm-letter-status-new fm-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
} else {
- $tab[$i][$j]['value'] = "<i ".$style." class = '".$img_class." ".$res_status['IMG_SRC']." ".$img_class."-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+ $tab[$i][$j]['value'] = '<i '.$style." class = '".$img_class.' '.$res_status['IMG_SRC'].' '.$img_class."-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
}
- $tab[$i][$j]["size"] = "5";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "status";
+ $tab[$i][$j]['size'] = '5';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'status';
}
-
- if($tab[$i][$j][$value]=="subject")
- {
- mb_internal_encoding("UTF-8");
+
+ if ($tab[$i][$j][$value] == 'subject') {
+ mb_internal_encoding('UTF-8');
$target_subj = $_SESSION['searching']['where_request_parameters'][':subject'];
$target_subj = str_replace('%', '', trim($target_subj));
- if(!empty($target_subj)){
- $subj = $request->cut_string($request->show_string($tab[$i][$j]["value"]), 250);
+ if (!empty($target_subj)) {
+ $subj = $request->cut_string($request->show_string($tab[$i][$j]['value']), 250);
$subj_no_accent = functions::normalize($subj);
-
$begin_pos_subj = mb_strpos($subj_no_accent, $target_subj);
- if($begin_pos_subj != false || $begin_pos_subj === 0){
+ if ($begin_pos_subj != false || $begin_pos_subj === 0) {
$result = strlen($subj) - strlen($subj_no_accent);
$subj_length = mb_strlen($target_subj);
-
$target_subj_new = mb_substr($subj, $begin_pos_subj, $subj_length);
-
- $subj = str_replace($target_subj_new, '<i style="background: #009dc5 none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$target_subj_new.'</i>', $subj);
- }else{
- $subj = $request->show_string($tab[$i][$j]["value"]);
+ $subj = str_replace($target_subj_new, '<i style="background: #135F7F none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$target_subj_new.'</i>', $subj);
+ } else {
+ $subj = $request->show_string($tab[$i][$j]['value']);
}
- }else{
- $subj = $request->show_string($tab[$i][$j]["value"]);
+ } else {
+ $subj = $request->show_string($tab[$i][$j]['value']);
}
-
- $tab[$i][$j]["label"] = _SUBJECT;
- $tab[$i][$j]["value"] = $subj;
- $tab[$i][$j]["size"] = "25";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "subject";
+ $tab[$i][$j]['label'] = _SUBJECT;
+ $tab[$i][$j]['value'] = $subj;
+ $tab[$i][$j]['size'] = '25';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'subject';
}
-
- if($tab[$i][$j][$value]=="creation_date")
- {
- $tab[$i][$j]["label"] = _REG_DATE;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = $request->format_date_db($tab[$i][$j]['value'], false);
- $tab[$i][$j]["order"] = "creation_date";
+
+ if ($tab[$i][$j][$value] == 'creation_date') {
+ $tab[$i][$j]['label'] = _REG_DATE;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = $request->format_date_db($tab[$i][$j]['value'], false);
+ $tab[$i][$j]['order'] = 'creation_date';
}
-
- if($tab[$i][$j][$value]=="entity_label")
- {
- if(!empty($_SESSION['searching']['where_request_parameters'][':serviceChosen'])){
-
- $service = '<i style="background: #009dc5 none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$tab[$i][$j]['value'].'</i>';
- }else{
+
+ if ($tab[$i][$j][$value] == 'entity_label') {
+ if (!empty($_SESSION['searching']['where_request_parameters'][':serviceChosen'])) {
+ $service = '<i style="background: #135F7F none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$tab[$i][$j]['value'].'</i>';
+ } else {
$service = $tab[$i][$j]['value'];
}
- $tab[$i][$j]["label"] = _ENTITY;
- $tab[$i][$j]['value'] = $request->show_string($service);
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "entity_label";
+ $tab[$i][$j]['label'] = _ENTITY;
+ $tab[$i][$j]['value'] = $request->show_string($service);
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'entity_label';
}
-
- if($tab[$i][$j][$value]=="category_id")
- {
- if(!empty($_SESSION['searching']['where_request_parameters'][':category'])){
-
- $cat = '<i style="background: #009dc5 none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$_SESSION['coll_categories']['letterbox_coll'][$tab[$i][$j]['value']].'</i>';
- }else{
+
+ if ($tab[$i][$j][$value] == 'category_id') {
+ if (!empty($_SESSION['searching']['where_request_parameters'][':category'])) {
+ $cat = '<i style="background: #135F7F none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$_SESSION['coll_categories']['letterbox_coll'][$tab[$i][$j]['value']].'</i>';
+ } else {
$cat = $_SESSION['coll_categories']['letterbox_coll'][$tab[$i][$j]['value']];
}
- $categoryId = $tab[$i][$j]["value"];
+ $categoryId = $tab[$i][$j]['value'];
$_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = $cat;
- $tab[$i][$j]["label"] = _CATEGORY;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "category_id";
+ $tab[$i][$j]['value'] = $cat;
+ $tab[$i][$j]['label'] = _CATEGORY;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'category_id';
}
-
- if($tab[$i][$j][$value]=="category_img")
- {
- $tab[$i][$j]["label"] = _CATEGORY;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $my_imgcat = get_img_cat($tab[$i][$j]['value'],$extension_icon);
+
+ if ($tab[$i][$j][$value] == 'category_img') {
+ $tab[$i][$j]['label'] = _CATEGORY;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $my_imgcat = get_img_cat($tab[$i][$j]['value'], $extension_icon);
$tab[$i][$j]['value'] = $my_imgcat;
- $tab[$i][$j]["value"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "category_id";
+ $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'category_id';
}
- if($tab[$i][$j][$value]=="priority")
- {
+ if ($tab[$i][$j][$value] == 'priority') {
$fakeId = null;
foreach ($_SESSION['mail_priorities_id'] as $key => $prioValue) {
- if ($prioValue == $tab[$i][$j]["value"]) {
+ if ($prioValue == $tab[$i][$j]['value']) {
$fakeId = $key;
}
}
$priority = $fakeId;
- $tab[$i][$j]["value"] = $_SESSION['mail_priorities'][$fakeId];
- $tab[$i][$j]["label"] = _PRIORITY;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["order"] = 'priority';
+ $tab[$i][$j]['value'] = $_SESSION['mail_priorities'][$fakeId];
+ $tab[$i][$j]['label'] = _PRIORITY;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'priority';
}
- if($tab[$i][$j][$value]=="dest_user")
- {
- $tab[$i][$j]["label"] = "dest_user";
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- if($categoryId == "outgoing"){
- $tab[$i][$j]["value"] = "<b>"._TO_CONTACT_C."</b>".$tab[$i][$j]['value'];
- }else{
- $tab[$i][$j]["value"] = "<b>"._FOR_CONTACT_C."</b>".$tab[$i][$j]['value'];
-
+ if ($tab[$i][$j][$value] == 'dest_user') {
+ $tab[$i][$j]['label'] = 'dest_user';
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ if ($categoryId == 'outgoing') {
+ $tab[$i][$j]['value'] = '<b>'._TO_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
+ } else {
+ $tab[$i][$j]['value'] = '<b>'._FOR_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
}
- $tab[$i][$j]["order"]=false;
+ $tab[$i][$j]['order'] = false;
}
- if($tab[$i][$j][$value]=="count_attachment")
- {
- $query = "SELECT count(res_id) as total FROM res_view_attachments
+ if ($tab[$i][$j][$value] == 'count_attachment') {
+ $query = "SELECT count(res_id) as total FROM res_view_attachments
WHERE res_id_master = ?
AND status NOT IN ('DEL', 'OBS') AND attachment_type NOT IN ('converted_pdf', 'print_folder') AND coll_id = ? AND (status <> 'TMP' or (typist = ? and status = 'TMP'))";
$arrayPDO = array($tab[$i][0]['res_id'], $_SESSION['collection_id_choice'], $_SESSION['user']['UserId']);
$stmt2 = $db->query($query, $arrayPDO);
$return_count = $stmt2->fetchObject();
- $tab[$i][$j]["label"] = _ATTACHMENTS;
- $tab[$i][$j]["size"] = "12";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]['value'] = "$return_count->total";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["order"] = 'count_attachment';
+ $tab[$i][$j]['label'] = _ATTACHMENTS;
+ $tab[$i][$j]['size'] = '12';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['value'] = "$return_count->total";
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'count_attachment';
}
-
- if($tab[$i][$j][$value]=="contact_firstname")
- {
- $contact_firstname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+
+ if ($tab[$i][$j][$value] == 'contact_firstname') {
+ $contact_firstname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if($tab[$i][$j][$value]=="contact_lastname")
- {
- $contact_lastname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'contact_lastname') {
+ $contact_lastname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if($tab[$i][$j][$value]=="contact_society")
- {
- $contact_society = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'contact_society') {
+ $contact_society = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if($tab[$i][$j][$value]=="user_firstname")
- {
- $user_firstname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'user_firstname') {
+ $user_firstname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if($tab[$i][$j][$value]=="user_lastname")
- {
- $user_lastname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'user_lastname') {
+ $user_lastname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
-
- if($tab[$i][$j][$value]=="$template_to_use exp_user_id")
- {
- $tab[$i][$j]["label"] = _CONTACT;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
- $tab[$i][$j]["order"]=false;
+
+ if ($tab[$i][$j][$value] == "$template_to_use exp_user_id") {
+ $tab[$i][$j]['label'] = _CONTACT;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
+ $tab[$i][$j]['order'] = false;
}
-
- if($tab[$i][$j][$value]=="is_multicontacts")
- {
- if($tab[$i][$j]['value'] == 'Y'){
- $tab[$i][$j]["label"] = _CONTACT;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = _MULTI_CONTACT;
- $tab[$i][$j]["order"] = false;
- $tab[$i][$j]["is_multi_contacts"] = 'Y';
- }
- }
-
- if($tab[$i][$j][$value]=="case_id" && $core_tools->is_module_loaded("cases") == true)
- {
- $tab[$i][$j]["label"] = _CASE_NUM;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = "<a href='".$_SESSION['config']['businessappurl']."index.php?page=details_cases&module=cases&id=".$tab[$i][$j]['value']."'>".$tab[$i][$j]['value']."</a>";
- $tab[$i][$j]["order"]="case_id";
+
+ if ($tab[$i][$j][$value] == 'is_multicontacts') {
+ if ($tab[$i][$j]['value'] == 'Y') {
+ $tab[$i][$j]['label'] = _CONTACT;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = _MULTI_CONTACT;
+ $tab[$i][$j]['order'] = false;
+ $tab[$i][$j]['is_multi_contacts'] = 'Y';
+ }
}
- if($tab[$i][$j][$value]=="case_label" && $core_tools->is_module_loaded("cases") == true)
- {
- $tab[$i][$j]["label"] = _CASE_LABEL;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "case_id";
+
+ if ($tab[$i][$j][$value] == 'case_id' && $core_tools->is_module_loaded('cases') == true) {
+ $tab[$i][$j]['label'] = _CASE_NUM;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&id='.$tab[$i][$j]['value']."'>".$tab[$i][$j]['value'].'</a>';
+ $tab[$i][$j]['order'] = 'case_id';
}
- if($tab[$i][$j][$value]=="folder_name")
- {
- $tab[$i][$j]["label"] = _FOLDER;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"] = "folder_name";
+ if ($tab[$i][$j][$value] == 'case_label' && $core_tools->is_module_loaded('cases') == true) {
+ $tab[$i][$j]['label'] = _CASE_LABEL;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'case_id';
}
- if($tab[$i][$j][$value]=="address_id")
- {
- $addressId = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"] = false;
- }
- if($tab[$i][$j][$value]=="exp_user_id")
- {
+ if ($tab[$i][$j][$value] == 'folder_name') {
+ $tab[$i][$j]['label'] = _FOLDER;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'folder_name';
+ }
+ if ($tab[$i][$j][$value] == 'address_id') {
+ $addressId = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
+ }
+ if ($tab[$i][$j][$value] == 'exp_user_id') {
if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname) && !empty($addressId)) {
- $query = "SELECT ca.firstname, ca.lastname FROM contact_addresses ca WHERE ca.id = ?";
- $arrayPDO = array($addressId);
- $stmt2 = $db->query($query, $arrayPDO);
+ $query = 'SELECT ca.firstname, ca.lastname FROM contact_addresses ca WHERE ca.id = ?';
+ $arrayPDO = array($addressId);
+ $stmt2 = $db->query($query, $arrayPDO);
$return_contact = $stmt2->fetchObject();
-
+
if (!empty($return_contact)) {
$contact_firstname = $return_contact->firstname;
- $contact_lastname = $return_contact->lastname;
+ $contact_lastname = $return_contact->lastname;
}
}
- $tab[$i][$j]["label"] = _CONTACT;
- $tab[$i][$j]["size"] = "10";
- $tab[$i][$j]["label_align"] = "left";
- $tab[$i][$j]["align"] = "left";
- $tab[$i][$j]["valign"] = "bottom";
- $tab[$i][$j]["show"] = false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
- $tab[$i][$j]["order"]=false;
- }
-
+ $tab[$i][$j]['label'] = _CONTACT;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
+ $tab[$i][$j]['order'] = false;
+ }
}
}
}
$nbTab = count($tab);
if ($nbTab > 0) {
-
/************Construction de la liste*******************/
//Clé de la liste
$listKey = 'res_id';
@@ -792,123 +762,123 @@ if ($nbTab > 0) {
$paramsTab = array();
$paramsTab['bool_modeReturn'] = false; //Desactivation du mode return (vs echo)
$paramsTab['listCss'] = 'listing largerList spec'; //css
- $paramsTab['urlParameters'] = $urlParameters.'&dir=indexing_searching'; //Parametres supplémentaires
- $paramsTab['pageTitle'] = _RESULTS." : ".$nbTab.' '._FOUND_DOCS; //Titre de la page
- $paramsTab['pagePicto'] = 'search'; //Image de la page
+ $paramsTab['urlParameters'] = $urlParameters.'&dir=indexing_searching'; //Parametres supplémentaires
+ $paramsTab['pageTitle'] = _RESULTS.' : '.$nbTab.' '._FOUND_DOCS; //Titre de la page
+ $paramsTab['pagePicto'] = 'search'; //Image de la page
$paramsTab['bool_bigPageTitle'] = $bigPageTitle; //Titre de la page en grand
- $paramsTab['bool_showIconDocument'] = true; //Affichage de l'icone du document
- $paramsTab['bool_showIconDetails'] = $showIconDetails; //Affichage de l'icone de la page de details
+ $paramsTab['bool_showIconDocument'] = true; //Affichage de l'icone du document
+ $paramsTab['bool_showIconDetails'] = $showIconDetails; //Affichage de l'icone de la page de details
$paramsTab['bool_showAttachment'] = true; //Affichage du nombre de document attaché (mode étendu)
if ($radioButton) { //Boutton radio
$paramsTab['bool_radioButton'] = $radioButton;
- }
+ }
$paramsTab['defaultTemplate'] = $defaultTemplate; //Default template
- if ($useTemplate && count($template_list) >0 ) { //Templates
+ if ($useTemplate && count($template_list) > 0) { //Templates
$paramsTab['templates'] = array();
$paramsTab['templates'] = $template_list;
}
$paramsTab['bool_showTemplateDefaultList'] = true; //Default list (no template)
-
+
//Form attributs
- //Standalone form
- $paramsTab['bool_standaloneForm'] = $standaloneForm;
- //Method
- if (isset($formMethod) && !empty($formMethod)) $paramsTab['formMethod'] = $formMethod;
- //Action
- if (isset($formAction) && !empty($formAction)) $paramsTab['formAction'] = $formAction;
- //Hiden fields
+ //Standalone form
+ $paramsTab['bool_standaloneForm'] = $standaloneForm;
+ //Method
+ if (isset($formMethod) && !empty($formMethod)) {
+ $paramsTab['formMethod'] = $formMethod;
+ }
+ //Action
+ if (isset($formAction) && !empty($formAction)) {
+ $paramsTab['formAction'] = $formAction;
+ }
+ //Hiden fields
if (isset($hiddenFormFields) && count($hiddenFormFields) > 0) { //Champs hidden supplémentaire | mots clés = id, name, value
- $paramsTab['hiddenFormFields'] = array();
- $paramsTab['hiddenFormFields'] = $hiddenFormFields;
+ $paramsTab['hiddenFormFields'] = array();
+ $paramsTab['hiddenFormFields'] = $hiddenFormFields;
}
- //Buttons
+ //Buttons
if (isset($buttons) && count($buttons) > 0) { //Liste des boutons de formulaire
- $paramsTab['buttons'] = array();
- $paramsTab['buttons'] = $buttons;
-
+ $paramsTab['buttons'] = array();
+ $paramsTab['buttons'] = $buttons;
}
-
+
//Toolbar
$paramsTab['tools'] = array(); //Icones dans la barre d'outils
-
+
//Fileplan
- if ($core_tools->test_service('fileplan', 'fileplan', false)) {
- if ($mode == 'normal') {
- require_once "modules" . DIRECTORY_SEPARATOR . "fileplan" . DIRECTORY_SEPARATOR
- . "class" . DIRECTORY_SEPARATOR . "class_modules_tools.php";
- $fileplan = new fileplan();
- if (
- count($fileplan->getUserFileplan()) > 0
- || (count($fileplan->getEntitiesFileplan()) > 0
- && $core_tools->test_service('put_doc_in_fileplan', 'fileplan', false)
- )
- ) {
- $paramsTab['bool_checkBox'] = true;
- $paramsTab['bool_standaloneForm'] = true;
- $positions = array(
- "script" => "showFileplanList('".$_SESSION['config']['businessappurl']
- . "index.php?display=true&module=fileplan&page=fileplan_ajax_script"
- . "&mode=setPosition&origin=search&coll_id=".$_SESSION['collection_id_choice']
- . $parameters."', 'formList', '600px', '510px', '"
- . _CHOOSE_ONE_DOC."')",
- "icon" => 'bookmark',
- "tooltip" => _FILEPLAN,
- "disabledRules" => $nbTab." == 0 || ".$selectedTemplate." == 'cases_list_search_adv'"
- );
- array_push($paramsTab['tools'],$positions);
- }
+ if ($core_tools->test_service('fileplan', 'fileplan', false)) {
+ if ($mode == 'normal') {
+ require_once 'modules'.DIRECTORY_SEPARATOR.'fileplan'.DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
+ $fileplan = new fileplan();
+ if (
+ count($fileplan->getUserFileplan()) > 0
+ || (count($fileplan->getEntitiesFileplan()) > 0
+ && $core_tools->test_service('put_doc_in_fileplan', 'fileplan', false)
+ )
+ ) {
+ $paramsTab['bool_checkBox'] = true;
+ $paramsTab['bool_standaloneForm'] = true;
+ $positions = array(
+ 'script' => "showFileplanList('".$_SESSION['config']['businessappurl']
+ .'index.php?display=true&module=fileplan&page=fileplan_ajax_script'
+ .'&mode=setPosition&origin=search&coll_id='.$_SESSION['collection_id_choice']
+ .$parameters."', 'formList', '600px', '510px', '"
+ ._CHOOSE_ONE_DOC."')",
+ 'icon' => 'bookmark',
+ 'tooltip' => _FILEPLAN,
+ 'disabledRules' => $nbTab.' == 0 || '.$selectedTemplate." == 'cases_list_search_adv'",
+ );
+ array_push($paramsTab['tools'], $positions);
}
}
-
- if($saveTool) {
- $save = array(
- "script" => "createModal(form_txt);window.location.href='#top';",
- "icon" => 'save',
- "tooltip" => _SAVE_QUERY,
- "disabledRules" => $nbTab." == 0"
- );
- array_push($paramsTab['tools'],$save);
- }
-
- if($exportTool) {
- $export = array(
- "script" => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=export', '_blank');",
- "icon" => 'file-excel-o',
- "tooltip" => _EXPORT_LIST,
- "disabledRules" => $nbTab." == 0"
+ }
+
+ if ($saveTool) {
+ $save = array(
+ 'script' => "createModal(form_txt);window.location.href='#top';",
+ 'icon' => 'save',
+ 'tooltip' => _SAVE_QUERY,
+ 'disabledRules' => $nbTab.' == 0',
+ );
+ array_push($paramsTab['tools'], $save);
+ }
+
+ if ($exportTool) {
+ $export = array(
+ 'script' => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=export', '_blank');",
+ 'icon' => 'file-excel-o',
+ 'tooltip' => _EXPORT_LIST,
+ 'disabledRules' => $nbTab.' == 0',
);
- array_push($paramsTab['tools'],$export);
- $export2 = array(
- "script" => "print_current_result_list('".$_SESSION['config']['businessappurl']."');",
- "icon" => 'print',
- "tooltip" => _PRINT_LIST,
- "disabledRules" => $nbTab." == 0"
+ array_push($paramsTab['tools'], $export);
+ $export2 = array(
+ 'script' => "print_current_result_list('".$_SESSION['config']['businessappurl']."');",
+ 'icon' => 'print',
+ 'tooltip' => _PRINT_LIST,
+ 'disabledRules' => $nbTab.' == 0',
);
- array_push($paramsTab['tools'],$export2);
- }
-
- if($printTool && $core_tools->test_service('print_doc_details_from_list', 'apps', false)) {
- $print = array(
- "script" => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=print', '_blank');",
- "icon" => 'link',
- "tooltip" => _PRINT_DOC_FROM_LIST,
- "disabledRules" => $nbTab." == 0"
+ array_push($paramsTab['tools'], $export2);
+ }
+
+ if ($printTool && $core_tools->test_service('print_doc_details_from_list', 'apps', false)) {
+ $print = array(
+ 'script' => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=print', '_blank');",
+ 'icon' => 'link',
+ 'tooltip' => _PRINT_DOC_FROM_LIST,
+ 'disabledRules' => $nbTab.' == 0',
);
- array_push($paramsTab['tools'], $print);
- }
+ array_push($paramsTab['tools'], $print);
+ }
//Afficher la liste
- $list->showList($tab, $paramsTab, $listKey);
- // $list->debug();
+ $list->showList($tab, $paramsTab, $listKey);
+ // $list->debug();
- /*************************Extra javascript***********************/
- ?>
+ /*************************Extra javascript***********************/ ?>
<script type="text/javascript">
- var form_txt='<form name="frm_save_query" id="frm_save_query" action="#" method="post" class="forms" onsubmit="send_request(this.id, <?php echo "\'creation\'";?>);" ><h2><?php
- echo _SAVE_QUERY_TITLE;?></h2><p><label for="query_name"><?php echo _QUERY_NAME;
- ?></label><input type="text" name="query_name" id="query_name" style="width:200px;" value=""/></p><br/><p class="buttons"><input type="submit" name="submit" id="submit" value="<?php
- echo _VALIDATE;?>" class="button"/> <input type="button" name="cancel" id="cancel" value="<?php echo _CANCEL;
- ?>" class="button" onclick="destroyModal();"/></p></form>';
+ var form_txt='<form name="frm_save_query" id="frm_save_query" action="#" method="post" class="forms" onsubmit="send_request(this.id, <?php echo "\'creation\'"; ?>);" ><h2><?php
+ echo _SAVE_QUERY_TITLE; ?></h2><p><label for="query_name"><?php echo _QUERY_NAME; ?></label><input type="text" name="query_name" id="query_name" style="width:200px;" value=""/></p><br/><p class="buttons"><input type="submit" name="submit" id="submit" value="<?php
+ echo _VALIDATE; ?>" class="button"/> <input type="button" name="cancel" id="cancel" value="<?php echo _CANCEL; ?>" class="button" onclick="destroyModal();"/></p></form>';
function send_request(form_id,form_action)
{
@@ -917,7 +887,7 @@ if ($nbTab > 0) {
var q_creation = form_action;
$('modal').innerHTML = '<i class="fa fa-spinner fa-2x"></i>';
- new Ajax.Request('<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&dir=indexing_searching&page=manage_query',
+ new Ajax.Request('<?php echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&dir=indexing_searching&page=manage_query',
{
method:'post',
parameters: {action : q_creation},
@@ -925,26 +895,26 @@ if ($nbTab > 0) {
eval("response = "+answer.responseText)
if(response.status == 0)
{
- $('modal').innerHTML ='<h2><?php echo _QUERY_SAVED;?></h2><br/><input type="button" name="close" value="<?php echo _CLOSE_WINDOW;?>" onclick="destroyModal();" class="button" />';
+ $('modal').innerHTML ='<h2><?php echo _QUERY_SAVED; ?></h2><br/><input type="button" name="close" value="<?php echo _CLOSE_WINDOW; ?>" onclick="destroyModal();" class="button" />';
}
else if(response.status == 2)
{
- $('modal').innerHTML = '<div class="error"><?php echo _SQL_ERROR;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _SQL_ERROR; ?></div>'+form_txt;
form.query_name.value = this.name;
}
else if(response.status == 3)
{
- $('modal').innerHTML = '<div class="error"><?php echo _QUERY_NAME.' '._IS_EMPTY;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _QUERY_NAME.' '._IS_EMPTY; ?></div>'+form_txt;
form.query_name.value = this.name;
}
else
{
- $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR; ?></div>'+form_txt;
form.query_name.value = this.name;
}
},
onFailure: function(){
- $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR; ?></div>'+form_txt;
form.query_name.value = this.name;
}
});
@@ -958,7 +928,7 @@ if ($nbTab > 0) {
var q_creation = form_action;
$('modal').innerHTML = '<i class="fa fa-spinner fa-2x"></i>';
- new Ajax.Request('<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&dir=indexing_searching&page=manage_query',
+ new Ajax.Request('<?php echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&dir=indexing_searching&page=manage_query',
{
method:'post',
parameters: {name: q_name,
@@ -967,33 +937,32 @@ if ($nbTab > 0) {
eval("response = "+answer.responseText)
if(response.status == 0)
{
- $('modal').innerHTML ='<h2><?php echo _QUERY_SAVED;?></h2><br/><input type="button" name="close" value="<?php echo _CLOSE_WINDOW;?>" onclick="destroyModal();" class="button" />';
+ $('modal').innerHTML ='<h2><?php echo _QUERY_SAVED; ?></h2><br/><input type="button" name="close" value="<?php echo _CLOSE_WINDOW; ?>" onclick="destroyModal();" class="button" />';
}
else if(response.status == 2)
{
- $('modal').innerHTML = '<div class="error"><?php echo _SQL_ERROR;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _SQL_ERROR; ?></div>'+form_txt;
form.query_name.value = this.name;
}
else if(response.status == 3)
{
- $('modal').innerHTML = '<div class="error"><?php echo _QUERY_NAME.' '._IS_EMPTY;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _QUERY_NAME.' '._IS_EMPTY; ?></div>'+form_txt;
form.query_name.value = this.name;
}
else if(response.status == 4)
{
- $('modal').innerHTML = '<form name="frm_save_query" id="<?php echo $_SESSION['seekName'];?>" action="#" method="post" class="forms" onsubmit="send_request(this.id, <?php echo "\'creation_ok\'";?>);" ><h2><?php
- echo _SAVE_CONFIRM;?></h2><p><b><?php echo _SAVED_ALREADY_EXIST;?></b></p><p><?php echo _OK_FOR_CONFIRM;?></p><br/><p class="buttons"><input type="submit" name="submit" id="submit" value="<?php
- echo _VALIDATE;?>" class="button"/> <input type="button" name="cancel" id="cancel" value="<?php echo _CANCEL;
- ?>" class="button" onclick="destroyModal();"/></p></form>';
+ $('modal').innerHTML = '<form name="frm_save_query" id="<?php echo $_SESSION['seekName']; ?>" action="#" method="post" class="forms" onsubmit="send_request(this.id, <?php echo "\'creation_ok\'"; ?>);" ><h2><?php
+ echo _SAVE_CONFIRM; ?></h2><p><b><?php echo _SAVED_ALREADY_EXIST; ?></b></p><p><?php echo _OK_FOR_CONFIRM; ?></p><br/><p class="buttons"><input type="submit" name="submit" id="submit" value="<?php
+ echo _VALIDATE; ?>" class="button"/> <input type="button" name="cancel" id="cancel" value="<?php echo _CANCEL; ?>" class="button" onclick="destroyModal();"/></p></form>';
}
else
{
- $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR; ?></div>'+form_txt;
form.query_name.value = this.name;
}
},
onFailure: function(){
- $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR;?></div>'+form_txt;
+ $('modal').innerHTML = '<div class="error"><?php echo _SERVER_ERROR; ?></div>'+form_txt;
form.query_name.value = this.name;
}
});
@@ -1003,12 +972,11 @@ if ($nbTab > 0) {
<?php
exit();
} else {
-
echo '<script type="text/javascript">window.top.location.href=\''.$url_error.'\';</script>';
exit();
}
-if($mode == 'popup' || $mode == 'frame') {
+if ($mode == 'popup' || $mode == 'frame') {
echo '</div>';
echo '</div>';
echo '</body>';
diff --git a/apps/maarch_entreprise/indexing_searching/little_details_invoices.php b/apps/maarch_entreprise/indexing_searching/little_details_invoices.php
index a045ad6bcfd9327919ace6b727e756eb22defa2d..5010e090ac42408c74478a9e9d51b8f2ca5e28cc 100755
--- a/apps/maarch_entreprise/indexing_searching/little_details_invoices.php
+++ b/apps/maarch_entreprise/indexing_searching/little_details_invoices.php
@@ -1,26 +1,26 @@
<?php
/**
-* File : little_details_invoices.php
+* File : little_details_invoices.php.
*
-* @package Maarch Entreprise
* @version 2.1
+*
* @since 05/2011
+*
* @license GPL
* @author Claire Figueras <dev@maarch.org>
*/
-
require 'core/class/class_request.php';
-require 'apps/' . $_SESSION['config']['app_id'] . '/class/class_list_show.php';
+require 'apps/'.$_SESSION['config']['app_id'].'/class/class_list_show.php';
require_once 'core/class/class_security.php';
require_once 'core/class/class_history.php';
require_once 'core/manage_bitmask.php';
-require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . "security_bitmask.php";
-require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR
- . "class_indexing_searching_app.php";
-require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR . "class_types.php";
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+ .DIRECTORY_SEPARATOR.'security_bitmask.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+ .DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR
+ .'class_indexing_searching_app.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+ .DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_types.php';
$core = new core_tools();
$core->test_user();
@@ -28,13 +28,13 @@ $core->load_lang();
$resId = '';
if (isset($_REQUEST['value']) && !empty($_REQUEST['value'])) {
- $resId = $_REQUEST['value'];
+ $resId = $_REQUEST['value'];
}
$hist = new history();
$security = new security();
$func = new functions();
-$request = new request;
+$request = new request();
$type = new types();
//$_SESSION['req'] ='details';
//$_SESSION['indexing'] = array();
@@ -42,29 +42,28 @@ $is = new indexing_searching_app();
$table = '';
$isView = false;
if (isset($_SESSION['collection_id_choice'])
- && ! empty($_SESSION['collection_id_choice'])
+ && !empty($_SESSION['collection_id_choice'])
) {
- $collId = $_SESSION['collection_id_choice'];
+ $collId = $_SESSION['collection_id_choice'];
} else {
- $collId = $_SESSION['user']['collections'][0];
+ $collId = $_SESSION['user']['collections'][0];
}
if ($collId == 'letterbox_coll') {
- if (file_exists(
- $_SESSION['config']['corepath'] . 'custom'. DIRECTORY_SEPARATOR
- . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'apps'
- . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] . DIRECTORY_SEPARATOR
- . 'definition_mail_categories.php'
- )
- ) {
- $path = $_SESSION['config']['corepath'] . 'custom'. DIRECTORY_SEPARATOR
- . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'apps'
- . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . 'definition_mail_categories.php';
- } else {
- $path = 'apps' . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . 'definition_mail_categories.php';
- }
-
+ if (file_exists(
+ $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
+ .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'
+ .DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
+ .'definition_mail_categories.php'
+ )
+ ) {
+ $path = $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
+ .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'
+ .DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+ .DIRECTORY_SEPARATOR.'definition_mail_categories.php';
+ } else {
+ $path = 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+ .DIRECTORY_SEPARATOR.'definition_mail_categories.php';
+ }
}
include_once $path;
@@ -72,8 +71,8 @@ include_once $path;
$table = $security->retrieve_view_from_coll_id($collId);
$isView = true;
if (empty($table)) {
- $table = $security->retrieve_table_from_coll($collId);
- $isView = false;
+ $table = $security->retrieve_table_from_coll($collId);
+ $isView = false;
}
$_SESSION['id_to_view'] = $resId;
@@ -81,20 +80,20 @@ $_SESSION['doc_id'] = $resId;
$right = $security->test_right_doc($collId, $resId);
-if (! $right && $resId <> '') {
- include('apps/'.$_SESSION['config']['app_id'].'/no_right.php');
- exit;
+if (!$right && $resId != '') {
+ include 'apps/'.$_SESSION['config']['app_id'].'/no_right.php';
+ exit;
}
if ($resId == '') {
- echo '<br><br><center><h2 style="color:#FFC200;">' . _NO_RESULTS
- . '</h2></center>';
+ echo '<br><br><center><h2 style="color:#F99830;">'._NO_RESULTS
+ .'</h2></center>';
exit;
}
-if (isset($resId) && ! empty($resId)
- && $_SESSION['history']['resview'] == 'true'
+if (isset($resId) && !empty($resId)
+ && $_SESSION['history']['resview'] == 'true'
) {
- $hist->add(
- $table, $resId , 'VIEW','resview', _VIEW_DOC_NUM . $resId,
+ $hist->add(
+ $table, $resId, 'VIEW', 'resview', _VIEW_DOC_NUM.$resId,
$_SESSION['config']['databasetype'], 'apps'
);
}
@@ -102,40 +101,40 @@ $modifyDoc = false;
$deleteDoc = false;
if (empty($_SESSION['error'])) {
- $db = new Database();
+ $db = new Database();
$compFields = '';
- $stmt = $db->query("SELECT type_id FROM " . $table . " WHERE res_id = ?", array($resId));
+ $stmt = $db->query('SELECT type_id FROM '.$table.' WHERE res_id = ?', array($resId));
if ($stmt->rowCount() > 0) {
$res = $stmt->fetchObject();
$typeId = $res->type_id;
$indexes = $type->get_indexes($typeId, $collId, 'minimal');
- for ($i = 0; $i < count($indexes); $i ++) {
+ for ($i = 0; $i < count($indexes); ++$i ) {
// In the view all custom from res table begin with doc_
if (preg_match('/^custom_/', $indexes[$i])) {
- $compFields .= ', doc_' . $indexes[$i];
+ $compFields .= ', doc_'.$indexes[$i];
} else {
- $compFields .= ', ' . $indexes[$i];
+ $compFields .= ', '.$indexes[$i];
}
}
}
$caseSqlComplementary = '';
if ($core->is_module_loaded('cases') == true && $table == 'res_view_letterbox') {
- $caseSqlComplementary = " , case_id";
+ $caseSqlComplementary = ' , case_id';
}
$stmt = $db->query(
- "SELECT status, format, typist, creation_date, fingerprint, filesize, "
- . "res_id, work_batch, page_count, is_paper, scan_date, scan_user, "
- . "scan_location, scan_wkstation, scan_batch, source, doc_language, "
- . "description, closing_date, type_id " . $compFields
- . $caseSqlComplementary . " FROM " . $table . " WHERE res_id = ?",
+ 'SELECT status, format, typist, creation_date, fingerprint, filesize, '
+ .'res_id, work_batch, page_count, is_paper, scan_date, scan_user, '
+ .'scan_location, scan_wkstation, scan_batch, source, doc_language, '
+ .'description, closing_date, type_id '.$compFields
+ .$caseSqlComplementary.' FROM '.$table.' WHERE res_id = ?',
array($resId)
);
}
?>
<div id="" class="clearfix">
<?php
-if (! empty($_SESSION['error']) ) {
+if (!empty($_SESSION['error'])) {
?>
<div class="error">
<br />
@@ -143,419 +142,369 @@ if (! empty($_SESSION['error']) ) {
<br />
<?php
functions::xecho($_SESSION['error']);
- $_SESSION['error'] = "";
- ?>
+ $_SESSION['error'] = ''; ?>
<br />
<br />
<br />
</div>
<?php
} else {
- if ($stmt->rowCount() == 0) {
+ if ($stmt->rowCount() == 0) {
?>
<div align="center">
<br />
<br />
- <?php echo _NO_DOCUMENT_CORRESPOND_TO_IDENTIFIER;?>.
+ <?php echo _NO_DOCUMENT_CORRESPOND_TO_IDENTIFIER; ?>.
<br />
<br />
<br />
</div>
<?php
- } else {
- $paramData = array(
- 'img_category_id' => true,
- 'img_priority' => true,
- 'img_type_id' => true,
- 'img_doc_date' => true,
- 'img_admission_date' => true,
- 'img_nature_id' => true,
- 'img_subject' => true,
- 'img_process_limit_date' => true,
- 'img_author' => true,
- 'img_destination' => true,
- 'img_arbox_id' => true,
- 'img_project' => true
+ } else {
+ $paramData = array(
+ 'img_category_id' => true,
+ 'img_priority' => true,
+ 'img_type_id' => true,
+ 'img_doc_date' => true,
+ 'img_admission_date' => true,
+ 'img_nature_id' => true,
+ 'img_subject' => true,
+ 'img_process_limit_date' => true,
+ 'img_author' => true,
+ 'img_destination' => true,
+ 'img_arbox_id' => true,
+ 'img_project' => true,
);
- $res = $stmt->fetchObject();
- $typeId = $res->type_id;
- $typist = $res->typist;
- $format = $res->format;
- $filesize = $res->filesize;
- $creationDate = functions::format_date_db($res->creation_date, false);
- $fingerprint = $res->fingerprint;
- $workBatch = $res->work_batch;
- $pageCount = $res->page_count;
- $isPaper = $res->is_paper;
- $scanDate = functions::format_date_db($res->scan_date);
- $scanUser = $res->scan_user;
- $scanLocation = $res->scan_location;
- $scanWkstation = $res->scan_wkstation;
- $scanBatch = $res->scan_batch;
- $docLanguage = $res->doc_language;
- $closingDate = functions::format_date_db($res->closing_date, false);
- $indexes = $type->get_indexes($typeId, $collId);
+ $res = $stmt->fetchObject();
+ $typeId = $res->type_id;
+ $typist = $res->typist;
+ $format = $res->format;
+ $filesize = $res->filesize;
+ $creationDate = functions::format_date_db($res->creation_date, false);
+ $fingerprint = $res->fingerprint;
+ $workBatch = $res->work_batch;
+ $pageCount = $res->page_count;
+ $isPaper = $res->is_paper;
+ $scanDate = functions::format_date_db($res->scan_date);
+ $scanUser = $res->scan_user;
+ $scanLocation = $res->scan_location;
+ $scanWkstation = $res->scan_wkstation;
+ $scanBatch = $res->scan_batch;
+ $docLanguage = $res->doc_language;
+ $closingDate = functions::format_date_db($res->closing_date, false);
+ $indexes = $type->get_indexes($typeId, $collId);
- if ($core->is_module_loaded('cases') == true) {
- require_once 'modules/cases/class/class_modules_tools.php';
- $case = new cases();
- if ($res->case_id <> '') {
- $caseProperties = $case->get_case_info($res->case_id);
+ if ($core->is_module_loaded('cases') == true) {
+ require_once'modules/cases/class/class_modules_tools.php';
+ $case = new cases();
+ if ($res->case_id != '') {
+ $caseProperties = $case->get_case_info($res->case_id);
+ }
}
- }
- foreach (array_keys($indexes) as $key) {
- if (preg_match('/^custom/', $key)) {
- $tmp = 'doc_' . $key;
- } else {
- $tmp = $key;
- }
- if ($indexes[$key]['type'] == "date") {
- $res->{$tmp} = functions::format_date_db($res->{$tmp}, false);
- }
- $indexes[$key]['value'] = $res->{$tmp};
- $indexes[$key]['show_value'] = $res->{$tmp};
- if ($indexes[$key]['type'] == "string") {
- $indexes[$key]['show_value'] = functions::show_string($res->{$tmp});
- } else if ($indexes[$key]['type'] == "date") {
- $indexes[$key]['show_value'] = functions::format_date_db($res->{$tmp}, true);
+ foreach (array_keys($indexes) as $key) {
+ if (preg_match('/^custom/', $key)) {
+ $tmp = 'doc_'.$key;
+ } else {
+ $tmp = $key;
+ }
+ if ($indexes[$key]['type'] == 'date') {
+ $res->{$tmp} = functions::format_date_db($res->{$tmp}, false);
+ }
+ $indexes[$key]['value'] = $res->{$tmp};
+ $indexes[$key]['show_value'] = $res->{$tmp};
+ if ($indexes[$key]['type'] == 'string') {
+ $indexes[$key]['show_value'] = functions::show_string($res->{$tmp});
+ } elseif ($indexes[$key]['type'] == 'date') {
+ $indexes[$key]['show_value'] = functions::format_date_db($res->{$tmp}, true);
+ }
}
- }
- // $processData = $is->get_process_data($collId, $resId);
- $status = $res->status;
- if (! empty($status)) {
- require_once 'core/class/class_manage_status.php';
- $statusObj = new manage_status();
- $resStatus = $statusObj->get_status_data($status);
- if ($modifyDoc) {
- $canBeModified = $statusObj->can_be_modified($status);
- if (! $canBeModified) {
- $modifyDoc = false;
+ // $processData = $is->get_process_data($collId, $resId);
+ $status = $res->status;
+ if (!empty($status)) {
+ require_once'core/class/class_manage_status.php';
+ $statusObj = new manage_status();
+ $resStatus = $statusObj->get_status_data($status);
+ if ($modifyDoc) {
+ $canBeModified = $statusObj->can_be_modified($status);
+ if (!$canBeModified) {
+ $modifyDoc = false;
+ }
}
}
- }
- $dataMode = 'full';
- if ($modifyDoc) {
- $dataMode = 'form';
- }
- foreach (array_keys($indexes) as $key) {
- $indexes[$key]['opt_index'] = true;
- if ($indexes[$key]['type_field'] == 'select') {
- for ($i = 0; $i < count($indexes[$key]['values']); $i ++) {
- if ($indexes[$key]['values'][$i]['id'] == $indexes[$key]['value']) {
- $indexes[$key]['show_value'] = $indexes[$key]['values'][$i]['label'] ;
- break;
+ $dataMode = 'full';
+ if ($modifyDoc) {
+ $dataMode = 'form';
+ }
+ foreach (array_keys($indexes) as $key) {
+ $indexes[$key]['opt_index'] = true;
+ if ($indexes[$key]['type_field'] == 'select') {
+ for ($i = 0; $i < count($indexes[$key]['values']); ++$i ) {
+ if ($indexes[$key]['values'][$i]['id'] == $indexes[$key]['value']) {
+ $indexes[$key]['show_value'] = $indexes[$key]['values'][$i]['label'];
+ break;
+ }
}
}
+ if (!$modifyDoc) {
+ $indexes[$key]['readonly'] = true;
+ $indexes[$key]['type_field'] = 'input';
+ } else {
+ $indexes[$key]['readonly'] = false;
+ }
}
- if (! $modifyDoc) {
- $indexes[$key]['readonly'] = true;
- $indexes[$key]['type_field'] = 'input';
- } else {
- $indexes[$key]['readonly'] = false;
- }
- }
- $data = get_general_data($collId, $resId, $dataMode, $paramData);
- ?>
+ $data = get_general_data($collId, $resId, $dataMode, $paramData); ?>
<div align="center">
<form method="post" name="index_doc" action="#" class="forms">
<div class="block">
<p align="left">
<h3 align="left" onclick="new Effect.toggle('desc3', 'blind');" onmouseover="document.body.style.cursor='pointer';" onmouseout="document.body.style.cursor='auto';" id="h23" class="categorie">
- <a href="#"><?php echo _SHOW_DETAILS_DOC;?></a>
+ <a href="#"><?php echo _SHOW_DETAILS_DOC; ?></a>
</h3>
</p>
</div>
<div class="desc block_light admin" id="desc3" style="display:none">
<div class="ref-unit">
- <?php echo _MENU." : ";?>
+ <?php echo _MENU.' : '; ?>
<a href="<?php
- echo $_SESSION['config']['businessappurl'];
- ?>index.php?display=true&page=view_resource_controler&id=<?php
- functions::xecho($resId);
- ?>&dir=indexing_searching" target="_blank"><b><?php
- echo _VIEW_DOC_FULL;?></b> </a>
+ echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&page=view_resource_controler&id=<?php
+ functions::xecho($resId); ?>&dir=indexing_searching" target="_blank"><b><?php
+ echo _VIEW_DOC_FULL; ?></b> </a>
|
- <?php if($collId=='business_coll'){ ?>
+ <?php if ($collId == 'business_coll') {
+ ?>
<a href="javascript://" onClick="window.top.location.href='<?php
- echo $_SESSION['config']['businessappurl'];
- ?>index.php?page=details_business&dir=indexing_searching&id=<?php
- functions::xecho($resId);
- ?>';"><b><?php echo _DETAILS_DOC_FULL;?> </b></a>
- <?php }else{ ?>
+ echo $_SESSION['config']['businessappurl']; ?>index.php?page=details_business&dir=indexing_searching&id=<?php
+ functions::xecho($resId); ?>';"><b><?php echo _DETAILS_DOC_FULL; ?> </b></a>
+ <?php
+ } else {
+ ?>
<a href="javascript://" onClick="window.top.location.href='<?php
- echo $_SESSION['config']['businessappurl'];
- ?>index.php?page=details&dir=indexing_searching&id=<?php
- functions::xecho($resId);
- ?>';"><b><?php echo _DETAILS_DOC_FULL;?> </b></a>
- <?php } ?>
+ echo $_SESSION['config']['businessappurl']; ?>index.php?page=details&dir=indexing_searching&id=<?php
+ functions::xecho($resId); ?>';"><b><?php echo _DETAILS_DOC_FULL; ?> </b></a>
+ <?php
+ } ?>
<hr/>
<p>
- <label><?php echo _NUM_GED." ";?></label>
- <input type="text" name="resId" id="resId" value="<?php functions::xecho($resId);?>" class="readonly" readonly="readonly" />
+ <label><?php echo _NUM_GED.' '; ?></label>
+ <input type="text" name="resId" id="resId" value="<?php functions::xecho($resId); ?>" class="readonly" readonly="readonly" />
</p>
<?php
- $i = 0;
- foreach (array_keys($data) as $key) {
- $folderId = "";
- if (($key == "market" || $key == "project")
- && $data[$key]['show_value'] <> ""
+ $i = 0;
+ foreach (array_keys($data) as $key) {
+ $folderId = '';
+ if (($key == 'market' || $key == 'project')
+ && $data[$key]['show_value'] != ''
) {
- $folderTmp = $data[$key]['show_value'];
- $find1 = strpos($folderTmp, '(');
- $folderId = substr($folderTmp, $find1, strlen($folderTmp));
- $folderId = str_replace("(", "", $folderId);
- $folderId = str_replace(")", "", $folderId);
- }
- ?>
+ $folderTmp = $data[$key]['show_value'];
+ $find1 = strpos($folderTmp, '(');
+ $folderId = substr($folderTmp, $find1, strlen($folderTmp));
+ $folderId = str_replace('(', '', $folderId);
+ $folderId = str_replace(')', '', $folderId);
+ } ?>
<p>
<label><?php
if (isset($data[$key]['addon'])) {
- echo $data[$key]['addon'];
- } else if (isset($data[$key]['img'])) {
- if ($folderId <> "") {
- echo "<a href='" . $_SESSION['config']['businessappurl']
- . "index.php?page=show_folder&module=folder&id="
- . $folderId . "'>";
- ?>
- <i class="fa fa-<?php functions::xecho($data[$key]['img']);?>"></i></a>
+ echo $data[$key]['addon'];
+ } elseif (isset($data[$key]['img'])) {
+ if ($folderId != '') {
+ echo "<a href='".$_SESSION['config']['businessappurl']
+ .'index.php?page=show_folder&module=folder&id='
+ .$folderId."'>"; ?>
+ <i class="fa fa-<?php functions::xecho($data[$key]['img']); ?>"></i></a>
<?php
- } else {
- ?>
- <i class="fa fa-<?php functions::xecho($data[$key]['img']);?>"></i></a>
+ } else {
+ ?>
+ <i class="fa fa-<?php functions::xecho($data[$key]['img']); ?>"></i></a>
<?php
- }
}
- functions::xecho($data[$key]['label']);?> </label><?php
- if (! isset($data[$key]['readonly'])
+ }
+ functions::xecho($data[$key]['label']); ?> </label><?php
+ if (!isset($data[$key]['readonly'])
|| $data[$key]['readonly'] == true
) {
if ($data[$key]['display'] == 'textinput') {
?>
- <input type="text" name="<?php functions::xecho($key);?>" id="<?php
- functions::xecho($key);
- ?>" value="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" readonly="readonly" class="readonly" size="40" title="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" alt="<?php functions::xecho($data[$key]['show_value']);?>" />
+ <input type="text" name="<?php functions::xecho($key); ?>" id="<?php
+ functions::xecho($key); ?>" value="<?php
+ functions::xecho($data[$key]['show_value']); ?>" readonly="readonly" class="readonly" size="40" title="<?php
+ functions::xecho($data[$key]['show_value']); ?>" alt="<?php functions::xecho($data[$key]['show_value']); ?>" />
<?php
} else {
- ?>
- <input type="text" name="<?php functions::xecho($key);?>" id="<?php
- functions::xecho($key);
- ?>" value="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" readonly="readonly" class="readonly" size="40" title="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" alt="<?php functions::xecho($data[$key]['show_value']);?>" />
+ ?>
+ <input type="text" name="<?php functions::xecho($key); ?>" id="<?php
+ functions::xecho($key); ?>" value="<?php
+ functions::xecho($data[$key]['show_value']); ?>" readonly="readonly" class="readonly" size="40" title="<?php
+ functions::xecho($data[$key]['show_value']); ?>" alt="<?php functions::xecho($data[$key]['show_value']); ?>" />
<?php
}
} else {
if ($data[$key]['field_type'] == 'textfield') {
?>
- <input type="text" name="<?php functions::xecho($key);?>" id="<?php
- functions::xecho($key);
- ?>" value="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" size="40" title="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" alt="<?php functions::xecho($data[$key]['show_value']);?>" />
+ <input type="text" name="<?php functions::xecho($key); ?>" id="<?php
+ functions::xecho($key); ?>" value="<?php
+ functions::xecho($data[$key]['show_value']); ?>" size="40" title="<?php
+ functions::xecho($data[$key]['show_value']); ?>" alt="<?php functions::xecho($data[$key]['show_value']); ?>" />
<?php
- } else if ($data[$key]['field_type'] == 'date') {
+ } elseif ($data[$key]['field_type'] == 'date') {
?>
- <input type="text" name="<?php functions::xecho($key);?>" id="<?php
- functions::xecho($key);
- ?>" value="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" size="40" title="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" alt="<?php
- functions::xecho($data[$key]['show_value']);
- ?>" onclick="showCalender(this);" />
+ <input type="text" name="<?php functions::xecho($key); ?>" id="<?php
+ functions::xecho($key); ?>" value="<?php
+ functions::xecho($data[$key]['show_value']); ?>" size="40" title="<?php
+ functions::xecho($data[$key]['show_value']); ?>" alt="<?php
+ functions::xecho($data[$key]['show_value']); ?>" onclick="showCalender(this);" />
<?php
- } else if ($data[$key]['field_type'] == 'select') {
+ } elseif ($data[$key]['field_type'] == 'select') {
?>
- <select id="<?php functions::xecho($key);?>" name="<?php
- functions::xecho($key);
- ?>" <?php
+ <select id="<?php functions::xecho($key); ?>" name="<?php
+ functions::xecho($key); ?>" <?php
if ($key == 'type_id') {
echo 'onchange="change_doctype_details'
- . '(this.options[this.options.selectedIndex].value, \''
- . $_SESSION['config']['businessappurl']
- . 'index.php?display=true&dir='
- . 'indexing_searching&page=change_doctype_details\' , \''
+ .'(this.options[this.options.selectedIndex].value, \''
+ .$_SESSION['config']['businessappurl']
+ .'index.php?display=true&dir='
+ .'indexing_searching&page=change_doctype_details\' , \''
._DOCTYPE.' '._MISSING.'\');"';
- }
- ?>>
+ } ?>>
<?php
if ($key == 'type_id') {
if ($_SESSION['features']['show_types_tree'] == 'true') {
for ($k = 0; $k < count($data[$key]['select']);
- $k ++
+ ++$k
) {
?><option value="" class="doctype_level1"><?php
- functions::xecho($data[$key]['select'][$k]['label']);
- ?></option><?php
+ functions::xecho($data[$key]['select'][$k]['label']); ?></option><?php
for ($j = 0; $j < count(
$data[$key]['select'][$k]['level2']
- ); $j ++
+ ); ++$j
) {
?><option value="" class="doctype_level2"> <?php
- functions::xecho($data[$key]['select'][$k]['level2'][$j]['label']);
- ?></option><?php
+ functions::xecho($data[$key]['select'][$k]['level2'][$j]['label']); ?></option><?php
for ($l = 0; $l < count(
$data[$key]['select'][$k]['level2'][$j]['types']
- ); $l ++
+ ); ++$l
) {
?><option <?php
if ($data[$key]['value'] == $data[$key]['select'][$k]['level2'][$j]['types'][$l]['id']) {
echo 'selected="selected"';
- }
- ?> value="<?php
- functions::xecho($data[$key]['select'][$k]['level2'][$j]['types'][$l]['id']);
- ?>" > <?php echo
- $data[$key]['select'][$k]['level2'][$j]['types'][$l]['label'];
- ?></option><?php
+ } ?> value="<?php
+ functions::xecho($data[$key]['select'][$k]['level2'][$j]['types'][$l]['id']); ?>" > <?php echo
+ $data[$key]['select'][$k]['level2'][$j]['types'][$l]['label']; ?></option><?php
}
}
}
} else {
for ($k = 0; $k < count($data[$key]['select']);
- $k ++
+ ++$k
) {
?><option <?php
if ($data[$key]['value'] == $data[$key]['select'][$k]['ID']) {
echo 'selected="selected"';
- }
- ?> value="<?php
- functions::xecho($data[$key]['select'][$k]['ID']);
- ?>" ><?php
- functions::xecho($data[$key]['select'][$k]['LABEL']);
- ?></option><?php
+ } ?> value="<?php
+ functions::xecho($data[$key]['select'][$k]['ID']); ?>" ><?php
+ functions::xecho($data[$key]['select'][$k]['LABEL']); ?></option><?php
}
}
} else {
- for ($k = 0; $k < count($data[$key]['select']); $k ++) {
+ for ($k = 0; $k < count($data[$key]['select']); ++$k ) {
?><option value="<?php
- functions::xecho($data[$key]['select'][$k]['ID']);
- ?>" <?php
+ functions::xecho($data[$key]['select'][$k]['ID']); ?>" <?php
if ($data[$key]['value'] == $data[$key]['select'][$k]['ID']) {
echo 'selected="selected"';
- }
- ?>><?php
- functions::xecho($data[$key]['select'][$k]['LABEL']);
- ?></option><?php
+ } ?>><?php
+ functions::xecho($data[$key]['select'][$k]['LABEL']); ?></option><?php
}
- }
- ?>
+ } ?>
</select>
<?php
- } else if ($data[$key]['field_type'] == 'autocomplete') {
+ } elseif ($data[$key]['field_type'] == 'autocomplete') {
if ($key == 'project') {
- //$('market').value='';return false;
- ?><input type="text" name="project" id="project" value="<?php
- functions::xecho($data['project']['show_value']);
- ?>" /><div id="show_project" class="autocomplete"></div><script type="text/javascript">launch_autocompleter_folders('<?php
- echo $_SESSION['config']['businessappurl'];
- ?>index.php?display=true&module=folder&page=autocomplete_folders&mode=project', 'project');</script>
+ //$('market').value='';return false; ?><input type="text" name="project" id="project" value="<?php
+ functions::xecho($data['project']['show_value']); ?>" /><div id="show_project" class="autocomplete"></div><script type="text/javascript">launch_autocompleter_folders('<?php
+ echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&module=folder&page=autocomplete_folders&mode=project', 'project');</script>
<?php
- } else if ($key == 'market') {
+ } elseif ($key == 'market') {
?><input type="text" name="market" id="market" onblur="fill_project('<?php
- echo $_SESSION['config']['businessappurl'];
- ?>index.php?display=true&module=folder&page=ajax_get_project');return false;" value="<?php functions::xecho($data['market']['show_value']);?>"/><div id="show_market" class="autocomplete"></div>
+ echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&module=folder&page=ajax_get_project');return false;" value="<?php functions::xecho($data['market']['show_value']); ?>"/><div id="show_market" class="autocomplete"></div>
<script type="text/javascript">launch_autocompleter_folders('<?php
- echo $_SESSION['config']['businessappurl'];
- ?>index.php?display=true&module=folder&page=autocomplete_folders&mode=market', 'market');</script>
+ echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&module=folder&page=autocomplete_folders&mode=market', 'market');</script>
<?php
}
}
}
- echo '</p>';
- $i ++;
- }
- foreach (array_keys($indexes) as $key) {
- echo '<p>';
- /* if (isset($indexes[$key]['img'])) {
- ?>
- <img alt="<?php functions::xecho($indexes[$key]['label']);?>" title="<?php functions::xecho($indexes[$key]['label']);?>" src="<?php functions::xecho($indexes[$key]['img']);?>" /></a>
- <?php
- }*/
- ?><label><?php functions::xecho($indexes[$key]['label']);?> :</label>
+ echo '</p>';
+ ++$i;
+ }
+ foreach (array_keys($indexes) as $key) {
+ echo '<p>';
+ /* if (isset($indexes[$key]['img'])) {
+ ?>
+ <img alt="<?php functions::xecho($indexes[$key]['label']);?>" title="<?php functions::xecho($indexes[$key]['label']);?>" src="<?php functions::xecho($indexes[$key]['img']);?>" /></a>
+ <?php
+ }*/ ?><label><?php functions::xecho($indexes[$key]['label']); ?> :</label>
<?php
if ($indexes[$key]['type_field'] == 'input') {
?>
- <input type="text" name="<?php functions::xecho($key);?>" id="<?php
- functions::xecho($key);
- ?>" value="<?php functions::xecho($indexes[$key]['show_value']);?>" <?php
- if (! isset($indexes[$key]['readonly'])
+ <input type="text" name="<?php functions::xecho($key); ?>" id="<?php
+ functions::xecho($key); ?>" value="<?php functions::xecho($indexes[$key]['show_value']); ?>" <?php
+ if (!isset($indexes[$key]['readonly'])
|| $indexes[$key]['readonly'] == true
) {
echo 'readonly="readonly" class="readonly"';
- } else if ($indexes[$key]['type'] == 'date') {
+ } elseif ($indexes[$key]['type'] == 'date') {
echo 'onclick="showCalender(this);"';
- }
- ?> size="40" title="<?php
- functions::xecho($indexes[$key]['show_value']);
- ?>" alt="<?php functions::xecho($indexes[$key]['show_value']);?>" />
+ } ?> size="40" title="<?php
+ functions::xecho($indexes[$key]['show_value']); ?>" alt="<?php functions::xecho($indexes[$key]['show_value']); ?>" />
<?php
} else {
?>
- <select name="<?php functions::xecho($key);?>" id="<?php functions::xecho($key);?>" >
- <option value=""><?php echo _CHOOSE;?>...</option>
+ <select name="<?php functions::xecho($key); ?>" id="<?php functions::xecho($key); ?>" >
+ <option value=""><?php echo _CHOOSE; ?>...</option>
<?php
- for ($i = 0; $i < count($indexes[$key]['values']); $i ++) {
+ for ($i = 0; $i < count($indexes[$key]['values']); ++$i ) {
?>
<option value="<?php
- functions::xecho($indexes[$key]['values'][$i]['id']);
- ?>" <?php
+ functions::xecho($indexes[$key]['values'][$i]['id']); ?>" <?php
if ($indexes[$key]['values'][$i]['id'] == $indexes[$key]['value']) {
echo 'selected="selected"';
- }
- ?>><?php
- functions::xecho($indexes[$key]['values'][$i]['label']);
- ?></option><?php
- }
- ?>
+ } ?>><?php
+ functions::xecho($indexes[$key]['values'][$i]['label']); ?></option><?php
+ } ?>
</select><?php
}
- }
- ?>
+ } ?>
</div>
</div>
</form>
<iframe name="view" id="view" width="100%" height="700" frameborder="0" scrolling="auto" src="<?php
- echo $_SESSION['config']['businessappurl'] . "index.php?display=true"
- . "&dir=indexing_searching&page=view_resource_controler&id="
- . functions::xssafe($resId);
- ?>"></iframe>
+ echo $_SESSION['config']['businessappurl'].'index.php?display=true'
+ .'&dir=indexing_searching&page=view_resource_controler&id='
+ .functions::xssafe($resId); ?>"></iframe>
<?php
- if (! empty($_SESSION['error_page'])) {
+ if (!empty($_SESSION['error_page'])) {
?>
<script type="text/javascript">
- alert("<?php functions::xecho($func->wash_html($_SESSION['error_page']));?>");
+ alert("<?php functions::xecho($func->wash_html($_SESSION['error_page'])); ?>");
<?php
if (isset($_POST['delete_doc'])) {
- ?>
+ ?>
window.location.href = 'index.php';
<?php
- }
- ?>
+ } ?>
</script>
<?php
- $_SESSION['error'] = "";
- $_SESSION['error_page'] = "";
- }
- ?>
+ $_SESSION['error'] = '';
+ $_SESSION['error_page'] = '';
+ } ?>
</div>
<?php
+ }
}
-}
$core->load_js();
?>
diff --git a/apps/maarch_entreprise/js/angular/app/signature-book.component.ts b/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
index 2645efe97c25d3bb0ef436124665c4b1de096d9d..ab0fee01c5e1478d3c62f60654c7265f08c2dcf4 100755
--- a/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/signature-book.component.ts
@@ -246,7 +246,7 @@ export class SignatureBookComponent implements OnInit {
} else {
this.rightContentWidth = "48%";
this.leftContentWidth = "48%";
- $j("#hideLeftContent").css('background', '#CEE9F1');
+ $j("#hideLeftContent").css('background', '#F2F2F2');
}
} else if (panel == "RESLEFT") {
this.showResLeftPanel = !this.showResLeftPanel;
diff --git a/apps/maarch_entreprise/js/functions.js b/apps/maarch_entreprise/js/functions.js
index 0884065426978a6ff26eb1c22550e9d3fc50808f..f51fa56231160ea8befc7c777e2756d13b1f84e8 100755
--- a/apps/maarch_entreprise/js/functions.js
+++ b/apps/maarch_entreprise/js/functions.js
@@ -2189,7 +2189,7 @@ function valid_report_by_period(url)
fillColor : "rgba(151,187,205,0.5)",
strokeColor : "rgba(151,187,205,0.8)",
highlightFill : "rgba(151,187,205,0.75)",
- highlightStroke : "#fdd16c",
+ highlightStroke : "#F99830",
data : response.data
}
]
diff --git a/apps/maarch_entreprise/loadContactsList.php b/apps/maarch_entreprise/loadContactsList.php
index debbbaaa95ec0a847e182ce15b52009fb10fbc42..415fa329d9b26ed6fd5457b538a50750e829b082 100755
--- a/apps/maarch_entreprise/loadContactsList.php
+++ b/apps/maarch_entreprise/loadContactsList.php
@@ -1,129 +1,127 @@
-<?php
-
-/*
-* Copyright 2008-2015 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework 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.
-*
-* Maarch Framework 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 Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-require_once('core/class/class_core_tools.php');
-$Core_Tools = new core_tools;
-$Core_Tools->load_lang();
-
-$return = '';
-
-if (isset($_REQUEST['res_id'])) {
- $status = 0;
- $return .= '<td>';
- $return .= '<div align="center">';
- $return .= '<table width="100%">';
-
- $db = new Database();
-
- $query = "SELECT c.is_corporate_person, c.is_private, c.contact_firstname, c.contact_lastname, c.firstname, c.lastname, c.society, c.society_short, c.contact_purpose_label, c.address_num, c.address_street, c.address_complement, c.address_town, c.address_postal_code, c.address_country, cres.mode ";
- $query .= "FROM view_contacts c, contacts_res cres ";
- $query .= "WHERE cres.coll_id = 'letterbox_coll' AND cres.res_id = ? AND cast (c.contact_id as varchar(128)) = cres.contact_id AND c.ca_id = cres.address_id ORDER BY cres.mode ASC";
- $arrayPDO = array($_REQUEST['res_id']);
- $stmt = $db->query($query, $arrayPDO);
-
- $fetch = '';
- while ($res = $stmt->fetchObject()) {
-
- $return .= '<tr>';
- $return .= '<td style="background: transparent; border: 0px dashed rgb(200, 200, 200);">';
-
- $return .= '<div style="text-align: left; background-color: rgb(230, 230, 230); padding: 3px; margin-left: 20px; margin-top: -6px;">';
- if($res->mode == 'third'){
- $return .= '<span style="font-size:10px;color:#16ADEB;">'._THIRD_DEST.'</span> - ';
- }else{
- $return .= '<span style="font-size:10px;color:#16ADEB;">'._CONTACT.'</span> - ';
- }
-
- if ($res->is_corporate_person == 'Y') {
- $return .= functions::xssafe($res->society) . ' ' ;
- if (!empty ($res->society_short)) {
- $return .= '('.functions::xssafe($res->society_short).') ';
- }
- } else {
- $return .= functions::xssafe($res->contact_lastname)
- . ' ' . functions::xssafe($res->contact_firstname) . ' ';
- if (!empty ($res->society)) {
- $return .= '(' . functions::xssafe($res->society) . ') ';
- }
- }
- if ($res->is_private == 'Y') {
- $return .= '('._CONFIDENTIAL_ADDRESS.')';
- } else {
- $return .= "- " . functions::xssafe($res->contact_purpose_label)." : ";
- if (!empty($res->lastname) || !empty($res->firstname)) {
- $return .= functions::xssafe($res->lastname)
- . ' ' . functions::xssafe($res->firstname);
- }
- if (!empty($res->address_num) || !empty($res->address_street) || !empty($res->address_town) || !empty($res->address_postal_code)) {
- $return .= ', ' . functions::xssafe($res->address_num) . ' '
- . functions::xssafe($res->address_street) . ' '
- . functions::xssafe($res->address_postal_code) . ' '
- . functions::xssafe(strtoupper($res->address_town));
- }
- }
-
- $return .= '</div>';
-
- $return .= '</td>';
- $return .= '</tr>';
- }
-
- $query = "SELECT u.firstname, u.lastname, u.user_id, cres.mode ";
- $query .= "FROM users u, contacts_res cres ";
- $query .= "WHERE cres.coll_id = 'letterbox_coll' AND cres.res_id = ? AND cast (u.user_id as varchar(128)) = cres.contact_id";
- $arrayPDO = array($_REQUEST['res_id']);
- $stmt = $db->query($query, $arrayPDO);
-
- $fetch = '';
- while ($res = $stmt->fetchObject()) {
-
- $return .= '<tr>';
- $return .= '<td style="background: transparent; border: 0px dashed rgb(200, 200, 200);">';
-
- $return .= '<div style="text-align: left; background-color: rgb(230, 230, 230); padding: 3px; margin-left: 20px; margin-top: -6px;">';
- if($res->mode == 'third'){
- $return .= '<span style="font-size:10px;color:#16ADEB;">'._THIRD_DEST.' (interne)</span> - ';
- }else{
- $return .= '<span style="font-size:10px;color:#16ADEB;">'._CONTACT.' (interne)</span> - ';
- }
- $return .= functions::xssafe($res->firstname) . ' ' . functions::xssafe($res->lastname);
-
- $return .= '</div>';
- //$return .= '<br />';
-
- $return .= '</td>';
- $return .= '</tr>';
- }
- $return .= '</table>';
- $return .= '<br />';
- $return .= '</div>';
- $return .= '</td>';
-} else {
- $status = 1;
- $return .= '<td colspan="6" style="background-color: red;">';
- $return .= '<p style="padding: 10px; color: black;">';
- $return .= 'Erreur lors du chargement des notes';
- $return .= '</p>';
- $return .= '</td>';
-}
-
-echo "{status : " . $status . ", toShow : '" . addslashes($return) . "'}";
-exit ();
\ No newline at end of file
+<?php
+
+/*
+* Copyright 2008-2015 Maarch
+*
+* This file is part of Maarch Framework.
+*
+* Maarch Framework 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.
+*
+* Maarch Framework 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 Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+require_once 'core/class/class_core_tools.php';
+$Core_Tools = new core_tools();
+$Core_Tools->load_lang();
+
+$return = '';
+
+if (isset($_REQUEST['res_id'])) {
+ $status = 0;
+ $return .= '<td>';
+ $return .= '<div align="center">';
+ $return .= '<table width="100%">';
+
+ $db = new Database();
+
+ $query = 'SELECT c.is_corporate_person, c.is_private, c.contact_firstname, c.contact_lastname, c.firstname, c.lastname, c.society, c.society_short, c.contact_purpose_label, c.address_num, c.address_street, c.address_complement, c.address_town, c.address_postal_code, c.address_country, cres.mode ';
+ $query .= 'FROM view_contacts c, contacts_res cres ';
+ $query .= "WHERE cres.coll_id = 'letterbox_coll' AND cres.res_id = ? AND cast (c.contact_id as varchar(128)) = cres.contact_id AND c.ca_id = cres.address_id ORDER BY cres.mode ASC";
+ $arrayPDO = array($_REQUEST['res_id']);
+ $stmt = $db->query($query, $arrayPDO);
+
+ $fetch = '';
+ while ($res = $stmt->fetchObject()) {
+ $return .= '<tr>';
+ $return .= '<td style="background: transparent; border: 0px dashed rgb(200, 200, 200);">';
+
+ $return .= '<div style="text-align: left; background-color: rgb(230, 230, 230); padding: 3px; margin-left: 20px; margin-top: -6px;">';
+ if ($res->mode == 'third') {
+ $return .= '<span style="font-size:10px;color:#135F7F;">'._THIRD_DEST.'</span> - ';
+ } else {
+ $return .= '<span style="font-size:10px;color:#135F7F;">'._CONTACT.'</span> - ';
+ }
+
+ if ($res->is_corporate_person == 'Y') {
+ $return .= functions::xssafe($res->society).' ';
+ if (!empty($res->society_short)) {
+ $return .= '('.functions::xssafe($res->society_short).') ';
+ }
+ } else {
+ $return .= functions::xssafe($res->contact_lastname)
+ .' '.functions::xssafe($res->contact_firstname).' ';
+ if (!empty($res->society)) {
+ $return .= '('.functions::xssafe($res->society).') ';
+ }
+ }
+ if ($res->is_private == 'Y') {
+ $return .= '('._CONFIDENTIAL_ADDRESS.')';
+ } else {
+ $return .= '- '.functions::xssafe($res->contact_purpose_label).' : ';
+ if (!empty($res->lastname) || !empty($res->firstname)) {
+ $return .= functions::xssafe($res->lastname)
+ .' '.functions::xssafe($res->firstname);
+ }
+ if (!empty($res->address_num) || !empty($res->address_street) || !empty($res->address_town) || !empty($res->address_postal_code)) {
+ $return .= ', '.functions::xssafe($res->address_num).' '
+ .functions::xssafe($res->address_street).' '
+ .functions::xssafe($res->address_postal_code).' '
+ .functions::xssafe(strtoupper($res->address_town));
+ }
+ }
+
+ $return .= '</div>';
+
+ $return .= '</td>';
+ $return .= '</tr>';
+ }
+
+ $query = 'SELECT u.firstname, u.lastname, u.user_id, cres.mode ';
+ $query .= 'FROM users u, contacts_res cres ';
+ $query .= "WHERE cres.coll_id = 'letterbox_coll' AND cres.res_id = ? AND cast (u.user_id as varchar(128)) = cres.contact_id";
+ $arrayPDO = array($_REQUEST['res_id']);
+ $stmt = $db->query($query, $arrayPDO);
+
+ $fetch = '';
+ while ($res = $stmt->fetchObject()) {
+ $return .= '<tr>';
+ $return .= '<td style="background: transparent; border: 0px dashed rgb(200, 200, 200);">';
+
+ $return .= '<div style="text-align: left; background-color: rgb(230, 230, 230); padding: 3px; margin-left: 20px; margin-top: -6px;">';
+ if ($res->mode == 'third') {
+ $return .= '<span style="font-size:10px;color:#135F7F;">'._THIRD_DEST.' (interne)</span> - ';
+ } else {
+ $return .= '<span style="font-size:10px;color:#135F7F;">'._CONTACT.' (interne)</span> - ';
+ }
+ $return .= functions::xssafe($res->firstname).' '.functions::xssafe($res->lastname);
+
+ $return .= '</div>';
+ //$return .= '<br />';
+
+ $return .= '</td>';
+ $return .= '</tr>';
+ }
+ $return .= '</table>';
+ $return .= '<br />';
+ $return .= '</div>';
+ $return .= '</td>';
+} else {
+ $status = 1;
+ $return .= '<td colspan="6" style="background-color: red;">';
+ $return .= '<p style="padding: 10px; color: black;">';
+ $return .= 'Erreur lors du chargement des notes';
+ $return .= '</p>';
+ $return .= '</td>';
+}
+
+echo '{status : '.$status.", toShow : '".addslashes($return)."'}";
+exit();
diff --git a/apps/maarch_entreprise/loadRepList.php b/apps/maarch_entreprise/loadRepList.php
index f5696390c2ac0f90f1612f2c16e61fb0542f0884..d5c5be6bcad781912b51a67750dc10ba90ffe40c 100755
--- a/apps/maarch_entreprise/loadRepList.php
+++ b/apps/maarch_entreprise/loadRepList.php
@@ -22,10 +22,10 @@
* @author <dev@maarch.org>
*/
-require_once('core/class/class_core_tools.php');
-require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_users.php";
-$Core_Tools = new core_tools;
+require_once 'core/class/class_core_tools.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR.'class_users.php';
+$Core_Tools = new core_tools();
$Core_Tools->load_lang();
$users = new class_users();
@@ -33,103 +33,100 @@ $users = new class_users();
$return = '';
if (isset($_REQUEST['res_id_master'])) {
-
$status = 0;
$return .= '<td colspan="7" style="background-color: #FFF;">';
- $return .= '<div align="center">';
- $return .= '<table width="100%" style="background-color: rgba(100, 200, 213, 0.2);">';
- $return .= '<tr style="font-weight: bold;">';
- $return .= '<th style="font-weight: bold; color: black;" width="150px">';
- $return .= _CHRONO_NUMBER;
- $return .= '</th>';
- $return .= '<th style="font-weight: bold; color: black;" width="130px">';
- $return .= _STATUS;
- $return .= '</th>';
- $return .= '<th style="font-weight: bold; color: black;" width="180px">';
- $return .= _ATTACHMENT_TYPE;
- $return .= '</th>';
- $return .= '<th style="font-weight: bold; color: black;" width="120px">';
- $return .= _CREATION_DATE;
- $return .= '</th>';
- $return .= '<th style="font-weight: bold; color: black;" width="120px">';
- $return .= _BACK_DATE;
- $return .= '</th>';
- $return .= '<th style="font-weight: bold; color: black;">';
- $return .= _SUBJECT;
- $return .= '</th>';
- $return .= '<th style="font-weight: bold; color: black;" width="180px">';
- $return .= _AUTHOR;
- $return .= '</th>';
- $return .= '<th style="font-weight: bold; color: black;" width="40px">';
- $return .= _CONSULT;
- $return .= '</th>';
- $return .= '</tr>';
-
-
- $db = new Database();
-
- $query = "SELECT * FROM res_view_attachments
+ $return .= '<div align="center">';
+ $return .= '<table width="100%" style="background-color: rgba(100, 200, 213, 0.2);">';
+ $return .= '<tr style="font-weight: bold;">';
+ $return .= '<th style="font-weight: bold; color: black;" width="150px">';
+ $return .= _CHRONO_NUMBER;
+ $return .= '</th>';
+ $return .= '<th style="font-weight: bold; color: black;" width="130px">';
+ $return .= _STATUS;
+ $return .= '</th>';
+ $return .= '<th style="font-weight: bold; color: black;" width="180px">';
+ $return .= _ATTACHMENT_TYPE;
+ $return .= '</th>';
+ $return .= '<th style="font-weight: bold; color: black;" width="120px">';
+ $return .= _CREATION_DATE;
+ $return .= '</th>';
+ $return .= '<th style="font-weight: bold; color: black;" width="120px">';
+ $return .= _BACK_DATE;
+ $return .= '</th>';
+ $return .= '<th style="font-weight: bold; color: black;">';
+ $return .= _SUBJECT;
+ $return .= '</th>';
+ $return .= '<th style="font-weight: bold; color: black;" width="180px">';
+ $return .= _AUTHOR;
+ $return .= '</th>';
+ $return .= '<th style="font-weight: bold; color: black;" width="40px">';
+ $return .= _CONSULT;
+ $return .= '</th>';
+ $return .= '</tr>';
+
+ $db = new Database();
+
+ $query = "SELECT * FROM res_view_attachments
WHERE res_id_master = ?
AND status NOT IN ('DEL', 'OBS') AND attachment_type NOT IN ('converted_pdf', 'print_folder') AND coll_id = ? AND (status <> 'TMP' or (typist = ? and status = 'TMP'))
ORDER BY creation_date desc";
- $arrayPDO = array($_REQUEST['res_id_master'], $_SESSION['collection_id_choice'], $_SESSION['user']['UserId']);
- $stmt = $db->query($query, $arrayPDO);
-
- while ($return_db = $stmt->fetchObject()) {
- if (!empty($_REQUEST['option']) && $_REQUEST['option'] == 'FT') {
- if ($return_db->format != 'pdf') {
- $stmtFullText = $db->query('SELECT res_id FROM res_view_attachments WHERE filename = ? and attachment_type = ? and path = ? ORDER BY relation desc',
- [str_replace('.' . $return_db->format, '.pdf', $return_db->filename), 'converted_pdf', $return_db->path]);
- $lineFullText = $stmtFullText->fetchObject();
- if ($lineFullText && $lineFullText->res_id != 0)
- $resIdConverted = $lineFullText->res_id;
- }
- $stmt2 = $db->query(
- "SELECT count(*) as total FROM res_view_attachments WHERE res_id = ? and status not in ('DEL','OBS','TMP') and lower(translate(title,'ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖØÙÚÛÜÃÞßà áâãäåæçèéêëìÃîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')) like lower(?)", array($return_db->res_id,$_SESSION['searching']['where_request_parameters'][':subject'])
+ $arrayPDO = array($_REQUEST['res_id_master'], $_SESSION['collection_id_choice'], $_SESSION['user']['UserId']);
+ $stmt = $db->query($query, $arrayPDO);
+
+ while ($return_db = $stmt->fetchObject()) {
+ if (!empty($_REQUEST['option']) && $_REQUEST['option'] == 'FT') {
+ if ($return_db->format != 'pdf') {
+ $stmtFullText = $db->query('SELECT res_id FROM res_view_attachments WHERE filename = ? and attachment_type = ? and path = ? ORDER BY relation desc',
+ [str_replace('.'.$return_db->format, '.pdf', $return_db->filename), 'converted_pdf', $return_db->path]);
+ $lineFullText = $stmtFullText->fetchObject();
+ if ($lineFullText && $lineFullText->res_id != 0) {
+ $resIdConverted = $lineFullText->res_id;
+ }
+ }
+ $stmt2 = $db->query(
+ "SELECT count(*) as total FROM res_view_attachments WHERE res_id = ? and status not in ('DEL','OBS','TMP') and lower(translate(title,'ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖØÙÚÛÜÃÞßà áâãäåæçèéêëìÃîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')) like lower(?)", array($return_db->res_id, $_SESSION['searching']['where_request_parameters'][':subject'])
);
- $res_attach = $stmt2->fetchObject();
+ $res_attach = $stmt2->fetchObject();
- if ((!empty($_SESSION['fullTextAttachments']['attachments']) && in_array($return_db->res_id, $_SESSION['fullTextAttachments']['attachments'])) ||
+ if ((!empty($_SESSION['fullTextAttachments']['attachments']) && in_array($return_db->res_id, $_SESSION['fullTextAttachments']['attachments'])) ||
(!empty($_SESSION['fullTextAttachments']['versionAttachments']) && in_array($return_db->res_id_version, $_SESSION['fullTextAttachments']['versionAttachments']))
) {
- $return .= '<tr style="border: 1px solid;color: #009dc5;font-weight: bold" style="background-color: #FFF;">';
- } else if (!empty($resIdConverted) && !empty($_SESSION['fullTextAttachments']['attachments']) && in_array($resIdConverted, $_SESSION['fullTextAttachments']['attachments'])) {
- $return .= '<tr style="border: 1px solid;color: #009dc5;font-weight: bold" style="background-color: #FFF;">';
- } elseif($res_attach->total > 0){
- $return .= '<tr style="border: 1px solid;color: #009dc5;font-weight: bold" style="background-color: #FFF;">';
- } else {
- $return .= '<tr style="border: 1px solid;" style="background-color: #FFF;">';
-
- }
- } else if (!empty($_REQUEST['option']) && $_REQUEST['option'] == 'baskets'
+ $return .= '<tr style="border: 1px solid;color: #135F7F;font-weight: bold" style="background-color: #FFF;">';
+ } elseif (!empty($resIdConverted) && !empty($_SESSION['fullTextAttachments']['attachments']) && in_array($resIdConverted, $_SESSION['fullTextAttachments']['attachments'])) {
+ $return .= '<tr style="border: 1px solid;color: #135F7F;font-weight: bold" style="background-color: #FFF;">';
+ } elseif ($res_attach->total > 0) {
+ $return .= '<tr style="border: 1px solid;color: #135F7F;font-weight: bold" style="background-color: #FFF;">';
+ } else {
+ $return .= '<tr style="border: 1px solid;" style="background-color: #FFF;">';
+ }
+ } elseif (!empty($_REQUEST['option']) && $_REQUEST['option'] == 'baskets'
&& $return_db->status == 'EXP_RTURN' && $return_db->validation_date && $return_db->validation_date < date('Y-m-d')) {
- $return .= '<tr style="border: 1px solid;color: red;" style="background-color: #FFF;">';
- } else {
- $return .= '<tr style="border: 1px solid;" style="background-color: #FFF;">';
- }
- $return .= '<td>';
- $return .= ' ';
- $return .= functions::xssafe($return_db->identifier);
- $return .= '</td>';
- $return .= '<td>';
- $return .= ' ';
- $query = "SELECT label_status FROM status WHERE id =?";
- $arrayPDO = array($return_db->status);
- $stmt2 = $db->query($query, $arrayPDO);
- while ($status_db = $stmt2->fetchObject()) {
- $return .= functions::xssafe($status_db->label_status);
- }
- $return .= '</td>';
- $return .= '<td>';
- $return .= ' ';
- $attachment_types_valeur = $return_db->attachment_type;
- $return .= functions::xssafe($_SESSION['attachment_types'][$attachment_types_valeur]);
- $return .= '</td>';
- $return .= '<td>';
- $return .= ' ';
- sscanf(substr($return_db->creation_date, 0, 10), "%4s-%2s-%2s", $date_Y, $date_m, $date_d);
- switch ($date_m)
- {
+ $return .= '<tr style="border: 1px solid;color: red;" style="background-color: #FFF;">';
+ } else {
+ $return .= '<tr style="border: 1px solid;" style="background-color: #FFF;">';
+ }
+ $return .= '<td>';
+ $return .= ' ';
+ $return .= functions::xssafe($return_db->identifier);
+ $return .= '</td>';
+ $return .= '<td>';
+ $return .= ' ';
+ $query = 'SELECT label_status FROM status WHERE id =?';
+ $arrayPDO = array($return_db->status);
+ $stmt2 = $db->query($query, $arrayPDO);
+ while ($status_db = $stmt2->fetchObject()) {
+ $return .= functions::xssafe($status_db->label_status);
+ }
+ $return .= '</td>';
+ $return .= '<td>';
+ $return .= ' ';
+ $attachment_types_valeur = $return_db->attachment_type;
+ $return .= functions::xssafe($_SESSION['attachment_types'][$attachment_types_valeur]);
+ $return .= '</td>';
+ $return .= '<td>';
+ $return .= ' ';
+ sscanf(substr($return_db->creation_date, 0, 10), '%4s-%2s-%2s', $date_Y, $date_m, $date_d);
+ switch ($date_m) {
case '01': $date_m_txt = _JANUARY; break;
case '02': $date_m_txt = _FEBRUARY; break;
case '03': $date_m_txt = _MARCH; break;
@@ -144,14 +141,13 @@ if (isset($_REQUEST['res_id_master'])) {
case '12': $date_m_txt = _DECEMBER; break;
default: $date_m_txt = $date_m;
}
- $return .= functions::xssafe($date_d.' '.$date_m_txt.' '.$date_Y);
- $return .= '</td>';
- $return .= '<td>';
- $return .= ' ';
- if ($return_db->validation_date) {
- sscanf(substr($return_db->validation_date, 0, 10), "%4s-%2s-%2s", $date_Y, $date_m, $date_d);
- switch ($date_m)
- {
+ $return .= functions::xssafe($date_d.' '.$date_m_txt.' '.$date_Y);
+ $return .= '</td>';
+ $return .= '<td>';
+ $return .= ' ';
+ if ($return_db->validation_date) {
+ sscanf(substr($return_db->validation_date, 0, 10), '%4s-%2s-%2s', $date_Y, $date_m, $date_d);
+ switch ($date_m) {
case '01': $date_m_txt = _JANUARY; break;
case '02': $date_m_txt = _FEBRUARY; break;
case '03': $date_m_txt = _MARCH; break;
@@ -166,56 +162,55 @@ if (isset($_REQUEST['res_id_master'])) {
case '12': $date_m_txt = _DECEMBER; break;
default: $date_m_txt = $date_m;
}
- $return .= functions::xssafe($date_d.' '.$date_m_txt.' '.$date_Y);
- } else {
- $return .= '-';
- }
- $return .= '</td>';
- $return .= '<td>';
- $return .= ' ';
- $return .= functions::xssafe($return_db->title);
- $return .= '</td>';
- $return .= '<td>';
- $return .= ' ';
- $current_user = $users->get_user($return_db->typist);
- $return .= functions::xssafe($current_user['firstname'])
- . ' ' . functions::xssafe($current_user['lastname']);
- $return .= '</td>';
- $return .= '<td>';
- $return .= ' ';
- $return .= '<a ';
- $return .= 'href="';
- if ($return_db->res_id <> 0) {
- $id = $return_db->res_id;
- } else {
- $id = $return_db->res_id_version;
- }
- $return .= 'index.php?display=true&module=attachments&page=view_attachment&id='.$id.'&res_id_master='
- . functions::xssafe($_REQUEST['res_id_master']);
- $return .= '" ';
- $return .= 'target="_blank" ';
- $return .= '>';
- $return .= '<i class="fa fa-download fa-2x" title="'._VIEW_DOC.'"></i>';
- $return .= '</a>';
- $return .= '</td>';
- $return .= '</tr>';
- }
-
- $return .= '</table>';
- $return .= '<br />';
- $return .= '</div>';
+ $return .= functions::xssafe($date_d.' '.$date_m_txt.' '.$date_Y);
+ } else {
+ $return .= '-';
+ }
+ $return .= '</td>';
+ $return .= '<td>';
+ $return .= ' ';
+ $return .= functions::xssafe($return_db->title);
+ $return .= '</td>';
+ $return .= '<td>';
+ $return .= ' ';
+ $current_user = $users->get_user($return_db->typist);
+ $return .= functions::xssafe($current_user['firstname'])
+ .' '.functions::xssafe($current_user['lastname']);
+ $return .= '</td>';
+ $return .= '<td>';
+ $return .= ' ';
+ $return .= '<a ';
+ $return .= 'href="';
+ if ($return_db->res_id != 0) {
+ $id = $return_db->res_id;
+ } else {
+ $id = $return_db->res_id_version;
+ }
+ $return .= 'index.php?display=true&module=attachments&page=view_attachment&id='.$id.'&res_id_master='
+ .functions::xssafe($_REQUEST['res_id_master']);
+ $return .= '" ';
+ $return .= 'target="_blank" ';
+ $return .= '>';
+ $return .= '<i class="fa fa-download fa-2x" title="'._VIEW_DOC.'"></i>';
+ $return .= '</a>';
+ $return .= '</td>';
+ $return .= '</tr>';
+ }
+
+ $return .= '</table>';
+ $return .= '<br />';
+ $return .= '</div>';
$return .= '</td>';
} else {
$status = 1;
$return .= '<td colspan="6" style="background-color: red;">';
- $return .= '<p style="padding: 10px; color: black;">';
- $return .= 'Error loading attachments';
- $return .= '</p>';
+ $return .= '<p style="padding: 10px; color: black;">';
+ $return .= 'Error loading attachments';
+ $return .= '</p>';
$return .= '</td>';
}
-
//usleep(900000);
-echo "{status : " . $status . ", toShow : '" . addslashes($return) . "'}";
-exit ();
+echo '{status : '.$status.", toShow : '".addslashes($return)."'}";
+exit();
diff --git a/apps/maarch_entreprise/reports/report_by_period.php b/apps/maarch_entreprise/reports/report_by_period.php
index 8f02f8f96a943fd307b112fbf9fc26f1406eca9c..1132190f1d2788fad190e72d8855da9c51ead16e 100755
--- a/apps/maarch_entreprise/reports/report_by_period.php
+++ b/apps/maarch_entreprise/reports/report_by_period.php
@@ -1,152 +1,147 @@
<?php
-require_once('modules'.DIRECTORY_SEPARATOR."reports".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_modules_tools.php");
-require_once('modules'.DIRECTORY_SEPARATOR."entities".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_entities.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php");
+
+require_once 'modules'.DIRECTORY_SEPARATOR.'reports'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
$core_tools = new core_tools();
$rep = new reports();
$core_tools->load_lang();
$db = new Database();
$id = '';
-if(isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments']))
-{
- $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
+if (isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments'])) {
+ $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
}
-if($id == 'process_delay'){
+if ($id == 'process_delay') {
$title = _PROCESS_DELAY_REPORT;
$titleDesc = _PROCESS_DELAY_REPORT_DESC;
-}else if($id == 'mail_typology'){
+} elseif ($id == 'mail_typology') {
$title = _MAIL_TYPOLOGY_REPORT;
$titleDesc = _MAIL_TYPOLOGY_REPORT_DESC;
-}else if($id == 'mail_vol_by_cat'){
+} elseif ($id == 'mail_vol_by_cat') {
$title = _MAIL_VOL_BY_CAT_REPORT;
$titleDesc = _MAIL_VOL_BY_CAT_REPORT_DESC;
-}else{
+} else {
$title = _PROCESS_DELAY_GENERIC_EVALUATION_REPORT;
$titleDesc = _PROCESS_DELAY_GENERIC_EVALUATION_REPORT_DESC;
}
$content = '';
-$content .='<div id="params">';
- $content .='<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
- if(!$core_tools->test_service('graphics_reports', 'reports', false)){
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'.$title.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked"/><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }else{
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'.$title.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> ' . _GRAPH . ' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }
- $content .='<br/>';
- $content .='<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
- $content .='<table style="width:600px;border: solid 1px #009DC5;margin:auto;" >';
- $content .='<tr>';
- $content .='<td align="left">';
- $content .='<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
+$content .= '<div id="params">';
+ $content .= '<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
+ if (!$core_tools->test_service('graphics_reports', 'reports', false)) {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'.$title.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked"/><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ } else {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'.$title.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> '._GRAPH.' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ }
+ $content .= '<br/>';
+ $content .= '<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
+ $content .= '<table style="width:600px;border: solid 1px #135F7F;margin:auto;" >';
+ $content .= '<tr>';
+ $content .= '<td align="left">';
+ $content .= '<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
$content .= $titleDesc;
- $content .='</p>';
- $content .='<br/>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
+ $content .= '</p>';
+ $content .= '<br/>';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
$content .= _SHOW_YEAR_GRAPH;
- $content .=' <select name="the_year" id="the_year">';
- $year=date("Y");
- $i_current=date("Y'");
- while ($year <> ($i_current-5))
- {
- $content .= '<option value = "'.$year.'">'.$year.'</option>';
- $year= $year-1;
- }
- $content .='</select>';
- $content .='</p>';
- if($id == 'process_delay' || $id == 'mail_typology' || $id == 'mail_vol_by_cat'){
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_month" value="month" />';
- $content .= _SHOW_GRAPH_MONTH;
- $content .=' <select name="the_month" id="the_month">';
- $content .='<option value ="01"> '. _JANUARY.' </option>';
- $content .='<option value ="02"> '._FEBRUARY.' </option>';
- $content .='<option value ="03"> '._MARCH.' </option>';
- $content .='<option value ="04"> '._APRIL.' </option>';
- $content .='<option value ="05"> '._MAY.' </option>';
- $content .='<option value ="06"> '._JUNE.' </option>';
- $content .='<option value ="07"> '._JULY.' </option>';
- $content .='<option value ="08"> '._AUGUST.' </option>';
- $content .='<option value ="09"> '._SEPTEMBER.' </option>';
- $content .='<option value ="10"> '._OCTOBER.'</option>';
- $content .='<option value ="11"> '._NOVEMBER.' </option>';
- $content .='<option value ="12"> '._DECEMBER.' </option>';
- $content .='</select> ';
- $content .= _OF_THIS_YEAR.'.</p>';
- $content .='<p class="double">';
- $content .='<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
+ $content .= ' <select name="the_year" id="the_year">';
+ $year = date('Y');
+ $i_current = date("Y'");
+ while ($year != ($i_current - 5)) {
+ $content .= '<option value = "'.$year.'">'.$year.'</option>';
+ $year = $year - 1;
+ }
+ $content .= '</select>';
+ $content .= '</p>';
+ if ($id == 'process_delay' || $id == 'mail_typology' || $id == 'mail_vol_by_cat') {
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_month" value="month" />';
+ $content .= _SHOW_GRAPH_MONTH;
+ $content .= ' <select name="the_month" id="the_month">';
+ $content .= '<option value ="01"> '._JANUARY.' </option>';
+ $content .= '<option value ="02"> '._FEBRUARY.' </option>';
+ $content .= '<option value ="03"> '._MARCH.' </option>';
+ $content .= '<option value ="04"> '._APRIL.' </option>';
+ $content .= '<option value ="05"> '._MAY.' </option>';
+ $content .= '<option value ="06"> '._JUNE.' </option>';
+ $content .= '<option value ="07"> '._JULY.' </option>';
+ $content .= '<option value ="08"> '._AUGUST.' </option>';
+ $content .= '<option value ="09"> '._SEPTEMBER.' </option>';
+ $content .= '<option value ="10"> '._OCTOBER.'</option>';
+ $content .= '<option value ="11"> '._NOVEMBER.' </option>';
+ $content .= '<option value ="12"> '._DECEMBER.' </option>';
+ $content .= '</select> ';
+ $content .= _OF_THIS_YEAR.'.</p>';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
}
- $content.='<p class="double" style="margin-left:10px">';
- $content.= _FILTER_BY.' :<br /><br />';
- if($id == 'process_delay' || $id == 'mail_typology'){
- //doc_type
- $stmt = $db->query("SELECT type_id, description FROM "
- . $_SESSION['tablename']['doctypes'] . " WHERE enabled = 'Y' order by description asc", array()
+ $content .= '<p class="double" style="margin-left:10px">';
+ $content .= _FILTER_BY.' :<br /><br />';
+ if ($id == 'process_delay' || $id == 'mail_typology') {
+ //doc_type
+ $stmt = $db->query('SELECT type_id, description FROM '
+ .$_SESSION['tablename']['doctypes']." WHERE enabled = 'Y' order by description asc", array()
);
- $content.='<select name="doctypes_chosen" data-placeholder="'._DOCTYPE.'" id="doctypes_chosen" size="10" multiple="multiple">';
- while ($res=$stmt->fetchObject())
- {
- $content.="<option";
- $content.=" value='".$res->type_id."'>";
- $content.= $res->description."</option>";
- }
- $content.='</select>';
- $js .= '$j("#doctypes_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
- }else if($id == 'process_delay_generic_evaluation' || $id == 'mail_vol_by_cat'){
+ $content .= '<select name="doctypes_chosen" data-placeholder="'._DOCTYPE.'" id="doctypes_chosen" size="10" multiple="multiple">';
+ while ($res = $stmt->fetchObject()) {
+ $content .= '<option';
+ $content .= " value='".$res->type_id."'>";
+ $content .= $res->description.'</option>';
+ }
+ $content .= '</select>';
+ $js .= '$j("#doctypes_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
+ $content .= '<br/><br/>';
+ } elseif ($id == 'process_delay_generic_evaluation' || $id == 'mail_vol_by_cat') {
$entities = array();
- $ent = new entity();
- $except[] = $_SESSION['m_admin']['entity']['entityId'];
-
- $entities=$ent->getShortEntityTree($entities, 'all', '', $except );
+ $ent = new entity();
+ $except[] = $_SESSION['m_admin']['entity']['entityId'];
+
+ $entities = $ent->getShortEntityTree($entities, 'all', '', $except);
- $content.='<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
- for($i=0; $i<count($entities);$i++)
- {
- $content.="<option";
- $content.=" value='".$entities[$i]['ID']."'>";
- $content.=$entities[$i]['LABEL']."</option>";
- }
- $content.='</select><input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
- $content .= '<script>titleWithTooltipster("sub_entities");</script>';
- $js .= '$j("#entities_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
+ $content .= '<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($entities); ++$i) {
+ $content .= '<option';
+ $content .= " value='".$entities[$i]['ID']."'>";
+ $content .= $entities[$i]['LABEL'].'</option>';
+ }
+ $content .= '</select><input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>titleWithTooltipster("sub_entities");</script>';
+ $js .= '$j("#entities_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
+ $content .= '<br/><br/>';
}
$status_obj = new manage_status();
$status = $status_obj->get_searchable_status();
- $content.='<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
- for($i=0; $i < count($status); $i++)
- {
- $content.="<option";
- $content.=" value='".$status[$i]['ID']."'>";
- $content.=$status[$i]['LABEL']."</option>";
+ $content .= '<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($status); ++$i) {
+ $content .= '<option';
+ $content .= " value='".$status[$i]['ID']."'>";
+ $content .= $status[$i]['LABEL'].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#status_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
- $content.='<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
- foreach(array_keys($_SESSION['mail_priorities']) as $priority)
- {
- $content.="<option";
- $content.=" value='".$_SESSION['mail_priorities_id'][$priority]."'>";
- $content.=$_SESSION['mail_priorities'][$priority]."</option>";
+ $content .= '<br/><br/>';
+ $content .= '<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
+ foreach (array_keys($_SESSION['mail_priorities']) as $priority) {
+ $content .= '<option';
+ $content .= " value='".$_SESSION['mail_priorities_id'][$priority]."'>";
+ $content .= $_SESSION['mail_priorities'][$priority].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#priority_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.='</p>';
- $content .='</td>';
- $content .='</tr>';
- $content .='<tr>';
- $content .='<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=reports&page=get_report_by_period_val\');" /></td>';
- $content .='</tr>';
- $content .='</table>';
- $content .='</form>';
-$content .='</div>';
-$content .='<div id="result_period_report"></div>';
-$js .='valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=reports&page=get_report_by_period_val\');';
+ $content .= '</p>';
+ $content .= '</td>';
+ $content .= '</tr>';
+ $content .= '<tr>';
+ $content .= '<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=reports&page=get_report_by_period_val\');" /></td>';
+ $content .= '</tr>';
+ $content .= '</table>';
+ $content .= '</form>';
+$content .= '</div>';
+$content .= '<div id="result_period_report"></div>';
+$js .= 'valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=reports&page=get_report_by_period_val\');';
echo "{content : '".addslashes($content)."', exec_js : '".addslashes($js)."'}";
exit();
diff --git a/apps/maarch_entreprise/smartphone/css/style.css b/apps/maarch_entreprise/smartphone/css/style.css
index 4e64441fdb3071376c34850dd9d74ea54f398913..3857770c704982f03a0b8d3c3cdea772020ac86f 100755
--- a/apps/maarch_entreprise/smartphone/css/style.css
+++ b/apps/maarch_entreprise/smartphone/css/style.css
@@ -47,7 +47,7 @@ background-position:top center;
padding-top : 8px;
padding-left : 5px;
padding-right : 5px;
-background-color: #deedf3;
+background-color: #F2F2F2;
}
.block_end {
@@ -61,7 +61,7 @@ margin-right: 12px;*/
.block .check
{
- background-color: #deedf3;
+ background-color: #F2F2F2;
}
@@ -135,7 +135,7 @@ a, a:link, a:visited, a:hover {
}
a:hover {
- color: #1B99C4;
+ color: #135F7F;
}
.bloc {
@@ -280,11 +280,11 @@ acronym, abbr {
}
.maarch, a.maarch {
- color: #1B99C4;
+ color: #135F7F;
}
.maarch2, a.maarch2 {
- color: #FFC200;
+ color: #F99830;
}
.oblig {
@@ -295,7 +295,7 @@ acronym, abbr {
.no_doctypes {
font-weight: bold;
font-size: .9em;
- color: #16ADEB;
+ color: #135F7F;
}
.nota {
@@ -312,18 +312,18 @@ acronym, abbr {
.tit {
font-size: 1.4em;
- color: #1B99C4;
+ color: #135F7F;
padding-bottom: 1em;
}
#desc_box .tit, #user_box .tit, #ugc .tit {
- /*color: #FFC200;*/
- color: #1B99C4;
+ /*color: #F99830;*/
+ color: #135F7F;
}
.sstit {
- color: #1B99C4;
+ color: #135F7F;
font-size: 1em;
font-weight: normal;
padding-bottom: 1em;
@@ -341,7 +341,7 @@ acronym, abbr {
a.next, a.change, a.suspend, a.delete, a.authorize, a.prev, a.up, a.down, a.view {
padding-left: 20px;
background: transparent url(static.php?filename=puce_prev.gif) 10px center no-repeat;
- color: #16ADEB;
+ color: #135F7F;
}
@@ -407,7 +407,7 @@ a.authorize {
.add span {
padding: 4px 0 5px 4px;
background-color: White;
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
border-left: none;
border-right: none;
}
@@ -421,7 +421,7 @@ a.authorize {
.info {
color: #FBEFCE;
- color: #16ADEB;
+ color: #135F7F;
font-weight: normal;
font-weight: bold;
text-align: center;
@@ -518,7 +518,7 @@ input.medium2 {
}
#newpage1, #newpage2 {
text-align: center;
- color: #16ADEB;
+ color: #135F7F;
}
input.detail_box {
@@ -531,7 +531,7 @@ input.detail_box {
}
#frmletters a:hover, #frmletters a.on {
- color: #16ADEB;
+ color: #135F7F;
}
#frmletters fieldset {
@@ -708,18 +708,18 @@ width: 770px;
}
.listing th {
- color: #16ADEB;
+ color: #135F7F;
}
.listingsmall th {
- color: #16ADEB;
+ color: #135F7F;
}
.listing2 th {
- color: #16ADEB;
+ color: #135F7F;
}
.listing3 th {
- color: #16ADEB;
+ color: #135F7F;
}
.listing th .add {
font-weight: normal;
@@ -794,11 +794,11 @@ width: 770px;
}
.listing2 td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listing3 td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listingsmall td {
@@ -806,7 +806,7 @@ width: 770px;
}
.listing .col td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listing .white td {
background-color: #FFFFFF;
@@ -821,7 +821,7 @@ width: 770px;
}
.listingsmall .col td {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
td.picto, th.picto, td.action {
@@ -978,7 +978,7 @@ th.ref {
text-align: left;
}
.detail .col th {
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.detail td.void {
@@ -992,7 +992,7 @@ th.ref {
font-size: 1em;
margin-left: 12px;
padding-top: 1.4em;
- color: #FFC200;
+ color: #F99830;
}
#titless2{
@@ -1065,7 +1065,7 @@ left: -100em;
#head {
padding-top: 1px;
width: 100%;
- background-color: #16ADEB;
+ background-color: #135F7F;
height: 70px;
}
@@ -1202,7 +1202,7 @@ left: -100em;
padding: 0px;
z-index: 10;
margin: 0px;
- border: 1px solid #16ADEB;
+ border: 1px solid #135F7F;
}
#menunav li {
@@ -1212,7 +1212,7 @@ left: -100em;
#menunav li a {
padding-right: 3px;
- color: #0094D0;
+ color: #135F7F;
display: block;
position: relative;
}
@@ -1239,104 +1239,7 @@ left: -100em;
}
#menunav li.on span {
- background-image: url(static.php?filename=bg_menu_span_on.gif);
-}
-li#admin .menu_item {
- background-image: url(static.php?filename=picto_menu_admin.gif);
-}
-li#admin.on .menu_item {
- background-image: url(static.php?filename=picto_menu_admin_on.gif);
-}
-
-li#aide .menu_item {
- background-image: url(static.php?filename=picto_menu_help.gif);
-}
-li#aide.on .menu_item {
- background-image: url(static.php?filename=picto_menu_help_on.gif);
-}
-
-li#add .menu_item {
- background-image: url(static.php?filename=picto_menu_fileindex.gif);
-}
-li#add.on .menu_item{
- background-image: url(static.php?filename=picto_menu_fileindex_on.gif);
-}
-
-li#post .menu_item {
- background-image: url(static.php?filename=picto_menu_postindex.gif);
-}
-li#post.on .menu_item {
- background-image: url(static.php?filename=picto_menu_postindex_on.gif);
-}
-
-li#browse .menu_item {
- background-image: url(static.php?filename=stats_menu_off.gif);
-}
-li#browse.on .menu_item {
- background-image: url(static.php?filename=stats_menu_on.gif);
-}
-
-li#valid_mail .menu_item {
- background-image: url(static.php?filename=valid_menu_off.gif);
-}
-li#valid_mail.on .menu_item {
- background-image: url(static.php?filename=valid_menu_on.gif);
-}
-
-li#maarch_credits .menu_item {
- background-image: url(static.php?filename=picto_menu_help.gif);
-}
- li#maarch_credits.on .menu_item {
- background-image: url(static.php?filename=picto_menu_help_on.gif);
-}
-
-li#logout .menu_item {
- background-image: url(static.php?filename=logout_off.gif);
-}
-li#logout.on .menu_item {
- background-image: url(static.php?filename=logout_on.gif);
-}
-
-li#manbask .menu_item {
- background-image: url(static.php?filename=manage_baskets_off.gif);
-}
-li#manbask.on .menu_item {
- background-image: url(static.php?filename=manage_baskets_on.gif);
-}
-
-li#searching .menu_item {
- background-image: url(static.php?filename=searching_off.gif);
-}
-li#searching.on .menu_item {
- background-image: url(static.php?filename=searching_on.gif);
-}
-
-li#market_search .menu_item {
- background-image: url(static.php?filename=search_proj_off.gif);
-}
-li#market_search.on .menu_item {
- background-image: url(static.php?filename=search_proj_on.gif);
-}
-
-li#account .menu_item{
- background-image: url(static.php?filename=account_off.gif);
-}
-li#account.on .menu_item {
- background-image: url(static.php?filename=account_on.gif);
-}
-
-li#my_contacts .menu_item{
- background-image: url(static.php?filename=my_contacts_off.gif);
-}
-li#my_contacts.on .menu_item {
- background-image: url(static.php?filename=my_contacts_on.gif);
-}
-
-li#indexing .menu_item{
- background-image: url(static.php?filename=indexing_off.gif);
-}
-li#indexing.on .menu_item{
- background-image: url(static.php?filename=indexing_on.gif);
+ background: #135F7F;
}
#menunav li ol {
@@ -1357,7 +1260,7 @@ li#indexing.on .menu_item{
}
#menunav li ol li a, #menunav li.on ol li a {
- color: #16ADEB;
+ color: #135F7F;
display: inline;
}
@@ -1429,7 +1332,7 @@ li#indexing.on .menu_item{
}
#content h1 {
- color: #16ADEB;
+ color: #135F7F;
font-style: italic;
font-weight: bold;
font-size: 1.3em;
@@ -1443,7 +1346,7 @@ li#indexing.on .menu_item{
width: 80%;
}
#nav h1 {
- color: #16ADEB;
+ color: #135F7F;
font-style: italic;
font-weight: bold;
font-size: 1.5em;
@@ -1558,7 +1461,7 @@ vertical-align: middle;
#infos_box #postpagin #count {
font-size: 1.2em;
- color: #16ADEB;
+ color: #135F7F;
font-weight: bold;
float: right;
}
@@ -1686,7 +1589,7 @@ padding-left :15px;
}
#list .file .on a {
- color: #1b99c4;
+ color: #135F7F;
}
#list .file .on li a {
@@ -1849,7 +1752,7 @@ padding-left :15px;
}
#summary a {
- color: #1B99C4;
+ color: #135F7F;
}
#summary a:hover {
@@ -1893,7 +1796,7 @@ padding-left :15px;
}
#statssummary a {
- color: #1B99C4;
+ color: #135F7F;
}
#statssummary a:hover {
@@ -1965,7 +1868,7 @@ margin-bottom: 3px;
#calender .week .today {
background-color: #dbf0fb;
font-weight: bold;
- color: #1B99C4;
+ color: #135F7F;
}
#calender .week .holiday {
@@ -1975,7 +1878,7 @@ color: #CCC;
#calender .week .hoverEle {
background-color: #dbf0fb;
- color: #1B99C4;
+ color: #135F7F;
}
#basis #calender select {
@@ -2214,7 +2117,7 @@ height:auto;
#guide_summary .tit a
{
- color: #1B99C4;
+ color: #135F7F;
}
#guide_summary .tit a:hover
@@ -2232,7 +2135,7 @@ height:auto;
#help_guide h2 a
{
- color: #1B99C4;
+ color: #135F7F;
}
#help_guide img {
@@ -2384,7 +2287,7 @@ margin-left: 10px;
#folder_tree
{
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
padding: 2px 5px 5px 2px;
vertical-align:top;
@@ -2397,14 +2300,14 @@ text-align:right;
#form1
{
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
padding-top:10px;
margin-bottom: 10px;
}
#form2
{
- border: 1px solid #FFC200;
+ border: 1px solid #F99830;
padding-top:10px;
text-align:left;
padding-left: 5px;
@@ -2620,11 +2523,11 @@ input[type="checkbox"] , input[type="radio"]
}
.listing .col td input[type="radio"]{
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
.listingsmall .col td input[type="radio"]{
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
}
#folder_out_form
@@ -2676,7 +2579,7 @@ color: #333333;
font-style: italic;
font-weight: bold;
letter-spacing: 0.1em;
-border: 1px solid #FFC200;
+border: 1px solid #F99830;
position: absolute;
padding: 0px;
top: 0px;
@@ -2735,7 +2638,7 @@ background: url(static.php?filename=big_home_physical.gif) no-repeat top;
margin-top: 15px;
margin-left: 55px;
display:block;
- color: #1B99C4;
+ color: #135F7F;
}
.welcome{
@@ -2744,7 +2647,7 @@ font-size: 14px;
}
.welcome_details{
-/*border: 1px solid #FFC200; */
+/*border: 1px solid #F99830; */
margin-right:120px;
padding-top:10px;
font-size: 11px;
@@ -2757,7 +2660,7 @@ height:30px;
}
.header_menu{
-background-color: #1B91BA;
+background-color: #135F7F;
height:23px;
color:white;
@@ -2767,7 +2670,7 @@ text-align: right;
border-bottom: 2px solid #FFFFFF;
}
.footer_menu{
-background-color: #1B91BA;
+background-color: #135F7F;
height:15px;
width:100%;
font-weight: bold;
@@ -2807,7 +2710,7 @@ width:300px;
.credits_bloc_img{
padding:4px;
background:white;
-border: 2px solid #16ADEB;
+border: 2px solid #135F7F;
}
.img_credits_maarch_box{
@@ -2841,7 +2744,7 @@ div.autocomplete ul li.selected {
}
div.autocomplete ul li {
- /*background-color: #DEEDF3;*/
+ /*background-color: #F2F2F2;*/
list-style-type:none;
display: block;
margin: 0;
@@ -2875,7 +2778,7 @@ div.autocomplete ul li span.informal {
/* HR */
hr{
border: none;
- background-color: #FFC200;
+ background-color: #F99830;
height: 2px;
width: 100%;
}
@@ -2886,7 +2789,7 @@ hr{
/* TIPS */
.newTipbox {
- background-color: #deedf3;
+ background-color: #F2F2F2;
margin: 0 auto 15px auto;
}
@@ -2971,7 +2874,7 @@ hr{
display: block;
float: left;
cursor: pointer;
- /*background-color: #deedf3;*/
+ /*background-color: #F2F2F2;*/
}
.admin_item div
{
@@ -3070,13 +2973,13 @@ hr{
margin-top: 10px;
margin-bottom: 10px;
height: 30px;
- /*color: #1B91BA;*/
+ /*color: #135F7F;*/
/*text-decoration: underline;*/
font-weight: bold;
font-size: 18px;
/*background-color: #CFD3FF;*/
text-align: center;
- background-color: #deedf3;
+ background-color: #F2F2F2;
}
/*#admin_modules, #admin_apps
{
@@ -3300,7 +3203,7 @@ div.autocomplete ul li.selected {
}
div.autocomplete ul li {
- /*background-color: #DEEDF3;*/
+ /*background-color: #F2F2F2;*/
list-style-type:none;
display: block;
margin: 0;
diff --git a/apps/maarch_entreprise/smartphone/js/iui/t/maarch/maarch-theme.css b/apps/maarch_entreprise/smartphone/js/iui/t/maarch/maarch-theme.css
index 315474daae9fc41b0accf23dac7e4f519e6e4e91..c1f545801c00aaed83f8712b9df9078657c45701 100755
--- a/apps/maarch_entreprise/smartphone/js/iui/t/maarch/maarch-theme.css
+++ b/apps/maarch_entreprise/smartphone/js/iui/t/maarch/maarch-theme.css
@@ -5,12 +5,12 @@ body {
li > a[selected], li > a:active {
background-image: url(listArrowSel.png) !important;
- background-color : #009DC5!important;
+ background-color : #135F7F!important;
}
li > a[selected="progress"] {
background-image: url(../default/loading.gif) !important;
- background-color : #009DC5!important;
+ background-color : #135F7F!important;
}
/************************************************************************************************/
@@ -46,7 +46,7 @@ body > .toolbar {
.whiteButton {
border: 1px solid white;
color: #756666;
- background-color: #FDD16C;
+ background-color: #F99830;
cursor: pointer;
width: 100%;
padding: 0.2em 0.5em;
@@ -85,7 +85,7 @@ body > ul > li > a {
/************************************************************************************************/
body > .panel {
- /*background: #deedf3;*/
+ /*background: #F2F2F2;*/
background: #FFFFFF;
/*background: #fefeee url(pinstripes.png);*/
padding:0;
@@ -118,7 +118,7 @@ body > .panel {
}
.toolbar h1 {
- color: #009DC5;
+ color: #135F7F;
}
.backButtonImg {
width: 50px;
@@ -222,9 +222,9 @@ body[orient="landscape"] > .footer > h1 {
}
span.bubble {
- background-color: #FFC200;
+ background-color: #F99830;
border-radius: 10px 10px 10px 10px;
- color: #009DC5;
+ color: #135F7F;
display: block;
float: right;
font-size: 12px;
@@ -233,7 +233,7 @@ span.bubble {
}
span.details_index {
- background-color: #FFC200;
+ background-color: #F99830;
color: #FFFFFF;
}
diff --git a/apps/maarch_entreprise/template/documents_list_attachments.html b/apps/maarch_entreprise/template/documents_list_attachments.html
index a0c7e11bdfb960152cbb3a1602afb130c6f6956d..fc238c0f0176de7e11183fcd432975bc7bd0f1ca 100755
--- a/apps/maarch_entreprise/template/documents_list_attachments.html
+++ b/apps/maarch_entreprise/template/documents_list_attachments.html
@@ -162,7 +162,7 @@ Mods
<!--<td style="text-align:center;width:25px"><b title="##defineLang|_VERSION##">##loadValue|relation##</b></td>-->
<td style="text-align:left;width:100px">
<b title="##defineLang|_CHRONO_NUMBER##" style="padding-right:2px;" >##loadValue|identifier##</b>
- <i style="font-size:10px;color:#16ADEB;float:right;" title="##defineLang|_ATTACHMENT_TYPES##">##loadValue|attachment_type##</i>
+ <i style="font-size:10px;color:#135F7F;float:right;" title="##defineLang|_ATTACHMENT_TYPES##">##loadValue|attachment_type##</i>
</td>
</tr>
</table>
@@ -178,7 +178,7 @@ Mods
</td>
<!--<td style="text-align:left" width="8%">##loadValue|validation_date##</td>-->
- <td style="text-align:center;vertical-align: top;" width="3%" title="##defineLang|_FORMAT##"> <i style="font-size:10px;color:#16ADEB;">##loadValue|format##</i><br/>
+ <td style="text-align:center;vertical-align: top;" width="3%" title="##defineLang|_FORMAT##"> <i style="font-size:10px;color:#135F7F;">##loadValue|format##</i><br/>
</td>
</tr>
</table>
@@ -189,8 +189,8 @@ Mods
<table width="85%" border="0" cellspacing="0" cellpadding="0" >
<tr >
<td width="40%" style="text-align:right">
- <i style="font-size:10px;color:#16ADEB;" title="##defineLang|_VERSION##">##loadValue|relation##</i>
- <i style="color:#16ADEB;">##func_previous_version##</i>
+ <i style="font-size:10px;color:#135F7F;" title="##defineLang|_VERSION##">##loadValue|relation##</i>
+ <i style="color:#135F7F;">##func_previous_version##</i>
</td>
<td width="65%" style="text-align:left;" title="##defineLang|_STATUS##">
<i>##loadValue|status##</i>
diff --git a/apps/maarch_entreprise/template/documents_list_attachments_simple.html b/apps/maarch_entreprise/template/documents_list_attachments_simple.html
index 25c3ac6075a6a608700ad079d9514da896127d5f..4e1a0fa7fa2141ac45ae40b981f73a898d368181 100755
--- a/apps/maarch_entreprise/template/documents_list_attachments_simple.html
+++ b/apps/maarch_entreprise/template/documents_list_attachments_simple.html
@@ -142,7 +142,7 @@ Mods
<!--<td style="text-align:center;width:25px"><b title="##defineLang|_VERSION##">##loadValue|relation##</b></td>-->
<td style="text-align:center;width:100px">
<b title="##defineLang|_CHRONO_NUMBER##">##loadValue|identifier##</b><br/>
- <i style="font-size:10px;color:#16ADEB;" title="##defineLang|_ATTACHMENT_TYPES##">##loadValue|attachment_type##</i>
+ <i style="font-size:10px;color:#135F7F;" title="##defineLang|_ATTACHMENT_TYPES##">##loadValue|attachment_type##</i>
</td>
</tr>
</table>
@@ -159,8 +159,8 @@ Mods
</td>
<!--<td style="text-align:left" width="8%">##loadValue|validation_date##</td>-->
- <td style="text-align:center;vertical-align: top;" width="3%" title="##defineLang|_FORMAT##"> <i style="font-size:10px;color:#16ADEB;">##loadValue|format##</i><br/>
- <i style="color:#16ADEB;">##func_previous_version##</i>
+ <td style="text-align:center;vertical-align: top;" width="3%" title="##defineLang|_FORMAT##"> <i style="font-size:10px;color:#135F7F;">##loadValue|format##</i><br/>
+ <i style="color:#135F7F;">##func_previous_version##</i>
</td>
</tr>
</table>
@@ -170,7 +170,7 @@ Mods
<td width="15%" style="text-align:center">
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
- <td><i style="font-size:10px;color:#16ADEB;" title="##defineLang|_VERSION##">##loadValue|relation##</i></td>
+ <td><i style="font-size:10px;color:#135F7F;" title="##defineLang|_VERSION##">##loadValue|relation##</i></td>
<td style="text-align:center;font-size:13px;width:100px" title="##defineLang|_STATUS##"><i>##loadValue|status##</i></td>
</tr>
</table>
diff --git a/apps/maarch_entreprise/template/documents_list_copies.html b/apps/maarch_entreprise/template/documents_list_copies.html
index 903c060bea2edc4463268319fd390f6fde346482..80be5506b12ae6653f0b4452e658b808ad8330b3 100755
--- a/apps/maarch_entreprise/template/documents_list_copies.html
+++ b/apps/maarch_entreprise/template/documents_list_copies.html
@@ -108,7 +108,7 @@ Mods
<td width="10%" ##clickOnLine##>
<!--<div align="center"><img src="##load_img|contact_maarch.gif##" alt="##loadValue|status##" title="##loadValue|status##"> </div>-->
- <div align="center" style ="color:#009DC5;">##loadValue|status####func_isConfidential##</div>
+ <div align="center" style ="color:#135F7F;">##loadValue|status####func_isConfidential##</div>
</td>
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
@@ -160,14 +160,14 @@ Mods
<td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')##</td>
<td style="font-size:10px;" width ="30px" >##showIconDocument##</td>
<td style="font-size:10px;" width ="30px" >##showIconDetails##</td>
- <td style="font-size:12px; color:red;" width="15px">##ifStatement|'#loadValue|viewed#'!=null|<span style="cursor:pointer;background: #FFC200;color: white;padding: 3px;border-radius: 7px;font-weight:bold;">#loadValue|viewed#</span>|##</td>
+ <td style="font-size:12px; color:red;" width="15px">##ifStatement|'#loadValue|viewed#'!=null|<span style="cursor:pointer;background: #F99830;color: white;padding: 3px;border-radius: 7px;font-weight:bold;">#loadValue|viewed#</span>|##</td>
</tr>
</table>
</td>
</tr>
<tr id="noteList_##loadValue|res_id##" name="noteList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -175,7 +175,7 @@ Mods
</tr>
<tr id="contactsList_##loadValue|res_id##" name="contactsList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -183,7 +183,7 @@ Mods
</tr>
<tr id="repList_##loadValue|res_id##" name="repList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: #FFF;" width="100%">
<td colspan="2" style="background-color: #f2f2f2;">
- <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##defineLang|_LOADING_INFORMATIONS##
</div>
diff --git a/apps/maarch_entreprise/template/documents_list_search_adv.html b/apps/maarch_entreprise/template/documents_list_search_adv.html
index d6cd63db562f69dcd58b84aedf639d3325fec6a3..3fef411ef4867fa0685ad03f916bb4c630b0ed07 100755
--- a/apps/maarch_entreprise/template/documents_list_search_adv.html
+++ b/apps/maarch_entreprise/template/documents_list_search_adv.html
@@ -106,7 +106,7 @@ Mods
<tr class="##cssLine|col|white##">
<td width="10%" ##clickOnLine##>
- <div align="center" style ="color:#009DC5;">##loadValue|status####func_isConfidential##</div>
+ <div align="center" style ="color:#135F7F;">##loadValue|status####func_isConfidential##</div>
</td>
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
@@ -156,7 +156,7 @@ Mods
</tr>
<tr id="noteList_##loadValue|res_id##" name="noteList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -164,7 +164,7 @@ Mods
</tr>
<tr id="contactsList_##loadValue|res_id##" name="contactsList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -172,7 +172,7 @@ Mods
</tr>
<tr id="repList_##loadValue|res_id##" name="repList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: #FFF;" width="100%">
<td colspan="2" style="background-color: #f2f2f2;">
- <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##defineLang|_LOADING_INFORMATIONS##
</div>
diff --git a/apps/maarch_entreprise/template/documents_list_with_attachments.html b/apps/maarch_entreprise/template/documents_list_with_attachments.html
index 42c7d701d94a3eae1f8bb5f40702a34aba425e19..775faad3b9eb1ac3b0540a30e63114ee5f59b77e 100755
--- a/apps/maarch_entreprise/template/documents_list_with_attachments.html
+++ b/apps/maarch_entreprise/template/documents_list_with_attachments.html
@@ -107,7 +107,7 @@ Mods
<tr class="##cssLine|col|white##" title="##showDefaultAction##">
<td width="10%" ##clickOnLine##>
- <div align="center" style ="color:#009DC5;">##loadValue|status####func_isConfidential##</div>
+ <div align="center" style ="color:#135F7F;">##loadValue|status####func_isConfidential##</div>
</td>
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
@@ -160,7 +160,7 @@ Mods
</tr>
<tr id="noteList_##loadValue|res_id##" name="noteList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -168,7 +168,7 @@ Mods
</tr>
<tr id="contactsList_##loadValue|res_id##" name="contactsList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -177,7 +177,7 @@ Mods
<tr id="repList_##loadValue|res_id##" name="repList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: #FFF;" width="100%">
<td colspan="2" style="background-color: #f2f2f2;">
<div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;
- border: 1px dashed #009DC5;">
+ border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##defineLang|_LOADING_INFORMATIONS##
</div>
diff --git a/apps/maarch_entreprise/xml/entreprise.xml b/apps/maarch_entreprise/xml/entreprise.xml
index 5a51f544946af1e48c88121209d4c21ed712f590..90e31a5315cf2f6536a74144bd9e55d5763d71b0 100755
--- a/apps/maarch_entreprise/xml/entreprise.xml
+++ b/apps/maarch_entreprise/xml/entreprise.xml
@@ -128,7 +128,7 @@
<!-- Ces balises ne sont plus utilisées et seront supprimées dans la prochaine version -->
<priority color="#ff0000" with_delay="4" working_days="true">Très urgent</priority> <!-- 0 -->
<priority color="#ffa500" with_delay="8" working_days="true">Urgent</priority> <!-- 1 -->
- <priority color="#009dc5" with_delay="false" working_days="true">Normal</priority> <!-- 2 -->
+ <priority color="#135F7F" with_delay="false" working_days="true">Normal</priority> <!-- 2 -->
<priority color="#ffa500" with_delay="false" working_days="true">SVA/SVR</priority> <!-- 3 -->
<default_priority>2</default_priority>
</priorities>
diff --git a/modules/attachments/attachments_content.php b/modules/attachments/attachments_content.php
index a0dc604f4a323d7a0114adb2f2ce0f0116106d12..da7366ed74455333a2f8b2225441ab3b68ffb055 100755
--- a/modules/attachments/attachments_content.php
+++ b/modules/attachments/attachments_content.php
@@ -1260,7 +1260,7 @@ $content .= '</h2>';
//END HEADER
//BEGIN FORM
-$content .= '<form enctype="multipart/form-data" method="post" name="formAttachment" id="formAttachment" action="#" class="forms" style="width:35%;float:left;margin-left:-5px;background-color:#deedf3">';
+$content .= '<form enctype="multipart/form-data" method="post" name="formAttachment" id="formAttachment" action="#" class="forms" style="width:35%;float:left;margin-left:-5px;background-color:#F2F2F2">';
$content .= '<div class="transmissionDiv" id="addAttach1">';
$content .= '<hr style="width:85%;margin-left:0px">';
$content .= '<input type="hidden" id="category_id" value="outgoing"/>';
@@ -1323,7 +1323,7 @@ $content .= '<div class="transmissionDiv" id="addAttach1">';
//FILE
if ($mode == 'add') {
$content .= '<p>';
- $content .= '<label id="file_label">'._FILE.' <span id="templateOfficeTool"><i class="fa fa-paperclip fa-lg" title="'._LOADED_FILE.'" style="cursor:pointer;" id="attachment_type_icon" onclick="$(\'attachment_type_icon\').setStyle({color: \'#009DC5\'});$(\'attachment_type_icon2\').setStyle({color: \'#666\'});$(\'templateOffice\').setStyle({display: \'none\'});$(\'templateOffice\').disabled=true;$(\'templateOffice_edit\').setStyle({display: \'none\'});$(\'choose_file\').setStyle({display: \'inline-block\'});document.getElementById(\'choose_file\').contentDocument.getElementById(\'file\').click();"></i> <i class="fa fa-file-text-o fa-lg" title="'._GENERATED_FILE.'" style="cursor:pointer;color:#009DC5;" id="attachment_type_icon2" onclick="$(\'attachment_type_icon2\').setStyle({color: \'#009DC5\'});$(\'attachment_type_icon\').setStyle({color: \'#666\'});$(\'templateOffice\').setStyle({display: \'inline-block\'});$(\'templateOffice\').disabled=false;$(\'choose_file\').setStyle({display: \'none\'});"></i></span></label>';
+ $content .= '<label id="file_label">'._FILE.' <span id="templateOfficeTool"><i class="fa fa-paperclip fa-lg" title="'._LOADED_FILE.'" style="cursor:pointer;" id="attachment_type_icon" onclick="$(\'attachment_type_icon\').setStyle({color: \'#135F7F\'});$(\'attachment_type_icon2\').setStyle({color: \'#666\'});$(\'templateOffice\').setStyle({display: \'none\'});$(\'templateOffice\').disabled=true;$(\'templateOffice_edit\').setStyle({display: \'none\'});$(\'choose_file\').setStyle({display: \'inline-block\'});document.getElementById(\'choose_file\').contentDocument.getElementById(\'file\').click();"></i> <i class="fa fa-file-text-o fa-lg" title="'._GENERATED_FILE.'" style="cursor:pointer;color:#135F7F;" id="attachment_type_icon2" onclick="$(\'attachment_type_icon2\').setStyle({color: \'#135F7F\'});$(\'attachment_type_icon\').setStyle({color: \'#666\'});$(\'templateOffice\').setStyle({display: \'inline-block\'});$(\'templateOffice\').disabled=false;$(\'choose_file\').setStyle({display: \'none\'});"></i></span></label>';
$content .= '<select name="templateOffice[]" id="templateOffice" style="display:inline-block;" onchange="showEditButton(this);">';
$content .= '<option value="">'._CHOOSE_MODEL.'</option>';
@@ -1496,7 +1496,7 @@ $content .= '<script>display_contact_card(\'visible\', \'contact_card_attach\');
//IFRAME CREATE CONTACT
if ($core->test_admin('my_contacts', 'apps', false)) {
- $content .= '<div id="create_contact_div_attach" style="display:none;float:right;width:65%;background-color:#deedf3">';
+ $content .= '<div id="create_contact_div_attach" style="display:none;float:right;width:65%;background-color:#F2F2F2">';
$content .= '<iframe width="100%" height="550" src="'.$_SESSION['config']['businessappurl']
.'index.php?display=false&dir=my_contacts&page=create_contact_iframe&fromAttachmentContact=Y&transmissionInput=0" name="contact_iframe_attach" id="contact_iframe_attach"'
.' scrolling="auto" frameborder="0" style="display:block;">'
@@ -1504,7 +1504,7 @@ if ($core->test_admin('my_contacts', 'apps', false)) {
$content .= '</div>';
}
//IFRAME INFO CONTACT
-$content .= '<div id="info_contact_div_attach" style="display:none;float:right;width:65%;background-color:#deedf3">';
+$content .= '<div id="info_contact_div_attach" style="display:none;float:right;width:65%;background-color:#F2F2F2">';
$content .= '<iframe width="100%" height="800" name="contact_card_attach_iframe" id="contact_card_attach_iframe"'
.' scrolling="auto" frameborder="0" style="display:block;">'
.'</iframe>';
diff --git a/modules/attachments/js/functions.js b/modules/attachments/js/functions.js
index d1ae0e98caf1916a0fa99b55f4b15a49bdf291aa..25199cc82debfe1da4e3d9413a0d264d1513f8b4 100755
--- a/modules/attachments/js/functions.js
+++ b/modules/attachments/js/functions.js
@@ -578,8 +578,8 @@ function addNewAttach() {
$j("#formAttachment .transmissionDiv #newAttachButton").last().css("visibility","visible");
$j("#formAttachment .transmissionDiv #newAttachButton").last().addClass("readonly");
- $j("#formAttachment .transmissionDiv #templateOfficeTool #attachment_type_icon").first().attr("onclick","$j('#'+this.id).css('color','#009DC5');$j('#'+this.id).parent().parent().parent().parent().find('#attachment_type_icon2').first().css('color','#666');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').css('display','none');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').prop('disabled',true);$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').css('display','none');$j('#'+this.id).parent().parent().parent().parent().find('#choose_file').css('display','inline-block');$j('#'+this.id).parent().parent().parent().parent().find('#choose_file').contents().find('#file').click()");
- $j("#formAttachment .transmissionDiv #templateOfficeTool #attachment_type_icon2").first().attr("onclick","$j('#'+this.id).css('color','#009DC5');$j('#'+this.id).parent().parent().parent().parent().find('#attachment_type_icon').first().css('color','#666');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').css('display','inline-block');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').prop('disabled',false);$j('#'+this.id).parent().parent().parent().parent().find('#choose_file').css('display','none');");
+ $j("#formAttachment .transmissionDiv #templateOfficeTool #attachment_type_icon").first().attr("onclick","$j('#'+this.id).css('color','#135F7F');$j('#'+this.id).parent().parent().parent().parent().find('#attachment_type_icon2').first().css('color','#666');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').css('display','none');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').prop('disabled',true);$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').css('display','none');$j('#'+this.id).parent().parent().parent().parent().find('#choose_file').css('display','inline-block');$j('#'+this.id).parent().parent().parent().parent().find('#choose_file').contents().find('#file').click()");
+ $j("#formAttachment .transmissionDiv #templateOfficeTool #attachment_type_icon2").first().attr("onclick","$j('#'+this.id).css('color','#135F7F');$j('#'+this.id).parent().parent().parent().parent().find('#attachment_type_icon').first().css('color','#666');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').css('display','inline-block');$j('#'+this.id).parent().parent().parent().parent().find('#templateOffice0').prop('disabled',false);$j('#'+this.id).parent().parent().parent().parent().find('#choose_file').css('display','none');");
$j("#formAttachment .transmissionDiv #templateOfficeTool").first().show();
diff --git a/modules/avis/css/module.css b/modules/avis/css/module.css
index 03f977e6d373f880e7ebd670b0f992d94eeebb5d..079636ebfb8c9c97a4ac14f7b1a1e8f75e3eabbb 100755
--- a/modules/avis/css/module.css
+++ b/modules/avis/css/module.css
@@ -6,7 +6,7 @@
border: 2px solid #000;
display: none;
position: absolute;
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
left: 40%;
top: 10%;
text-align: center;
@@ -20,7 +20,7 @@
border: 2px solid #000;
display: none;
position: absolute;
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
left: 40%;
top: 10%;
text-align: center;
@@ -72,8 +72,8 @@
}
.droptarget.currentVis{
- color : #009DC5;
- border: solid 2px #009DC5;
+ color : #135F7F;
+ border: solid 2px #135F7F;
}
.avisUserInfo,.avisUserStatus,.avisUserConsigne,.avisUserAction{
diff --git a/modules/avis/load_listmodel_avis_popup.php b/modules/avis/load_listmodel_avis_popup.php
index f46a27e5429a2b9d000cebec9d15e1ee1aa5c145..d38a483e46d04bb371e060238ab3b3d318590fbf 100755
--- a/modules/avis/load_listmodel_avis_popup.php
+++ b/modules/avis/load_listmodel_avis_popup.php
@@ -1,137 +1,139 @@
-<?php
-/**
-* File : load_listmodel_avis.php
-*
-* Script called by an ajax object load list avis during
-* avis workflow
-*
-* @package maarch
-* @version 1
-* @since 01/2016
-* @license GPL v3
-* @author Alex Orluc <dev@maarch.org>
-*/
-require_once 'modules/entities/class/class_manage_listdiff.php';
-require_once "modules" . DIRECTORY_SEPARATOR . "avis" . DIRECTORY_SEPARATOR
- . "class" . DIRECTORY_SEPARATOR
- . "avis_controler.php";
-
-
- $db = new Database();
- $core = new core_tools();
- $core->load_lang();
- $diffList = new diffusion_list();
-
- $objectType = $_REQUEST['objectType'];
- $objectId = $_REQUEST['objectId'];
- $origin = 'avis';
-
- // Get listmodel_parameters
- $_SESSION[$origin]['difflist_type'] = $diffList->get_difflist_type($objectType);
-
- if ($objectId <> '') {
- $_SESSION[$origin]['difflist_object']['object_id'] = $objectId;
- if ($objectType == 'entity_id') {
- $stmt = $db->query("select entity_label from entities where entity_id = ?",array($objectId));
- $res = $stmt->fetchObject();
- if ($res->entity_label <> '') {
- $_SESSION[$origin]['difflist_object']['object_label'] = $res->entity_label;
- }
- }
- }
-
- // Fill session with listmodel
- $_SESSION[$origin]['diff_list'] = $diffList->get_listmodel($objectType, $objectId);
- $_SESSION[$origin]['diff_list']['difflist_type'] = $_SESSION[$origin]['diff_list']['object_type'];
- $roles = $diffList->list_difflist_roles();
- $circuit = $_SESSION[$origin]['diff_list'];
- if (!isset($circuit['avis']['users'])){
- echo "{status : 1, error_txt : 'Modèle inexistant'}";
- exit();
- }
- if ( $circuit['object_type'] == 'AVIS_CIRCUIT'){
- $id_tab="tab_avisSetWorkflowPopup";
- $id_form="form_avisSetWorkflowPopup";
- }
-
- $content = "";
-
- $content .= '<thead><tr>';
- $content .= '<th style="width:40%;" align="left" valign="bottom"><span>Avis</span></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:45%;" align="left" valign="bottom"><span>Consigne</span></th>';
- $content .= '<th style="width:0;display:none" align="left" valign="bottom"></th>';
- $content .= '<th style="width:0;display:none" align="center" valign="bottom"></th>';
-
- $content .= '</tr></thead>';
- $content .= '<tbody>';
- $color = "";
- $avis = new avis_controler();
- if (isset($circuit['avis']['users'])){
- foreach($circuit['avis']['users'] as $seq=>$step){
- if($color == ' class="col"') {
- $color = '';
- } else {
- $color = ' class="col"';
- }
-
- $content .= '<tr ' . $color . '>';
- $content .= '<td>';
-
- $content .= '<span id="avisPopup_rank_' . $seq . '"> <span class="nbResZero" style="font-weight:bold;opacity:0.5;">'. ($seq + 1) .'</span> </span>';
- $content .= '<select id="avisPopup_'.$seq.'" name="avisPopup_'.$seq.'" >';
- $content .= '<option value="" >Sélectionnez un utilisateur</option>';
-
- $tab_userentities = $avis->getEntityAvis();
- $tab_users = $avis->getUsersAvis();
-
- /** Order by parent entity **/
- foreach ($tab_userentities as $key => $value) {
- $content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
- foreach($tab_users as $user){
- if($tab_userentities[$key]['entity_id'] == $user['entity_id']){
- $selected = " ";
- if ($user['id'] == $step['user_id'])
- $selected = " selected";
- $content .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].', '.$user['firstname'].'</option>';
- }
-
- }
- $content .= '</optgroup>';
- }
- $content .= "</select>";
- $content .= "<span id=\"lastAvisPopup_" . $seq . "\">";
- if (empty($circuit['sign']['users']) && $seq == count ($circuit['avis']['users'])-1)
- $content .= " <i title=\""._LAST_AVIS."\" style=\"color : #fdd16c\" class=\"fa fa-certificate fa-lg fa-fw\"></i>";
- $content .= "</span></td>";
-
- $up = ' style="visibility:visible"';
- $down = ' style="visibility:visible"';
- if ($seq == count ($circuit['avis']['users'])-1){
- $add = ' style="visibility:visible"';
- $down = ' style="visibility:hidden"';
- } else {
- $add = ' style="visibility:hidden"';
- }
- if ($seq == 0)
- $up = ' style="visibility:hidden"';
-
- $content .= '<td><a href="javascript://" '.$down.' id="avisPopup_down_'.$seq.'" name="avisPopup_down_'.$seq.'" onclick="deplacerLigneAvisPopup(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex+2,\''.$id_tab.'\')" ><i class="fa fa-arrow-down fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" '.$up.' id="avisPopup_up_'.$seq.'" name="avisPopup_up_'.$seq.'" onclick="deplacerLigneAvisPopup(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex-1,\''.$id_tab.'\')" ><i class="fa fa-arrow-up fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" onclick="delRowAvisPopup(this.parentNode.parentNode.rowIndex,\''.$id_tab.'\')" id="avisPopup_suppr_'.$j.'" name="avisPopup_suppr_'.$j.'" style="visibility:visible;" ><i class="fa fa-user-times fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" '.$add.' id="avisPopup_add_'.$seq.'" name="avisPopup_add_'.$seq.'" onclick="addRowAvisPopup(\''.$id_tab.'\')" ><i class="fa fa-user-plus fa-2x"></i></a></td>';
- $content .= '<td><input type="text" id="avisPopup_consigne_'.$seq.'" name="avisPopup_consigne_'.$seq.'" value="'.$step['process_comment'].'" onmouseover="setTitle(this);" style="width:95%;"/></td>';
- $content .= '<td style="display:none"><input type="hidden" value="'.$step['process_date'].'" id="avisPopup_date_'.$seq.'" name="avisPopup_date_'.$seq.'"/></td>';
- $content .= '<td style="display:none"><input type="checkbox" style="visibility:hidden" id="avisPopup_isSign_'.$seq.'" name="avisPopup_isSign_'.$seq.'" /></td>';
- $content .= '<td><i class="fa fa-plus fa-lg" title="Nouvel utilisateur ajouté"></i></td>';
- $content .= "</tr>";
- }
- }
-
- $content .= '</tbody>';
-
- echo "{status : 0, div_content : '" . addslashes($content.'<br>') . "'}";
- exit();
+<?php
+/**
+* File : load_listmodel_avis.php.
+*
+* Script called by an ajax object load list avis during
+* avis workflow
+*
+* @version 1
+*
+* @since 01/2016
+*
+* @license GPL v3
+* @author Alex Orluc <dev@maarch.org>
+*/
+require_once 'modules/entities/class/class_manage_listdiff.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'avis'.DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR
+ .'avis_controler.php';
+
+ $db = new Database();
+ $core = new core_tools();
+ $core->load_lang();
+ $diffList = new diffusion_list();
+
+ $objectType = $_REQUEST['objectType'];
+ $objectId = $_REQUEST['objectId'];
+ $origin = 'avis';
+
+ // Get listmodel_parameters
+ $_SESSION[$origin]['difflist_type'] = $diffList->get_difflist_type($objectType);
+
+ if ($objectId != '') {
+ $_SESSION[$origin]['difflist_object']['object_id'] = $objectId;
+ if ($objectType == 'entity_id') {
+ $stmt = $db->query('select entity_label from entities where entity_id = ?', array($objectId));
+ $res = $stmt->fetchObject();
+ if ($res->entity_label != '') {
+ $_SESSION[$origin]['difflist_object']['object_label'] = $res->entity_label;
+ }
+ }
+ }
+
+ // Fill session with listmodel
+ $_SESSION[$origin]['diff_list'] = $diffList->get_listmodel($objectType, $objectId);
+ $_SESSION[$origin]['diff_list']['difflist_type'] = $_SESSION[$origin]['diff_list']['object_type'];
+ $roles = $diffList->list_difflist_roles();
+ $circuit = $_SESSION[$origin]['diff_list'];
+ if (!isset($circuit['avis']['users'])) {
+ echo "{status : 1, error_txt : 'Modèle inexistant'}";
+ exit();
+ }
+ if ($circuit['object_type'] == 'AVIS_CIRCUIT') {
+ $id_tab = 'tab_avisSetWorkflowPopup';
+ $id_form = 'form_avisSetWorkflowPopup';
+ }
+
+ $content = '';
+
+ $content .= '<thead><tr>';
+ $content .= '<th style="width:40%;" align="left" valign="bottom"><span>Avis</span></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:45%;" align="left" valign="bottom"><span>Consigne</span></th>';
+ $content .= '<th style="width:0;display:none" align="left" valign="bottom"></th>';
+ $content .= '<th style="width:0;display:none" align="center" valign="bottom"></th>';
+
+ $content .= '</tr></thead>';
+ $content .= '<tbody>';
+ $color = '';
+ $avis = new avis_controler();
+ if (isset($circuit['avis']['users'])) {
+ foreach ($circuit['avis']['users'] as $seq => $step) {
+ if ($color == ' class="col"') {
+ $color = '';
+ } else {
+ $color = ' class="col"';
+ }
+
+ $content .= '<tr '.$color.'>';
+ $content .= '<td>';
+
+ $content .= '<span id="avisPopup_rank_'.$seq.'"> <span class="nbResZero" style="font-weight:bold;opacity:0.5;">'.($seq + 1).'</span> </span>';
+ $content .= '<select id="avisPopup_'.$seq.'" name="avisPopup_'.$seq.'" >';
+ $content .= '<option value="" >Sélectionnez un utilisateur</option>';
+
+ $tab_userentities = $avis->getEntityAvis();
+ $tab_users = $avis->getUsersAvis();
+
+ /* Order by parent entity **/
+ foreach ($tab_userentities as $key => $value) {
+ $content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
+ foreach ($tab_users as $user) {
+ if ($tab_userentities[$key]['entity_id'] == $user['entity_id']) {
+ $selected = ' ';
+ if ($user['id'] == $step['user_id']) {
+ $selected = ' selected';
+ }
+ $content .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].', '.$user['firstname'].'</option>';
+ }
+ }
+ $content .= '</optgroup>';
+ }
+ $content .= '</select>';
+ $content .= '<span id="lastAvisPopup_'.$seq.'">';
+ if (empty($circuit['sign']['users']) && $seq == count($circuit['avis']['users']) - 1) {
+ $content .= ' <i title="'._LAST_AVIS.'" style="color : #F99830" class="fa fa-certificate fa-lg fa-fw"></i>';
+ }
+ $content .= '</span></td>';
+
+ $up = ' style="visibility:visible"';
+ $down = ' style="visibility:visible"';
+ if ($seq == count($circuit['avis']['users']) - 1) {
+ $add = ' style="visibility:visible"';
+ $down = ' style="visibility:hidden"';
+ } else {
+ $add = ' style="visibility:hidden"';
+ }
+ if ($seq == 0) {
+ $up = ' style="visibility:hidden"';
+ }
+
+ $content .= '<td><a href="javascript://" '.$down.' id="avisPopup_down_'.$seq.'" name="avisPopup_down_'.$seq.'" onclick="deplacerLigneAvisPopup(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex+2,\''.$id_tab.'\')" ><i class="fa fa-arrow-down fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" '.$up.' id="avisPopup_up_'.$seq.'" name="avisPopup_up_'.$seq.'" onclick="deplacerLigneAvisPopup(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex-1,\''.$id_tab.'\')" ><i class="fa fa-arrow-up fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" onclick="delRowAvisPopup(this.parentNode.parentNode.rowIndex,\''.$id_tab.'\')" id="avisPopup_suppr_'.$j.'" name="avisPopup_suppr_'.$j.'" style="visibility:visible;" ><i class="fa fa-user-times fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" '.$add.' id="avisPopup_add_'.$seq.'" name="avisPopup_add_'.$seq.'" onclick="addRowAvisPopup(\''.$id_tab.'\')" ><i class="fa fa-user-plus fa-2x"></i></a></td>';
+ $content .= '<td><input type="text" id="avisPopup_consigne_'.$seq.'" name="avisPopup_consigne_'.$seq.'" value="'.$step['process_comment'].'" onmouseover="setTitle(this);" style="width:95%;"/></td>';
+ $content .= '<td style="display:none"><input type="hidden" value="'.$step['process_date'].'" id="avisPopup_date_'.$seq.'" name="avisPopup_date_'.$seq.'"/></td>';
+ $content .= '<td style="display:none"><input type="checkbox" style="visibility:hidden" id="avisPopup_isSign_'.$seq.'" name="avisPopup_isSign_'.$seq.'" /></td>';
+ $content .= '<td><i class="fa fa-plus fa-lg" title="Nouvel utilisateur ajouté"></i></td>';
+ $content .= '</tr>';
+ }
+ }
+
+ $content .= '</tbody>';
+
+ echo "{status : 0, div_content : '".addslashes($content.'<br>')."'}";
+ exit();
diff --git a/modules/avis/template/documents_list_with_avis.html b/modules/avis/template/documents_list_with_avis.html
index 05b01948f6d776bce769f7005527226edb910ab7..025231dcbdf534ec162a0f175cb011c7882b6183 100755
--- a/modules/avis/template/documents_list_with_avis.html
+++ b/modules/avis/template/documents_list_with_avis.html
@@ -108,7 +108,7 @@ Mods
<td width="10%" ##clickOnLine##>
<!--<div align="center"><img src="##load_img|contact_maarch.gif##" alt="##loadValue|status##" title="##loadValue|status##"> </div>-->
- <div align="center" style ="color:#009DC5;">##loadValue|status####func_isConfidential##</div>
+ <div align="center" style ="color:#135F7F;">##loadValue|status####func_isConfidential##</div>
</td>
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
@@ -163,7 +163,7 @@ Mods
</tr>
<tr id="noteList_##loadValue|res_id##" name="noteList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -171,7 +171,7 @@ Mods
</tr>
<tr id="contactsList_##loadValue|res_id##" name="contactsList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -179,7 +179,7 @@ Mods
</tr>
<tr id="repList_##loadValue|res_id##" name="repList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: #FFF;" width="100%">
<td colspan="2" style="background-color: #f2f2f2;">
- <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##defineLang|_LOADING_INFORMATIONS##
</div>
diff --git a/modules/basket/class/class_admin_basket_Abstract.php b/modules/basket/class/class_admin_basket_Abstract.php
index 6469aea275f7d1052afaff37d9ba2fedb4500978..20952e6c43382f081097ce54fdcb204315b4bd04 100755
--- a/modules/basket/class/class_admin_basket_Abstract.php
+++ b/modules/basket/class/class_admin_basket_Abstract.php
@@ -1,306 +1,300 @@
-<?php
-/*
-* Copyright 2008-2016 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework 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.
-*
-* Maarch Framework 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 Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
-* @brief Module Basket : Administration of the baskets
-*
-* Forms and process to add, modify and delete baskets
-*
-* @file
-* @author <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup basket
-*/
-
-
-abstract class admin_basket_Abstract extends Database
-{
- /**
- * Loads data from the groupbasket table in the session ( $_SESSION['m_admin']['basket']['groups'] array)
- *
- * @param $id string basket identifier
- */
- protected function load_groupbasket($id)
- {
- $_SESSION['m_admin']['basket']['groups'] = array();
- $i =0;
- $default_action_list = '';
- $db = new Database();
-
- $stmt = $db->query("select gb.group_id, gb.result_page, u.group_desc from "
- .$_SESSION['tablename']['bask_groupbasket']." gb, ".$_SESSION['tablename']['usergroups']
- ." u where gb.basket_id = ? and gb.group_id = u.group_id order by u.group_desc",array($id));
- while($line2 = $stmt->fetchObject())
- {
- $stmt2 = $db->query("select agb.group_id, agb.basket_id, agb.id_action, agb.where_clause, ba.label_action, agb.used_in_basketlist as mass, agb.used_in_action_page as page, agb.default_action_list from ".$_SESSION['tablename']['bask_actions_groupbaskets']." agb, ".$_SESSION['tablename']['actions']." ba
- where ba.id = agb.id_action and agb.group_id = ? and agb.basket_id = ?",array($line2->group_id,$id) );
-
- $actions = array();
- while($res = $stmt2->fetchObject())
- {
- if($res->default_action_list == 'Y')
- {
- $default_action_list = $res->id_action;
- }
- else
- {
- array_push($actions, array('ID_ACTION' => $res->id_action, 'LABEL_ACTION' => functions::show_string($res->label_action), 'WHERE' => functions::show_string($res->where_clause), 'MASS_USE' => $res->mass, 'PAGE_USE' => $res->page));
- }
- }
-
- $_SESSION['m_admin']['basket']['groups'][$i] = array(
- "GROUP_ID" => $line2->group_id ,
- "GROUP_LABEL" => functions::show_string($line2->group_desc),
- "RESULT_PAGE" => $line2->result_page,
- "LOCK_LIST" => '',
- "LOCK_SUBLIST" => '',
- "DEFAULT_ACTION" => $default_action_list,
- "ACTIONS" => $actions);
- $i++;
- }
-
- $_SESSION['m_admin']['groupbasket'] = false ;
- }
-
- public function isAnActionOfMyBasketCollection($actionPage, $collId)
- {
- $cpt = count($_SESSION['actions_pages']);
- for ($i=0;$i<$cpt;$i++) {
- if ($actionPage == $_SESSION['actions_pages'][$i]['ID']) {
- for ($j=0;$j<count($_SESSION['actions_pages'][$i]['COLLECTIONS']);$j++) {
- if ($_SESSION['actions_pages'][$i]['COLLECTIONS'][$j] == $collId
- || $_SESSION['actions_pages'][$i]['COLLECTIONS'][$j] == '*'
- ) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- public function isABasketPageOfMyBasketCollection($basketPage, $collId)
- {
- $cpt = count($_SESSION['basket_page']);
- for ($i=0;$i<$cpt;$i++) {
- if ($basketPage == $_SESSION['basket_page'][$i]['ID']) {
- for ($j=0;$j<count($_SESSION['basket_page'][$i]['COLLECTIONS']);$j++) {
- if ($_SESSION['basket_page'][$i]['COLLECTIONS'][$j] == $collId
- || $_SESSION['basket_page'][$i]['COLLECTIONS'][$j] == '*'
- ) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- /**
- * Form for the management of the basket : used to add a new basket or to modify one
- *
- * @param $mode string "up" to modify a basket and "add" to add a new one
- * @param $id string Basket identifier (empty by default), must be set in "up" mode
- */
- public function formbasket($mode,$id = "")
- {
- $state = true;
- $core_tools = new core_tools();
-
- $db = new Database();
-
- if ($mode == "add") {
- $_SESSION['m_admin']['basket']['coll_id'] = $_SESSION['collections'][0]['id'];
- $_SESSION['m_admin']['basket']['color'] = '#666666';
- }
-
- // If mode "Up", Loading the informations of the basket in session
- if($mode == "up")
- {
- echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'basket_up.php', "include");
- echo $core_tools->execute_app_services($_SESSION['app_services'], 'basket_up.php', "include");
- $_SESSION['m_admin']['mode'] = "up";
- if(empty($_SESSION['error']))
- {
- $stmt = $db->query("select * from ".$_SESSION['tablename']['bask_baskets']." where basket_id = ? and enabled= 'Y'",array($id));
- if($stmt->rowCount() == 0)
- {
- $_SESSION['error'] = _BASKET_MISSING;
- $state = false;
- }
- else
- {
- $_SESSION['m_admin']['basket']['basketId'] = functions::show_string($id);
- $line = $stmt->fetchObject();
- $_SESSION['m_admin']['basket']['desc'] = functions::show_string($line->basket_desc);
- $_SESSION['m_admin']['basket']['name'] = functions::show_string($line->basket_name);
- if (empty($line->color)) {
- $_SESSION['m_admin']['basket']['color'] = '#666666';
- } else {
- $_SESSION['m_admin']['basket']['color'] = functions::show_string($line->color);
- }
- $_SESSION['m_admin']['basket']['clause'] = functions::show_string($line->basket_clause);
- $_SESSION['m_admin']['basket']['is_generic'] = functions::show_string($line->is_generic);
- $_SESSION['m_admin']['basket']['is_visible'] = functions::show_string($line->is_visible);
- $_SESSION['m_admin']['basket']['is_folder_basket'] = functions::show_string($line->is_folder_basket);
- $_SESSION['m_admin']['basket']['coll_id'] = functions::show_string($line->coll_id);
- $_SESSION['m_admin']['basket']['flag_notif'] = functions::show_string($line->flag_notif);
- if (! isset($_SESSION['m_admin']['load_groupbasket']) || $_SESSION['m_admin']['load_groupbasket'] == true)
- {
- $this->load_groupbasket($id);
- $_SESSION['m_admin']['groupbasket'] = false ;
- $_SESSION['service_tag'] = 'load_basket_session';
- echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket', "include");
- echo $core_tools->execute_app_services($_SESSION['app_services'], 'load_groupbasket', "include");
- $_SESSION['service_tag'] = '';
- }
- }
- }
- }
-
- // The title is different according the mode
- if($mode == "add")
- {
- echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'basket_add.php', "include");
- echo $core_tools->execute_app_services($_SESSION['app_services'], 'basket_add.php', "include");
- echo '<h1><i class="fa fa-inbox fa-2x" title="" /></i> '._BASKET_ADDITION.'</h1>';
- }
- elseif($mode == "up")
- {
- echo '<h1><i class="fa fa-inbox fa-2x" title="" /></i> '._BASKET_MODIFICATION.'</h1>';
- }
- ?>
+<?php
+/*
+* Copyright 2008-2016 Maarch
+*
+* This file is part of Maarch Framework.
+*
+* Maarch Framework 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.
+*
+* Maarch Framework 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 Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @brief Module Basket : Administration of the baskets
+ *
+ * Forms and process to add, modify and delete baskets
+ *
+ * @file
+ *
+ * @author <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup basket
+ */
+abstract class admin_basket_Abstract extends Database
+{
+ /**
+ * Loads data from the groupbasket table in the session ( $_SESSION['m_admin']['basket']['groups'] array).
+ *
+ * @param $id string basket identifier
+ */
+ protected function load_groupbasket($id)
+ {
+ $_SESSION['m_admin']['basket']['groups'] = array();
+ $i = 0;
+ $default_action_list = '';
+ $db = new Database();
+
+ $stmt = $db->query('select gb.group_id, gb.result_page, u.group_desc from '
+ .$_SESSION['tablename']['bask_groupbasket'].' gb, '.$_SESSION['tablename']['usergroups']
+ .' u where gb.basket_id = ? and gb.group_id = u.group_id order by u.group_desc', array($id));
+ while ($line2 = $stmt->fetchObject()) {
+ $stmt2 = $db->query('select agb.group_id, agb.basket_id, agb.id_action, agb.where_clause, ba.label_action, agb.used_in_basketlist as mass, agb.used_in_action_page as page, agb.default_action_list from '.$_SESSION['tablename']['bask_actions_groupbaskets'].' agb, '.$_SESSION['tablename']['actions'].' ba
+ where ba.id = agb.id_action and agb.group_id = ? and agb.basket_id = ?', array($line2->group_id, $id));
+
+ $actions = array();
+ while ($res = $stmt2->fetchObject()) {
+ if ($res->default_action_list == 'Y') {
+ $default_action_list = $res->id_action;
+ } else {
+ array_push($actions, array('ID_ACTION' => $res->id_action, 'LABEL_ACTION' => functions::show_string($res->label_action), 'WHERE' => functions::show_string($res->where_clause), 'MASS_USE' => $res->mass, 'PAGE_USE' => $res->page));
+ }
+ }
+
+ $_SESSION['m_admin']['basket']['groups'][$i] = array(
+ 'GROUP_ID' => $line2->group_id,
+ 'GROUP_LABEL' => functions::show_string($line2->group_desc),
+ 'RESULT_PAGE' => $line2->result_page,
+ 'LOCK_LIST' => '',
+ 'LOCK_SUBLIST' => '',
+ 'DEFAULT_ACTION' => $default_action_list,
+ 'ACTIONS' => $actions, );
+ ++$i;
+ }
+
+ $_SESSION['m_admin']['groupbasket'] = false;
+ }
+
+ public function isAnActionOfMyBasketCollection($actionPage, $collId)
+ {
+ $cpt = count($_SESSION['actions_pages']);
+ for ($i = 0; $i < $cpt; ++$i) {
+ if ($actionPage == $_SESSION['actions_pages'][$i]['ID']) {
+ for ($j = 0; $j < count($_SESSION['actions_pages'][$i]['COLLECTIONS']); ++$j) {
+ if ($_SESSION['actions_pages'][$i]['COLLECTIONS'][$j] == $collId
+ || $_SESSION['actions_pages'][$i]['COLLECTIONS'][$j] == '*'
+ ) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public function isABasketPageOfMyBasketCollection($basketPage, $collId)
+ {
+ $cpt = count($_SESSION['basket_page']);
+ for ($i = 0; $i < $cpt; ++$i) {
+ if ($basketPage == $_SESSION['basket_page'][$i]['ID']) {
+ for ($j = 0; $j < count($_SESSION['basket_page'][$i]['COLLECTIONS']); ++$j) {
+ if ($_SESSION['basket_page'][$i]['COLLECTIONS'][$j] == $collId
+ || $_SESSION['basket_page'][$i]['COLLECTIONS'][$j] == '*'
+ ) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Form for the management of the basket : used to add a new basket or to modify one.
+ *
+ * @param $mode string "up" to modify a basket and "add" to add a new one
+ * @param $id string Basket identifier (empty by default), must be set in "up" mode
+ */
+ public function formbasket($mode, $id = '')
+ {
+ $state = true;
+ $core_tools = new core_tools();
+
+ $db = new Database();
+
+ if ($mode == 'add') {
+ $_SESSION['m_admin']['basket']['coll_id'] = $_SESSION['collections'][0]['id'];
+ $_SESSION['m_admin']['basket']['color'] = '#666666';
+ }
+
+ // If mode "Up", Loading the informations of the basket in session
+ if ($mode == 'up') {
+ echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'basket_up.php', 'include');
+ echo $core_tools->execute_app_services($_SESSION['app_services'], 'basket_up.php', 'include');
+ $_SESSION['m_admin']['mode'] = 'up';
+ if (empty($_SESSION['error'])) {
+ $stmt = $db->query('select * from '.$_SESSION['tablename']['bask_baskets']." where basket_id = ? and enabled= 'Y'", array($id));
+ if ($stmt->rowCount() == 0) {
+ $_SESSION['error'] = _BASKET_MISSING;
+ $state = false;
+ } else {
+ $_SESSION['m_admin']['basket']['basketId'] = functions::show_string($id);
+ $line = $stmt->fetchObject();
+ $_SESSION['m_admin']['basket']['desc'] = functions::show_string($line->basket_desc);
+ $_SESSION['m_admin']['basket']['name'] = functions::show_string($line->basket_name);
+ if (empty($line->color)) {
+ $_SESSION['m_admin']['basket']['color'] = '#666666';
+ } else {
+ $_SESSION['m_admin']['basket']['color'] = functions::show_string($line->color);
+ }
+ $_SESSION['m_admin']['basket']['clause'] = functions::show_string($line->basket_clause);
+ $_SESSION['m_admin']['basket']['is_generic'] = functions::show_string($line->is_generic);
+ $_SESSION['m_admin']['basket']['is_visible'] = functions::show_string($line->is_visible);
+ $_SESSION['m_admin']['basket']['is_folder_basket'] = functions::show_string($line->is_folder_basket);
+ $_SESSION['m_admin']['basket']['coll_id'] = functions::show_string($line->coll_id);
+ $_SESSION['m_admin']['basket']['flag_notif'] = functions::show_string($line->flag_notif);
+ if (!isset($_SESSION['m_admin']['load_groupbasket']) || $_SESSION['m_admin']['load_groupbasket'] == true) {
+ $this->load_groupbasket($id);
+ $_SESSION['m_admin']['groupbasket'] = false;
+ $_SESSION['service_tag'] = 'load_basket_session';
+ echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket', 'include');
+ echo $core_tools->execute_app_services($_SESSION['app_services'], 'load_groupbasket', 'include');
+ $_SESSION['service_tag'] = '';
+ }
+ }
+ }
+ }
+
+ // The title is different according the mode
+ if ($mode == 'add') {
+ echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'basket_add.php', 'include');
+ echo $core_tools->execute_app_services($_SESSION['app_services'], 'basket_add.php', 'include');
+ echo '<h1><i class="fa fa-inbox fa-2x" title="" /></i> '._BASKET_ADDITION.'</h1>';
+ } elseif ($mode == 'up') {
+ echo '<h1><i class="fa fa-inbox fa-2x" title="" /></i> '._BASKET_MODIFICATION.'</h1>';
+ } ?>
<div id="inner_content" class="clearfix">
<div id="add_box_diff_list" style="width:25%;">
<div class="block" style="height:400px;">
- <iframe name="groupbasket_form" id="groupbasket_form" src="<?php echo $_SESSION['config']['businessappurl']."index.php?display=true&module=basket&page=groupbasket_form";?>" frameborder="0" class="frameform2" width="280px" style="width:100%;"></iframe>
+ <iframe name="groupbasket_form" id="groupbasket_form" src="<?php echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=basket&page=groupbasket_form'; ?>" frameborder="0" class="frameform2" width="280px" style="width:100%;"></iframe>
</div>
<div class="block_end"> </div>
</div>
- <?php
- if($state == false)
- {
- echo "<br /><br /><br /><br />"._BASKET.' '._UNKNOWN."<br /><br /><br /><br />";
- }
- else
- {
- ?>
+ <?php
+ if ($state == false) {
+ echo '<br /><br /><br /><br />'._BASKET.' '._UNKNOWN.'<br /><br /><br /><br />';
+ } else {
+ ?>
<div class="block" style="float:left;width:70%;height:400px;overflow:auto;">
<table width="100%">
<tr>
<td>
- <form name="formbasket" id="formbasket" method="post" style="margin:auto;" action="<?php if($mode == "up") { echo $_SESSION['config']['businessappurl']."index.php?display=true&module=basket&page=basket_up_db"; } elseif($mode == "add") { echo $_SESSION['config']['businessappurl']."index.php?display=true&module=basket&page=basket_add_db"; } ?>" class="forms addforms">
+ <form name="formbasket" id="formbasket" method="post" style="margin:auto;" action="<?php if ($mode == 'up') {
+ echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=basket&page=basket_up_db';
+ } elseif ($mode == 'add') {
+ echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=basket&page=basket_add_db';
+ } ?>" class="forms addforms">
<input type="hidden" name="display" value="true" />
<input type="hidden" name="module" value="basket" />
- <?php
- if ($mode == "up") {
- $disabled = ' disabled="disabled" ';
- ?>
+ <?php
+ if ($mode == 'up') {
+ $disabled = ' disabled="disabled" '; ?>
<input type="hidden" name="page" value="basket_up_db" />
- <?php
- } elseif($mode == "add") {
+ <?php
+ } elseif ($mode == 'add') {
?>
<input type="hidden" name="page" value="basket_add_db" />
- <?php
- }
- ?>
- <input type="hidden" name="order" id="order" value="<?php if(isset($_REQUEST['order'])){functions::xecho($_REQUEST['order']);}?>" />
- <input type="hidden" name="order_field" id="order_field" value="<?php if(isset($_REQUEST['order_field'])){functions::xecho($_REQUEST['order_field']);}?>" />
- <input type="hidden" name="what" id="what" value="<?php if(isset($_REQUEST['what'])){functions::xecho($_REQUEST['what']);}?>" />
- <input type="hidden" name="start" id="start" value="<?php if(isset($_REQUEST['start'])){functions::xecho($_REQUEST['start']);}?>" />
+ <?php
+ } ?>
+ <input type="hidden" name="order" id="order" value="<?php if (isset($_REQUEST['order'])) {
+ functions::xecho($_REQUEST['order']);
+ } ?>" />
+ <input type="hidden" name="order_field" id="order_field" value="<?php if (isset($_REQUEST['order_field'])) {
+ functions::xecho($_REQUEST['order_field']);
+ } ?>" />
+ <input type="hidden" name="what" id="what" value="<?php if (isset($_REQUEST['what'])) {
+ functions::xecho($_REQUEST['what']);
+ } ?>" />
+ <input type="hidden" name="start" id="start" value="<?php if (isset($_REQUEST['start'])) {
+ functions::xecho($_REQUEST['start']);
+ } ?>" />
<p>
- <label><?php echo _COLLECTION;?> : </label>
- <select name="collection" id="collection" <?php echo $disabled;?> onchange="updateCollection(this.options[this.selectedIndex].value, 'true');">
- <option value=""><?php echo _CHOOSE_COLLECTION;?></option>
- <?php
- for($i=0; $i<count($_SESSION['collections']);$i++) {
+ <label><?php echo _COLLECTION; ?> : </label>
+ <select name="collection" id="collection" <?php echo $disabled; ?> onchange="updateCollection(this.options[this.selectedIndex].value, 'true');">
+ <option value=""><?php echo _CHOOSE_COLLECTION; ?></option>
+ <?php
+ for ($i = 0; $i < count($_SESSION['collections']); ++$i) {
?>
- <option value="<?php functions::xecho($_SESSION['collections'][$i]['id']);?>" <?php if(count($_SESSION['collections']) == 1 || $_SESSION['collections'][$i]['id'] == $_SESSION['m_admin']['basket']['coll_id']) { echo 'selected="selected"';}?>><?php functions::xecho($_SESSION['collections'][$i]['label']);?></option>
- <?php
- }
- ?>
+ <option value="<?php functions::xecho($_SESSION['collections'][$i]['id']); ?>" <?php if (count($_SESSION['collections']) == 1 || $_SESSION['collections'][$i]['id'] == $_SESSION['m_admin']['basket']['coll_id']) {
+ echo 'selected="selected"';
+ } ?>><?php functions::xecho($_SESSION['collections'][$i]['label']); ?></option>
+ <?php
+ } ?>
</select>
</p>
<p>
- <label><?php echo _ID;?> : </label>
- <input name="basketId" id="basketId" type="text" value="<?php functions::xecho($_SESSION['m_admin']['basket']['basketId']);?>" <?php if($mode == "up") { echo 'readonly="readonly" class="readonly"';} ?> />
- <input type="hidden" name="id" value="<?php functions::xecho($id);?>" />
+ <label><?php echo _ID; ?> : </label>
+ <input name="basketId" id="basketId" type="text" value="<?php functions::xecho($_SESSION['m_admin']['basket']['basketId']); ?>" <?php if ($mode == 'up') {
+ echo 'readonly="readonly" class="readonly"';
+ } ?> />
+ <input type="hidden" name="id" value="<?php functions::xecho($id); ?>" />
</p>
<p>
- <label><?php echo _BASKET;?> : </label>
- <input name="basketname" type="text" id="basketname" value="<?php functions::xecho($_SESSION['m_admin']['basket']['name']);?>" />
+ <label><?php echo _BASKET; ?> : </label>
+ <input name="basketname" type="text" id="basketname" value="<?php functions::xecho($_SESSION['m_admin']['basket']['name']); ?>" />
</p>
<p>
<label>Couleur : </label>
- <input name="color" type="color" id="color" style="width: 38%;" value="<?php functions::xecho($_SESSION['m_admin']['basket']['color']);?>" />
+ <input name="color" type="color" id="color" style="width: 38%;" value="<?php functions::xecho($_SESSION['m_admin']['basket']['color']); ?>" />
<a title="Réinitialiser la couleur" style="cursor: pointer" onclick="$j('#color')[0].value = '#666666'"><i class="fa fa-magic"></i></a>
</p>
<p>
- <label><?php echo _DESC;?> : </label>
- <textarea cols="30" rows="4" name="basketdesc" style="width:200px;" id="basketdesc" ><?php functions::xecho($_SESSION['m_admin']['basket']['desc']);?></textarea>
+ <label><?php echo _DESC; ?> : </label>
+ <textarea cols="30" rows="4" name="basketdesc" style="width:200px;" id="basketdesc" ><?php functions::xecho($_SESSION['m_admin']['basket']['desc']); ?></textarea>
</p>
- <?php if($_SESSION['m_admin']['basket']['is_generic'] == 'Y')
- {
- ?>
+ <?php if ($_SESSION['m_admin']['basket']['is_generic'] == 'Y') {
+ ?>
<p>
- <em><?php echo _SYSTEM_BASKET_MESSAGE;?>.</em>
+ <em><?php echo _SYSTEM_BASKET_MESSAGE; ?>.</em>
</p>
- <?php } ?>
+ <?php
+ } ?>
<p>
- <label><?php echo _BASKET_VIEW;?> : </label>
- <textarea cols="30" rows="4" style="width:415px;" name="basketclause" id="basketclause" ><?php functions::xecho($_SESSION['m_admin']['basket']['clause']);?></textarea>
+ <label><?php echo _BASKET_VIEW; ?> : </label>
+ <textarea cols="30" rows="4" style="width:415px;" name="basketclause" id="basketclause" ><?php functions::xecho($_SESSION['m_admin']['basket']['clause']); ?></textarea>
</p>
- <?php
- if ($_SESSION['m_admin']['basket']['is_visible'] === 'Y' || $_SESSION['m_admin']['basket']['is_visible']=== '') {
- $css='color:rgb(102, 102, 102);cursor:pointer;';
- } else {
- $css='color:#009dc5;cursor:pointer;';
- }
- ?>
+ <?php
+ if ($_SESSION['m_admin']['basket']['is_visible'] === 'Y' || $_SESSION['m_admin']['basket']['is_visible'] === '') {
+ $css = 'color:rgb(102, 102, 102);cursor:pointer;';
+ } else {
+ $css = 'color:#135F7F;cursor:pointer;';
+ } ?>
<p style="display:none;">
- <label><?php echo _BASKET_VISIBLE_ONLY_ON_SEARCH;?> : </label>
-
-
- <input type='checkbox' name="is_visible_only_on_search" id="is_visible_only_on_search" value="N" <?php
- if ($_SESSION['m_admin']['basket']['is_visible'] === 'N') {
- echo 'checked="checked"';
- }
- ?> onchange="updateIsVisible();"/>
- <input type='hidden' name="is_visible" id="is_visible" <?php
- if ($_SESSION['m_admin']['basket']['is_visible'] === 'Y' || $_SESSION['m_admin']['basket']['is_visible']=== '') {
- echo 'value="Y"';
- } else {
- echo 'value="N"';
- }
- ?>/>
+ <label><?php echo _BASKET_VISIBLE_ONLY_ON_SEARCH; ?> : </label>
+
+
+ <input type='checkbox' name="is_visible_only_on_search" id="is_visible_only_on_search" value="N" <?php
+ if ($_SESSION['m_admin']['basket']['is_visible'] === 'N') {
+ echo 'checked="checked"';
+ } ?> onchange="updateIsVisible();"/>
+ <input type='hidden' name="is_visible" id="is_visible" <?php
+ if ($_SESSION['m_admin']['basket']['is_visible'] === 'Y' || $_SESSION['m_admin']['basket']['is_visible'] === '') {
+ echo 'value="Y"';
+ } else {
+ echo 'value="N"';
+ } ?>/>
</p>
<script language="javascript">
function updateIsVisible()
{
if ($(is_visible_only_on_search).checked == true) {
$(is_visible).value = 'N';
- $(is_visible_only_on_search_icon).style.color = '#009dc5';
+ $(is_visible_only_on_search_icon).style.color = '#135F7F';
} else {
$(is_visible).value = 'Y';
$(is_visible_only_on_search_icon).style.color = 'rgb(102, 102, 102)';
@@ -309,100 +303,110 @@ abstract class admin_basket_Abstract extends Database
</script>
<!--<p>
- <label><?php echo _BASKET_VISIBLE;?> : </label>
- <input type='checkbox' name="is_visible" id="is_visible" value="Y" <?php if ($_SESSION['m_admin']['basket']['is_visible'] === 'Y' || $_SESSION['m_admin']['basket']['is_visible']=== '') echo 'checked="checked"';?>/>
+ <label><?php echo _BASKET_VISIBLE; ?> : </label>
+ <input type='checkbox' name="is_visible" id="is_visible" value="Y" <?php if ($_SESSION['m_admin']['basket']['is_visible'] === 'Y' || $_SESSION['m_admin']['basket']['is_visible'] === '') {
+ echo 'checked="checked"';
+ } ?>/>
</p>-->
- <?php if ($core_tools->is_module_loaded('folder')) {
-
- if ($_SESSION['m_admin']['basket']['is_folder_basket'] === 'Y'){
- $css2='color:#009dc5;cursor:pointer;';
- }else{
- $css2='color:rgb(102, 102, 102);cursor:pointer;';
- }
- ?>
+ <?php if ($core_tools->is_module_loaded('folder')) {
+ if ($_SESSION['m_admin']['basket']['is_folder_basket'] === 'Y') {
+ $css2 = 'color:#135F7F;cursor:pointer;';
+ } else {
+ $css2 = 'color:rgb(102, 102, 102);cursor:pointer;';
+ } ?>
<script language="javascript">
function isFolderBasket()
{
if ($(is_folder_basket).checked == true) {
- $(is_folder_basket_icon).style.color = '#009dc5';
+ $(is_folder_basket_icon).style.color = '#135F7F';
} else {
$(is_folder_basket_icon).style.color = 'rgb(102, 102, 102)';
}
}
</script>
<p style="display:none;">
- <label><?php echo _IS_FOLDER_BASKET;?> : </label>
- <input type='checkbox' name="is_folder_basket" id="is_folder_basket" onclick="isFolderBasket();" value="Y" <?php if ($_SESSION['m_admin']['basket']['is_folder_basket'] === 'Y') echo 'checked="checked"';?>/>
+ <label><?php echo _IS_FOLDER_BASKET; ?> : </label>
+ <input type='checkbox' name="is_folder_basket" id="is_folder_basket" onclick="isFolderBasket();" value="Y" <?php if ($_SESSION['m_admin']['basket']['is_folder_basket'] === 'Y') {
+ echo 'checked="checked"';
+ } ?>/>
</p>
- <?php } ?>
- <?php if ($core_tools->is_module_loaded('notifications')) { ?>
+ <?php
+ } ?>
+ <?php if ($core_tools->is_module_loaded('notifications')) {
+ ?>
<script language="javascript">
function flagNotif()
{
if ($(flag_notif).checked == true) {
- $(flag_notif_icon).style.color = '#009dc5';
+ $(flag_notif_icon).style.color = '#135F7F';
} else {
$(flag_notif_icon).style.color = 'rgb(102, 102, 102)';
}
}
</script>
<p style="display:none;">
- <label><?php echo _ACTIVATE_NOTIFICATION;?> : </label>
- <input type='checkbox' name="flag_notif" id="flag_notif" onclick="flagNotif();" value="Y" <?php if ($_SESSION['m_admin']['basket']['flag_notif'] === 'Y') echo 'checked="checked"';?>/>
+ <label><?php echo _ACTIVATE_NOTIFICATION; ?> : </label>
+ <input type='checkbox' name="flag_notif" id="flag_notif" onclick="flagNotif();" value="Y" <?php if ($_SESSION['m_admin']['basket']['flag_notif'] === 'Y') {
+ echo 'checked="checked"';
+ } ?>/>
</p>
- <?php } ?>
+ <?php
+ } ?>
<p style="text-align:center;">
- <i class="fa fa-search fa-2x" id="is_visible_only_on_search_icon" title="<?php echo _BASKET_VISIBLE_ONLY_ON_SEARCH;?>" style="<?php echo $css; ?>" onclick="$j('#is_visible_only_on_search').click();"></i>
- <?php if ($core_tools->is_module_loaded('folder')) { ?>
- <i class="fa fa-folder-o fa-2x" id="is_folder_basket_icon" title="<?php echo _IS_FOLDER_BASKET;?>" style="<?php echo $css2; ?>" onclick="$j('#is_folder_basket').click();"></i>
- <?php } ?>
- <?php if ($core_tools->is_module_loaded('notifications')) {
- if ($_SESSION['m_admin']['basket']['flag_notif'] === 'Y'){
- $css2='color:#009dc5;cursor:pointer;';
- }else{
- $css2='color:rgb(102, 102, 102);cursor:pointer;';
- }?>
- <i class="fa fa-bell-o fa-2x" id="flag_notif_icon" title="<?php echo _ACTIVATE_NOTIFICATION;?>" style="<?php echo $css2; ?>" onclick="$j('#flag_notif').click();"></i>
- <?php } ?>
+ <i class="fa fa-search fa-2x" id="is_visible_only_on_search_icon" title="<?php echo _BASKET_VISIBLE_ONLY_ON_SEARCH; ?>" style="<?php echo $css; ?>" onclick="$j('#is_visible_only_on_search').click();"></i>
+ <?php if ($core_tools->is_module_loaded('folder')) {
+ ?>
+ <i class="fa fa-folder-o fa-2x" id="is_folder_basket_icon" title="<?php echo _IS_FOLDER_BASKET; ?>" style="<?php echo $css2; ?>" onclick="$j('#is_folder_basket').click();"></i>
+ <?php
+ } ?>
+ <?php if ($core_tools->is_module_loaded('notifications')) {
+ if ($_SESSION['m_admin']['basket']['flag_notif'] === 'Y') {
+ $css2 = 'color:#135F7F;cursor:pointer;';
+ } else {
+ $css2 = 'color:rgb(102, 102, 102);cursor:pointer;';
+ } ?>
+ <i class="fa fa-bell-o fa-2x" id="flag_notif_icon" title="<?php echo _ACTIVATE_NOTIFICATION; ?>" style="<?php echo $css2; ?>" onclick="$j('#flag_notif').click();"></i>
+ <?php
+ } ?>
</p>
<p class="buttons" style="text-align:center;">
- <input type="submit" name="Submit" value="<?php echo _VALIDATE;?>" class="button" />
- <input type="button" name="cancel" value="<?php echo _CANCEL;?>" class="button" onclick="javascript:window.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php?page=basket&module=basket';"/>
+ <input type="submit" name="Submit" value="<?php echo _VALIDATE; ?>" class="button" />
+ <input type="button" name="cancel" value="<?php echo _CANCEL; ?>" class="button" onclick="javascript:window.location.href='<?php echo $_SESSION['config']['businessappurl']; ?>index.php?page=basket&module=basket';"/>
</p>
</form>
</td>
<td width="55%">
<div id="keywords-helper" class="small_text">
- <h3><i class ="fa fa-info-circle fa-3x" ></i> <?php echo _HELP_KEYWORDS;?></h3>
+ <h3><i class ="fa fa-info-circle fa-3x" ></i> <?php echo _HELP_KEYWORDS; ?></h3>
<p align='right'>
- <b><u><?php echo _HELP_BY_CORE;?>:</u></b>
+ <b><u><?php echo _HELP_BY_CORE; ?>:</u></b>
<br/>
<br/>
</p>
<p>
<b>@user : </b>
- <em><?php echo _HELP_KEYWORD0;?></em>
+ <em><?php echo _HELP_KEYWORD0; ?></em>
<br/>
<b>@email : </b>
- <em><?php echo _HELP_KEYWORD_EMAIL;?></em>
+ <em><?php echo _HELP_KEYWORD_EMAIL; ?></em>
</p>
<br/>
<p align='right'>
- <b><u><?php echo _HELP_BY_ENTITY;?>:</u></b><br/><br/>
+ <b><u><?php echo _HELP_BY_ENTITY; ?>:</u></b><br/><br/>
</p>
<p align='justify'>
- <b>@my_entities : </b><em><?php echo _HELP_KEYWORD1;?></em><br>
- <b>@my_primary_entity : </b><em><?php echo _HELP_KEYWORD2;?></em><br>
- <b>@subentities[('entity_1',...,'entity_n')] : </b><em><?php echo _HELP_KEYWORD3;?></em><br/>
- <b>@parent_entity['entity_id'] : </b><em><?php echo _HELP_KEYWORD4;?></em><br/>
- <b>@sisters_entities['entity_id'] : </b><em><?php echo _HELP_KEYWORD5;?></em><br/>
- <b>@entity_type['type'] : </b><em><?php echo _HELP_KEYWORD9;?></em><br/>
- <b>@all_entities : </b><em><?php echo _HELP_KEYWORD6;?></em><br/>
- <b>@immediate_children['entity_1',..., 'entity_id'] : </b><em><?php echo _HELP_KEYWORD7;?></em><br/>
- <b>@ancestor_entities['entity_id'][depth] : </b><em><?php echo _HELP_KEYWORD8;?></em><br/>
- <br/><br/><?php echo _HELP_KEYWORD_EXEMPLE_TITLE;?><br/>
- <div style='border:1px black solid; padding:3px;'><b><?php echo _HELP_KEYWORD_EXEMPLE;?></b></div>
+ <b>@my_entities : </b><em><?php echo _HELP_KEYWORD1; ?></em><br>
+ <b>@my_primary_entity : </b><em><?php echo _HELP_KEYWORD2; ?></em><br>
+ <b>@subentities[('entity_1',...,'entity_n')] : </b><em><?php echo _HELP_KEYWORD3; ?></em><br/>
+ <b>@parent_entity['entity_id'] : </b><em><?php echo _HELP_KEYWORD4; ?></em><br/>
+ <b>@sisters_entities['entity_id'] : </b><em><?php echo _HELP_KEYWORD5; ?></em><br/>
+ <b>@entity_type['type'] : </b><em><?php echo _HELP_KEYWORD9; ?></em><br/>
+ <b>@all_entities : </b><em><?php echo _HELP_KEYWORD6; ?></em><br/>
+ <b>@immediate_children['entity_1',..., 'entity_id'] : </b><em><?php echo _HELP_KEYWORD7; ?></em><br/>
+ <b>@ancestor_entities['entity_id'][depth] : </b><em><?php echo _HELP_KEYWORD8; ?></em><br/>
+ <br/><br/><?php echo _HELP_KEYWORD_EXEMPLE_TITLE; ?><br/>
+ <div style='border:1px black solid; padding:3px;'><b><?php echo _HELP_KEYWORD_EXEMPLE; ?></b></div>
</p>
</div>
</td>
@@ -427,548 +431,491 @@ abstract class admin_basket_Abstract extends Database
$('groupbasket_form').src = 'index.php?display=true&module=basket&page=groupbasket_form';
}
</script>
- <?php
- }
- ?>
+ <?php
+ } ?>
</div>
- <?php
- }
-
- /**
- * Validates the informations returned by the form of the formgroups() function, in case of error writes in the $_SESSION['error'] var
- *
- * @param $mode string Administrator mode "add" or "up"
- */
- protected function basketinfo($mode)
- {
-
- if($mode == "add")
- {
- $_SESSION['m_admin']['basket']['basketId'] = $this->wash($_REQUEST['basketId'], "nick", _THE_ID, 'yes', 0, 32);
- }
- if($mode == "up")
- {
- $_SESSION['m_admin']['basket']['basketId'] = $this->wash($_REQUEST['id'], "nick", _THE_ID, 'yes', 0, 32);
- }
- if(isset($_REQUEST['basketname']) && !empty($_REQUEST['basketname']))
- {
- $_SESSION['m_admin']['basket']['name'] = $this->wash($_REQUEST['basketname'], "no", _THE_BASKET, 'yes', 0, 255);
- }
- if(!empty($_REQUEST['color']))
- {
- $_SESSION['m_admin']['basket']['color'] = $this->wash($_REQUEST['color'], "no", _THE_BASKET, 'yes', 0, 255);
- }
- if (isset($_REQUEST['basketdesc']) && !empty($_REQUEST['basketdesc']))
- {
- $_SESSION['m_admin']['basket']['desc'] = $this->wash($_REQUEST['basketdesc'], "no", _THE_DESC, 'yes', 0, 255);
- }
- if ( isset($_REQUEST['collection']) && !empty($_REQUEST['collection'])) {
- $_SESSION['m_admin']['basket']['coll_id'] = $this->wash($_REQUEST['collection'], "no", _COLLECTION, 'yes', 0, 32);
- }
- if (isset($_REQUEST['basketclause'])
- && ! empty($_REQUEST['basketclause'])) {
- $_SESSION['m_admin']['basket']['clause'] = trim($_REQUEST['basketclause']);
- }
- if ( isset($_REQUEST['is_visible']) && !empty($_REQUEST['is_visible'])) {
- $_SESSION['m_admin']['basket']['is_visible'] = $_REQUEST['is_visible'];
- } else {
- $_SESSION['m_admin']['basket']['is_visible'] = "N";
- }
- if ( isset($_REQUEST['is_folder_basket']) && !empty($_REQUEST['is_folder_basket'])) {
- $_SESSION['m_admin']['basket']['is_folder_basket'] = $_REQUEST['is_folder_basket'];
- } else {
- $_SESSION['m_admin']['basket']['is_folder_basket'] = "N";
- }
- if ( isset($_REQUEST['flag_notif']) && !empty($_REQUEST['flag_notif'])) {
- $_SESSION['m_admin']['basket']['flag_notif'] = $_REQUEST['flag_notif'];
- } else {
- $_SESSION['m_admin']['basket']['flag_notif'] = "";
- }
- $_SESSION['m_admin']['basket']['order'] = $_REQUEST['order'];
- $_SESSION['m_admin']['basket']['order_field'] = $_REQUEST['order_field'];
- $_SESSION['m_admin']['basket']['what'] = $_REQUEST['what'];
- $_SESSION['m_admin']['basket']['start'] = $_REQUEST['start'];
- }
-
- /**
- * After the validation made by the basketinfo() function, according the mode update the basket table or insert a new basket
- *
- * @param $mode string Mode "up" or "add"
- */
- public function addupbasket($mode)
- {
- // Checks the session values
- $this->basketinfo($mode);
-
- $order = $_SESSION['m_admin']['basket']['order'];
- $order_field = $_SESSION['m_admin']['basket']['order_field'];
- $what = $_SESSION['m_admin']['basket']['what'];
- $start = $_SESSION['m_admin']['basket']['start'];
- //echo '<pre>'.print_r($_REQUEST,true).'</pre>'; echo '<pre>'.print_r($_SESSION['m_admin']['basket'],true).'</pre>'; exit();
- // If error redirection to the form page and shows the error
- if(!empty($_SESSION['error']))
- {
- if($mode == "up")
- {
- if(!empty($_SESSION['m_admin']['basket']['basketId']))
- {
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket_up&id=".$_SESSION['m_admin']['basket']['basketId']."&module=basket");
- exit();
- }
- else
- {
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket&module=basket&order=".$order."&order_field=".$order_field."&start=".$start."&what=".$what);
- exit();
- }
- }
- elseif($mode == "add")
- {
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket_add&module=basket");
- exit();
- }
- }
- else
- {
- $db = new Database();
- // Add Mode
- if($mode == "add")
- {
-
- $stmt = $db->query("select basket_id from ".$_SESSION['tablename']['bask_baskets']." where basket_id = ?",array($_SESSION['m_admin']['basket']['basketId']));
-
- if($stmt->rowCount() > 0)
- {
-
- $_SESSION['error'] = $_SESSION['m_admin']['basket']['basketId']." "._ALREADY_EXISTS."<br />";
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket_add&module=basket");
- exit();
- }
- else
- {
- $tmp = $_SESSION['m_admin']['basket']['clause'];
-
- // Checks the where clause syntax
- $syntax = $this -> where_test($_SESSION['m_admin']['basket']['clause']);
- if($syntax['status'] <> true)
- {
- $_SESSION['error'] .= ' : ' . _SYNTAX_ERROR_WHERE_CLAUSE . ' ' . $syntax['error'];
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket_add&module=basket");
- exit();
- }
- $db->query(
- "INSERT INTO ".$_SESSION['tablename']['bask_baskets']." ( coll_id, basket_id, basket_name, basket_desc , basket_clause, is_visible, is_folder_basket, flag_notif, color) "
- ."VALUES (?,?,?,?,?,?,?,?,?)", array($_SESSION['m_admin']['basket']['coll_id'],$_SESSION['m_admin']['basket']['basketId'],$_SESSION['m_admin']['basket']['name'],$_SESSION['m_admin']['basket']['desc'],$tmp,$_SESSION['m_admin']['basket']['is_visible'],$_SESSION['m_admin']['basket']['is_folder_basket'],$_SESSION['m_admin']['basket']['flag_notif'], $_SESSION['m_admin']['basket']['color']));
- $this->load_db();
-
- // Log in database if required
- if($_SESSION['history']['basketadd'] == "true")
- {
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_history.php");
- $hist = new history();
- $hist->add($_SESSION['tablename']['bask_baskets'], $_SESSION['m_admin']['basket']['basketId'],"ADD",'basketadd',_BASKET_ADDED." : ".$_SESSION['m_admin']['basket']['basketId'], $_SESSION['config']['databasetype'], 'basket');
- }
-
- // Empties the basket administration session var and redirect to baskets list
- $this->clearbasketinfos();
- $_SESSION['info'] = _BASKET_ADDED;
-
- // Refresh personnal basket info
- require_once 'modules/basket/class/class_modules_tools.php';
- $basketModule = new basket();
- $basketModule->load_module_var_session($_SESSION['user']);
-
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket&module=basket&order=".$order."&order_field=".$order_field."&start=".$start."&what=".$what);
- exit();
- }
- }
- // Up Mode
- elseif($mode == "up")
- {
-
- $tmp = $_SESSION['m_admin']['basket']['clause'];
- if($tmp == NULL){
- $tmp = "";
- }
- $desc = $_SESSION['m_admin']['basket']['desc'];
- //var_dump($desc);
- //exit;
- if($desc == NULL){
- $desc = "";
- }
- $name = $_SESSION['m_admin']['basket']['name'];
- if($name == NULL){
- $name = "";
- }
-
- // $clause = ", basket_clause = '".$tmp."'";
- //}
-
- // Checks the where clause syntax
- $syntax = $this->where_test($_SESSION['m_admin']['basket']['clause']);
- if($syntax['status'] <> true)
- {
- $_SESSION['error'] .= ' : ' . _SYNTAX_ERROR_WHERE_CLAUSE . ' ' . $syntax['error'];
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket_up&id=".$_SESSION['m_admin']['basket']['basketId']."&module=basket");
- exit();
- }
-
- $db->query("UPDATE baskets set basket_name = ? , coll_id = ? , basket_desc = ? ,basket_clause = ?, is_folder_basket = ?, is_visible = ?, flag_notif = ?, color = ? where basket_id = ?",array($name,$_SESSION['m_admin']['basket']['coll_id'],$desc, $tmp, $_SESSION['m_admin']['basket']['is_folder_basket'], $_SESSION['m_admin']['basket']['is_visible'], $_SESSION['m_admin']['basket']['flag_notif'], $_SESSION['m_admin']['basket']['color'], $_SESSION['m_admin']['basket']['basketId']));
- $this->load_db();
-
- // Log in database if required
- if($_SESSION['history']['basketup'] == "true")
- {
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_history.php");
- $hist = new history();
- $hist->add($_SESSION['tablename']['bask_baskets'], $_SESSION['m_admin']['basket']['basketId'],"UP",'basketup',_BASKET_UPDATE." : ".$_SESSION['m_admin']['basket']['basketId'], $_SESSION['config']['databasetype'], 'basket');
- }
-
- // Empties the basket administration session var and redirect to baskets list
- $this->clearbasketinfos();
- $_SESSION['info'] = _BASKET_UPDATED;
-
- // Refresh personnal basket info
- require_once 'modules/basket/class/class_modules_tools.php';
- $basketModule = new basket();
- $basketModule->load_module_var_session($_SESSION['user']);
-
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket&module=basket&order=".$order."&order_field=".$order_field."&start=".$start."&what=".$what);
- exit();
- }
- }
- }
-
- /**
- * Cleans the $_SESSION['m_admin']['basket'] array
- */
- protected function clearbasketinfos()
- {
- unset($_SESSION['m_admin']);
- }
-
- /**
- * Check the basket where clause syntax
- *
- * @param $where_clause string The where clause to check
- * @return bool true if the syntax is correct, false otherwise
- */
- public function where_test($where_clause)
- {
- $where = '';
- $return = array(
- 'status' => true,
- 'error' => ''
- );
- if (! empty ($where_clause)) {
- require_once 'core/class/SecurityControler.php';
- $secCtrl = new SecurityControler();
- if ($secCtrl->isUnsecureRequest($where_clause)) {
- $return = array(
- 'status' => false,
- 'error' => _WHERE_CLAUSE_NOT_SECURE
- );
- return $return;
- } else {
- $where = $secCtrl->process_security_where_clause(
- $where_clause, $_SESSION['user']['UserId']
- );
- }
- }
-
- //Folder basket
- if ($_SESSION['m_admin']['basket']['is_folder_basket'] == 'Y' && ! empty ($where_clause)) {
- $core_tools = new core_tools();
- if ($core_tools->is_module_loaded('folder')) {
- $db = new Database();
- $stmt = $db->query(
- "select count(*) from " . $_SESSION['view']['view_folders']
- . " " . $where);
- if (!isset($stmt) || !$stmt) {
- $_SESSION['error'] .= " " . $_SESSION['view']['view_folders'];
- $return = array(
- 'status' => false,
- 'error' => ''
- );
- }
- }
-
- } else {
- // Gets the basket collection
- $ind = -1;
- for ($i = 0; $i < count($_SESSION['collections']); $i ++)
- {
- if ($_SESSION['m_admin']['basket']['coll_id']
- == $_SESSION['collections'][$i]['id']) {
- $ind = $i;
- break;
- }
- }
-
- if ($ind == -1) {
- $_SESSION['error'] .= ' ' . $_SESSION['m_admin']['basket']['coll_id'];
- $return = array(
- 'status' => false,
- 'error' => ''
- );
- } else {// Launches the query in quiet mode
- $db = new Database();
- $stmt = $db->query(
- "select count(*) from " . $_SESSION['collections'][$ind]['view']
- . " " . $where, array(), true
- );
- }
- if (!isset($stmt) || !$stmt) {
- $_SESSION['error'] .= " " . $_SESSION['m_admin']['basket']['coll_id'];
- $return = array(
- 'status' => false,
- 'error' => ''
- );
- }
- }
- return $return;
- }
-
- /**
- * Update the groupbasket and actions_groupbasket tables
- */
- protected function load_db()
- {
- $db = new Database();
- // Empties the tables from the existing data about the current basket ($_SESSION['m_admin']['basket']['basketId'])
- $db->query("DELETE FROM ".$_SESSION['tablename']['bask_groupbasket'] ." where basket_id= ?",array($_SESSION['m_admin']['basket']['basketId']));
- $db->query("DELETE FROM ".$_SESSION['tablename']['bask_actions_groupbaskets'] ." where basket_id= ?",array($_SESSION['m_admin']['basket']['basketId']));
- $grouplistetmp ="";
- $groupIdList = '';
- // Browses the $_SESSION['m_admin']['basket']['groups']
- for($i=0; $i < count($_SESSION['m_admin']['basket']['groups'] ); $i++)
- {
- // Update groupbasket table
- $db->query("INSERT INTO ".$_SESSION['tablename']['bask_groupbasket']." (group_id, basket_id, result_page)
- VALUES (?,?,?)",array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'],$_SESSION['m_admin']['basket']['basketId'],$_SESSION['m_admin']['basket']['groups'][$i]['RESULT_PAGE']));
-
- // Browses the actions array for the current basket - group couple and inserts the action in actions_groupbasket table if needed
- for($j=0; $j < count($_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS']); $j++)
- {
- $db->query("INSERT INTO ".$_SESSION['tablename']['bask_actions_groupbaskets']
- ." (group_id, basket_id, where_clause, used_in_basketlist, used_in_action_page, id_action )
- VALUES (?,?,?,?,?,?)",array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'],$_SESSION['m_admin']['basket']['basketId'], $_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['WHERE'],$_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['MASS_USE'],$_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['PAGE_USE'],$_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['ID_ACTION']));
- }
-
- // Inserts in actions_groupbasket table the default action if set
- if(isset($_SESSION['m_admin']['basket']['groups'][$i]['DEFAULT_ACTION']) && !empty($_SESSION['m_admin']['basket']['groups'][$i]['DEFAULT_ACTION']))
- {
- $stmt = $db->query("INSERT INTO ".$_SESSION['tablename']['bask_actions_groupbaskets']." (group_id, basket_id, where_clause, used_in_basketlist, used_in_action_page, id_action, default_action_list)
- VALUES (?, ?,'','N','N', ?, 'Y')",array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'],$_SESSION['m_admin']['basket']['basketId'],$_SESSION['m_admin']['basket']['groups'][$i]['DEFAULT_ACTION']));
- }
- $groupIdList .= $_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'] . ',';
- }
- $arrayPDO = array($_SESSION['m_admin']['basket']['basketId']);
- $groupIdList = rtrim($groupIdList, ",");
- $allGroupId = explode(",", $groupIdList);
- $arrayPDO = array_merge($arrayPDO, array($allGroupId));
-
-
- $_SESSION['service_tag'] = 'load_basket_db';
- $core = new core_tools();
- ### Le chargement de plusieurs services ne fonctionne pas... Obligation de les nommer un par
- //$core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', "include");
- $core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', "include", 'param_redirect_action', 'entities');
- $core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', "include", 'param_index_entities', 'entities');
- $core->execute_app_services($_SESSION['app_services'], 'load_groupbasket_db', "include");
- $core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', "include");
- $_SESSION['service_tag'] = '';
- }
-
- /**
- * Allows, suspends or deletes a basket in the database
- *
- * @param $id string Basket identifier
- * @param $mode string "allow", "ban" or "del", but only "allow" and "ban" are deprecated
- */
- public function adminbasket($id,$mode)
- {
- $order = $_REQUEST['order'];
- $order_field = $_REQUEST['order_field'];
- $start = $_REQUEST['start'];
- $what = $_REQUEST['what'];
- if(!empty($_SESSION['error']))
- {
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket&module=basket&order=".$order."&order_field=".$order_field."&start=".$start."&what=".$what);
- exit();
- }
- else
- {
- $db = new Database();
- $stmt = $db->query("select basket_id from ".$_SESSION['tablename']['bask_baskets']." where basket_id= ?",array($id));
-
- if($stmt->rowCount() == 0)
- {
- $_SESSION['error'] = _BASKET_MISSING;
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket&module=basket&order=".$order."&order_field=".$order_field."&start=".$start."&what=".$what);
- exit();
- }
- else
- {
- $info = $stmt->fetchObject();
-
- // Mode allow : not used
- if($mode == "allow")
- {
- $db->query("Update ".$_SESSION['tablename']['bask_baskets']." set enabled = 'Y' where basket_id= ?", array($id));
- if($_SESSION['history']['basketval'] == "true")
- {
- require_once("core/class/class_history.php");
- $hist = new history();
- $hist->add($_SESSION['tablename']['bask_baskets'], $id,"VAL",'basketval',_BASKET_AUTORIZATION." : ".$id, $_SESSION['config']['databasetype'] ,'basket');
- }
- $_SESSION['info'] = _AUTORIZED_BASKET;
- }
- // Mode ban : not used
- elseif($mode == "ban")
- {
- $db->query("Update ".$_SESSION['tablename']['bask_baskets']." set enabled = 'N' where basket_id = ?",array($id));
- if($_SESSION['history']['basketban'] == "true")
- {
- require_once("core/class/class_history.php");
- $hist = new history();
- $hist->add($_SESSION['tablename']['bask_baskets'], $id,"BAN",'basketban',_BASKET_SUSPENSION." : ".$id, $_SESSION['config']['databasetype'], 'basket');
- }
- $_SESSION['info'] = _SUSPENDED_BASKET;
-
- }
- // Mode delete : delete a basket and all its setting
- elseif($mode == "del" )
- {
- $db->query("delete from ".$_SESSION['tablename']['bask_baskets']." where basket_id = ?", array($id));
- $db->query("delete from ".$_SESSION['tablename']['bask_groupbasket']." where basket_id = ?", array($id));
- $db->query("delete from ".$_SESSION['tablename']['bask_actions_groupbaskets']." where basket_id = ?", array($id));
-
- $_SESSION['service_tag'] = 'del_basket';
- $_SESSION['temp_basket_id'] = $id;
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_core_tools.php");
- $core = new core_tools();
- echo $core->execute_modules_services($_SESSION['modules_services'], 'del_basket', "include");
- echo $core->execute_app_services($_SESSION['app_services'], 'del_basket', "include");
-
- // Log in database if needed
- if($_SESSION['history']['basketdel'] == "true")
- {
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_history.php");
- $hist = new history();
- $hist->add($_SESSION['tablename']['bask_baskets'], $id,"DEL",'basketdel',_BASKET_DELETION." : ".$id, $_SESSION['config']['databasetype'], 'basket');
- }
- $_SESSION['info'] = _BASKET_DELETION;
- }
-
- // Redirection to the baskets list page
- header("location: ".$_SESSION['config']['businessappurl']."index.php?page=basket&module=basket&order=".$order."&order_field=".$order_field."&start=".$start."&what=".$what);
- exit();
- }
- }
- }
-
- /**
- * Checks if an action is defined for a given usergroup
- *
- * @param $id_action string Action identifier
- * @param $ind_group_session string Indice of the group in the $_SESSION['m_admin']['basket']['groups'] array
- * @return bool
- */
- public function is_action_defined_for_the_group($id_action, $ind_group_session)
- {
- if (isset($ind_group_session)
- && isset($_SESSION['m_admin']['basket']['groups']
- [$ind_group_session])) {
- for ($i = 0; $i < count(
- $_SESSION['m_admin']['basket']['groups']
- [$ind_group_session]['ACTIONS']
- ); $i ++) {
- if (trim($id_action) == trim(
- $_SESSION['m_admin']['basket']['groups']
- [$ind_group_session]['ACTIONS'][$i]['ID_ACTION'])) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Checks if an action is allowed in a mode for a given group
- *
- * @param $ind_group string Indice of the group in the $_SESSION['m_admin']['basket']['groups'] array
- * @param $id_action string Action identifier
- * @param $what string Action mode : "MASS_USE" or "PAGE_USE"
- * @return string 'Y' if the action is allowed in the mode, 'N' if not allowed, empty string otherwise
- */
- public function get_infos_groupbasket_session($ind_group, $id_action, $what)
- {
- if (! isset($ind_group)
- || ! isset(
- $_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS']
- )) {
- return '';
- }
- for($i=0; $i < count($_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS']); $i++)
- {
- if($id_action == $_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS'][$i]['ID_ACTION'])
- {
- if(isset($_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS'][$i][$what]))
- {
- return $_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS'][$i][$what];
- }
- else
- {
- if($what == 'MASS_USE' || $what == 'PAGE_USE')
- {
- return 'N';
- }
- else
- {
- return '';
- }
- }
- }
- }
- if($what == 'MASS_USE' || $what == 'PAGE_USE')
- {
- return 'N';
- }
- else
- {
- return '';
- }
- }
-
- /**
- * Manage Basket order
- */
- public function ManageBasketOrder($getFromBdd = true)
- {
-
- echo '<h1><i class="fa fa-inbox fa-2x" title="" /></i> '._MANAGE_BASKET_ORDER.'</h1>';
- echo '<br/>';
- $db = new Database();
-
- if ($getFromBdd) {
- $stmt = $db->query("SELECT * FROM baskets WHERE is_visible = 'Y' and basket_id <> 'IndexingBasket' ORDER BY basket_order, basket_name");
-
- $_SESSION['basket_order']= array();
-
- while ($allBaskets = $stmt->fetchObject()) {
- array_push($_SESSION['basket_order'], array("basket_id" => $allBaskets->basket_id, "basket_name" => $allBaskets->basket_name, "basket_desc" => $allBaskets->basket_desc, "basket_order" => $allBaskets->basket_order));
- }
- }
- ?>
+ <?php
+ }
+
+ /**
+ * Validates the informations returned by the form of the formgroups() function, in case of error writes in the $_SESSION['error'] var.
+ *
+ * @param $mode string Administrator mode "add" or "up"
+ */
+ protected function basketinfo($mode)
+ {
+ if ($mode == 'add') {
+ $_SESSION['m_admin']['basket']['basketId'] = $this->wash($_REQUEST['basketId'], 'nick', _THE_ID, 'yes', 0, 32);
+ }
+ if ($mode == 'up') {
+ $_SESSION['m_admin']['basket']['basketId'] = $this->wash($_REQUEST['id'], 'nick', _THE_ID, 'yes', 0, 32);
+ }
+ if (isset($_REQUEST['basketname']) && !empty($_REQUEST['basketname'])) {
+ $_SESSION['m_admin']['basket']['name'] = $this->wash($_REQUEST['basketname'], 'no', _THE_BASKET, 'yes', 0, 255);
+ }
+ if (!empty($_REQUEST['color'])) {
+ $_SESSION['m_admin']['basket']['color'] = $this->wash($_REQUEST['color'], 'no', _THE_BASKET, 'yes', 0, 255);
+ }
+ if (isset($_REQUEST['basketdesc']) && !empty($_REQUEST['basketdesc'])) {
+ $_SESSION['m_admin']['basket']['desc'] = $this->wash($_REQUEST['basketdesc'], 'no', _THE_DESC, 'yes', 0, 255);
+ }
+ if (isset($_REQUEST['collection']) && !empty($_REQUEST['collection'])) {
+ $_SESSION['m_admin']['basket']['coll_id'] = $this->wash($_REQUEST['collection'], 'no', _COLLECTION, 'yes', 0, 32);
+ }
+ if (isset($_REQUEST['basketclause'])
+ && !empty($_REQUEST['basketclause'])) {
+ $_SESSION['m_admin']['basket']['clause'] = trim($_REQUEST['basketclause']);
+ }
+ if (isset($_REQUEST['is_visible']) && !empty($_REQUEST['is_visible'])) {
+ $_SESSION['m_admin']['basket']['is_visible'] = $_REQUEST['is_visible'];
+ } else {
+ $_SESSION['m_admin']['basket']['is_visible'] = 'N';
+ }
+ if (isset($_REQUEST['is_folder_basket']) && !empty($_REQUEST['is_folder_basket'])) {
+ $_SESSION['m_admin']['basket']['is_folder_basket'] = $_REQUEST['is_folder_basket'];
+ } else {
+ $_SESSION['m_admin']['basket']['is_folder_basket'] = 'N';
+ }
+ if (isset($_REQUEST['flag_notif']) && !empty($_REQUEST['flag_notif'])) {
+ $_SESSION['m_admin']['basket']['flag_notif'] = $_REQUEST['flag_notif'];
+ } else {
+ $_SESSION['m_admin']['basket']['flag_notif'] = '';
+ }
+ $_SESSION['m_admin']['basket']['order'] = $_REQUEST['order'];
+ $_SESSION['m_admin']['basket']['order_field'] = $_REQUEST['order_field'];
+ $_SESSION['m_admin']['basket']['what'] = $_REQUEST['what'];
+ $_SESSION['m_admin']['basket']['start'] = $_REQUEST['start'];
+ }
+
+ /**
+ * After the validation made by the basketinfo() function, according the mode update the basket table or insert a new basket.
+ *
+ * @param $mode string Mode "up" or "add"
+ */
+ public function addupbasket($mode)
+ {
+ // Checks the session values
+ $this->basketinfo($mode);
+
+ $order = $_SESSION['m_admin']['basket']['order'];
+ $order_field = $_SESSION['m_admin']['basket']['order_field'];
+ $what = $_SESSION['m_admin']['basket']['what'];
+ $start = $_SESSION['m_admin']['basket']['start'];
+ //echo '<pre>'.print_r($_REQUEST,true).'</pre>'; echo '<pre>'.print_r($_SESSION['m_admin']['basket'],true).'</pre>'; exit();
+ // If error redirection to the form page and shows the error
+ if (!empty($_SESSION['error'])) {
+ if ($mode == 'up') {
+ if (!empty($_SESSION['m_admin']['basket']['basketId'])) {
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket_up&id='.$_SESSION['m_admin']['basket']['basketId'].'&module=basket');
+ exit();
+ } else {
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket&module=basket&order='.$order.'&order_field='.$order_field.'&start='.$start.'&what='.$what);
+ exit();
+ }
+ } elseif ($mode == 'add') {
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket_add&module=basket');
+ exit();
+ }
+ } else {
+ $db = new Database();
+ // Add Mode
+ if ($mode == 'add') {
+ $stmt = $db->query('select basket_id from '.$_SESSION['tablename']['bask_baskets'].' where basket_id = ?', array($_SESSION['m_admin']['basket']['basketId']));
+
+ if ($stmt->rowCount() > 0) {
+ $_SESSION['error'] = $_SESSION['m_admin']['basket']['basketId'].' '._ALREADY_EXISTS.'<br />';
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket_add&module=basket');
+ exit();
+ } else {
+ $tmp = $_SESSION['m_admin']['basket']['clause'];
+
+ // Checks the where clause syntax
+ $syntax = $this->where_test($_SESSION['m_admin']['basket']['clause']);
+ if ($syntax['status'] != true) {
+ $_SESSION['error'] .= ' : '._SYNTAX_ERROR_WHERE_CLAUSE.' '.$syntax['error'];
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket_add&module=basket');
+ exit();
+ }
+ $db->query(
+ 'INSERT INTO '.$_SESSION['tablename']['bask_baskets'].' ( coll_id, basket_id, basket_name, basket_desc , basket_clause, is_visible, is_folder_basket, flag_notif, color) '
+ .'VALUES (?,?,?,?,?,?,?,?,?)', array($_SESSION['m_admin']['basket']['coll_id'], $_SESSION['m_admin']['basket']['basketId'], $_SESSION['m_admin']['basket']['name'], $_SESSION['m_admin']['basket']['desc'], $tmp, $_SESSION['m_admin']['basket']['is_visible'], $_SESSION['m_admin']['basket']['is_folder_basket'], $_SESSION['m_admin']['basket']['flag_notif'], $_SESSION['m_admin']['basket']['color']));
+ $this->load_db();
+
+ // Log in database if required
+ if ($_SESSION['history']['basketadd'] == 'true') {
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_history.php';
+ $hist = new history();
+ $hist->add($_SESSION['tablename']['bask_baskets'], $_SESSION['m_admin']['basket']['basketId'], 'ADD', 'basketadd', _BASKET_ADDED.' : '.$_SESSION['m_admin']['basket']['basketId'], $_SESSION['config']['databasetype'], 'basket');
+ }
+
+ // Empties the basket administration session var and redirect to baskets list
+ $this->clearbasketinfos();
+ $_SESSION['info'] = _BASKET_ADDED;
+
+ // Refresh personnal basket info
+ require_once 'modules/basket/class/class_modules_tools.php';
+ $basketModule = new basket();
+ $basketModule->load_module_var_session($_SESSION['user']);
+
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket&module=basket&order='.$order.'&order_field='.$order_field.'&start='.$start.'&what='.$what);
+ exit();
+ }
+ }
+ // Up Mode
+ elseif ($mode == 'up') {
+ $tmp = $_SESSION['m_admin']['basket']['clause'];
+ if ($tmp == null) {
+ $tmp = '';
+ }
+ $desc = $_SESSION['m_admin']['basket']['desc'];
+ //var_dump($desc);
+ //exit;
+ if ($desc == null) {
+ $desc = '';
+ }
+ $name = $_SESSION['m_admin']['basket']['name'];
+ if ($name == null) {
+ $name = '';
+ }
+
+ // $clause = ", basket_clause = '".$tmp."'";
+ //}
+
+ // Checks the where clause syntax
+ $syntax = $this->where_test($_SESSION['m_admin']['basket']['clause']);
+ if ($syntax['status'] != true) {
+ $_SESSION['error'] .= ' : '._SYNTAX_ERROR_WHERE_CLAUSE.' '.$syntax['error'];
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket_up&id='.$_SESSION['m_admin']['basket']['basketId'].'&module=basket');
+ exit();
+ }
+
+ $db->query('UPDATE baskets set basket_name = ? , coll_id = ? , basket_desc = ? ,basket_clause = ?, is_folder_basket = ?, is_visible = ?, flag_notif = ?, color = ? where basket_id = ?', array($name, $_SESSION['m_admin']['basket']['coll_id'], $desc, $tmp, $_SESSION['m_admin']['basket']['is_folder_basket'], $_SESSION['m_admin']['basket']['is_visible'], $_SESSION['m_admin']['basket']['flag_notif'], $_SESSION['m_admin']['basket']['color'], $_SESSION['m_admin']['basket']['basketId']));
+ $this->load_db();
+
+ // Log in database if required
+ if ($_SESSION['history']['basketup'] == 'true') {
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_history.php';
+ $hist = new history();
+ $hist->add($_SESSION['tablename']['bask_baskets'], $_SESSION['m_admin']['basket']['basketId'], 'UP', 'basketup', _BASKET_UPDATE.' : '.$_SESSION['m_admin']['basket']['basketId'], $_SESSION['config']['databasetype'], 'basket');
+ }
+
+ // Empties the basket administration session var and redirect to baskets list
+ $this->clearbasketinfos();
+ $_SESSION['info'] = _BASKET_UPDATED;
+
+ // Refresh personnal basket info
+ require_once 'modules/basket/class/class_modules_tools.php';
+ $basketModule = new basket();
+ $basketModule->load_module_var_session($_SESSION['user']);
+
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket&module=basket&order='.$order.'&order_field='.$order_field.'&start='.$start.'&what='.$what);
+ exit();
+ }
+ }
+ }
+
+ /**
+ * Cleans the $_SESSION['m_admin']['basket'] array.
+ */
+ protected function clearbasketinfos()
+ {
+ unset($_SESSION['m_admin']);
+ }
+
+ /**
+ * Check the basket where clause syntax.
+ *
+ * @param $where_clause string The where clause to check
+ *
+ * @return bool true if the syntax is correct, false otherwise
+ */
+ public function where_test($where_clause)
+ {
+ $where = '';
+ $return = array(
+ 'status' => true,
+ 'error' => '',
+ );
+ if (!empty($where_clause)) {
+ require_once 'core/class/SecurityControler.php';
+ $secCtrl = new SecurityControler();
+ if ($secCtrl->isUnsecureRequest($where_clause)) {
+ $return = array(
+ 'status' => false,
+ 'error' => _WHERE_CLAUSE_NOT_SECURE,
+ );
+
+ return $return;
+ } else {
+ $where = $secCtrl->process_security_where_clause(
+ $where_clause, $_SESSION['user']['UserId']
+ );
+ }
+ }
+
+ //Folder basket
+ if ($_SESSION['m_admin']['basket']['is_folder_basket'] == 'Y' && !empty($where_clause)) {
+ $core_tools = new core_tools();
+ if ($core_tools->is_module_loaded('folder')) {
+ $db = new Database();
+ $stmt = $db->query(
+ 'select count(*) from '.$_SESSION['view']['view_folders']
+ .' '.$where);
+ if (!isset($stmt) || !$stmt) {
+ $_SESSION['error'] .= ' '.$_SESSION['view']['view_folders'];
+ $return = array(
+ 'status' => false,
+ 'error' => '',
+ );
+ }
+ }
+ } else {
+ // Gets the basket collection
+ $ind = -1;
+ for ($i = 0; $i < count($_SESSION['collections']); ++$i ) {
+ if ($_SESSION['m_admin']['basket']['coll_id']
+ == $_SESSION['collections'][$i]['id']) {
+ $ind = $i;
+ break;
+ }
+ }
+
+ if ($ind == -1) {
+ $_SESSION['error'] .= ' '.$_SESSION['m_admin']['basket']['coll_id'];
+ $return = array(
+ 'status' => false,
+ 'error' => '',
+ );
+ } else {// Launches the query in quiet mode
+ $db = new Database();
+ $stmt = $db->query(
+ 'select count(*) from '.$_SESSION['collections'][$ind]['view']
+ .' '.$where, array(), true
+ );
+ }
+ if (!isset($stmt) || !$stmt) {
+ $_SESSION['error'] .= ' '.$_SESSION['m_admin']['basket']['coll_id'];
+ $return = array(
+ 'status' => false,
+ 'error' => '',
+ );
+ }
+ }
+
+ return $return;
+ }
+
+ /**
+ * Update the groupbasket and actions_groupbasket tables.
+ */
+ protected function load_db()
+ {
+ $db = new Database();
+ // Empties the tables from the existing data about the current basket ($_SESSION['m_admin']['basket']['basketId'])
+ $db->query('DELETE FROM '.$_SESSION['tablename']['bask_groupbasket'].' where basket_id= ?', array($_SESSION['m_admin']['basket']['basketId']));
+ $db->query('DELETE FROM '.$_SESSION['tablename']['bask_actions_groupbaskets'].' where basket_id= ?', array($_SESSION['m_admin']['basket']['basketId']));
+ $grouplistetmp = '';
+ $groupIdList = '';
+ // Browses the $_SESSION['m_admin']['basket']['groups']
+ for ($i = 0; $i < count($_SESSION['m_admin']['basket']['groups']); ++$i) {
+ // Update groupbasket table
+ $db->query('INSERT INTO '.$_SESSION['tablename']['bask_groupbasket'].' (group_id, basket_id, result_page)
+ VALUES (?,?,?)', array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'], $_SESSION['m_admin']['basket']['basketId'], $_SESSION['m_admin']['basket']['groups'][$i]['RESULT_PAGE']));
+
+ // Browses the actions array for the current basket - group couple and inserts the action in actions_groupbasket table if needed
+ for ($j = 0; $j < count($_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS']); ++$j) {
+ $db->query('INSERT INTO '.$_SESSION['tablename']['bask_actions_groupbaskets']
+ .' (group_id, basket_id, where_clause, used_in_basketlist, used_in_action_page, id_action )
+ VALUES (?,?,?,?,?,?)', array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'], $_SESSION['m_admin']['basket']['basketId'], $_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['WHERE'], $_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['MASS_USE'], $_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['PAGE_USE'], $_SESSION['m_admin']['basket']['groups'][$i]['ACTIONS'][$j]['ID_ACTION']));
+ }
+
+ // Inserts in actions_groupbasket table the default action if set
+ if (isset($_SESSION['m_admin']['basket']['groups'][$i]['DEFAULT_ACTION']) && !empty($_SESSION['m_admin']['basket']['groups'][$i]['DEFAULT_ACTION'])) {
+ $stmt = $db->query('INSERT INTO '.$_SESSION['tablename']['bask_actions_groupbaskets']." (group_id, basket_id, where_clause, used_in_basketlist, used_in_action_page, id_action, default_action_list)
+ VALUES (?, ?,'','N','N', ?, 'Y')", array($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'], $_SESSION['m_admin']['basket']['basketId'], $_SESSION['m_admin']['basket']['groups'][$i]['DEFAULT_ACTION']));
+ }
+ $groupIdList .= $_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'].',';
+ }
+ $arrayPDO = array($_SESSION['m_admin']['basket']['basketId']);
+ $groupIdList = rtrim($groupIdList, ',');
+ $allGroupId = explode(',', $groupIdList);
+ $arrayPDO = array_merge($arrayPDO, array($allGroupId));
+
+ $_SESSION['service_tag'] = 'load_basket_db';
+ $core = new core_tools();
+ //## Le chargement de plusieurs services ne fonctionne pas... Obligation de les nommer un par
+ //$core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', "include");
+ $core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', 'include', 'param_redirect_action', 'entities');
+ $core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', 'include', 'param_index_entities', 'entities');
+ $core->execute_app_services($_SESSION['app_services'], 'load_groupbasket_db', 'include');
+ $core->execute_modules_services($_SESSION['modules_services'], 'load_groupbasket_db', 'include');
+ $_SESSION['service_tag'] = '';
+ }
+
+ /**
+ * Allows, suspends or deletes a basket in the database.
+ *
+ * @param $id string Basket identifier
+ * @param $mode string "allow", "ban" or "del", but only "allow" and "ban" are deprecated
+ */
+ public function adminbasket($id, $mode)
+ {
+ $order = $_REQUEST['order'];
+ $order_field = $_REQUEST['order_field'];
+ $start = $_REQUEST['start'];
+ $what = $_REQUEST['what'];
+ if (!empty($_SESSION['error'])) {
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket&module=basket&order='.$order.'&order_field='.$order_field.'&start='.$start.'&what='.$what);
+ exit();
+ } else {
+ $db = new Database();
+ $stmt = $db->query('select basket_id from '.$_SESSION['tablename']['bask_baskets'].' where basket_id= ?', array($id));
+
+ if ($stmt->rowCount() == 0) {
+ $_SESSION['error'] = _BASKET_MISSING;
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket&module=basket&order='.$order.'&order_field='.$order_field.'&start='.$start.'&what='.$what);
+ exit();
+ } else {
+ $info = $stmt->fetchObject();
+
+ // Mode allow : not used
+ if ($mode == 'allow') {
+ $db->query('Update '.$_SESSION['tablename']['bask_baskets']." set enabled = 'Y' where basket_id= ?", array($id));
+ if ($_SESSION['history']['basketval'] == 'true') {
+ require_once 'core/class/class_history.php';
+ $hist = new history();
+ $hist->add($_SESSION['tablename']['bask_baskets'], $id, 'VAL', 'basketval', _BASKET_AUTORIZATION.' : '.$id, $_SESSION['config']['databasetype'], 'basket');
+ }
+ $_SESSION['info'] = _AUTORIZED_BASKET;
+ }
+ // Mode ban : not used
+ elseif ($mode == 'ban') {
+ $db->query('Update '.$_SESSION['tablename']['bask_baskets']." set enabled = 'N' where basket_id = ?", array($id));
+ if ($_SESSION['history']['basketban'] == 'true') {
+ require_once 'core/class/class_history.php';
+ $hist = new history();
+ $hist->add($_SESSION['tablename']['bask_baskets'], $id, 'BAN', 'basketban', _BASKET_SUSPENSION.' : '.$id, $_SESSION['config']['databasetype'], 'basket');
+ }
+ $_SESSION['info'] = _SUSPENDED_BASKET;
+ }
+ // Mode delete : delete a basket and all its setting
+ elseif ($mode == 'del') {
+ $db->query('delete from '.$_SESSION['tablename']['bask_baskets'].' where basket_id = ?', array($id));
+ $db->query('delete from '.$_SESSION['tablename']['bask_groupbasket'].' where basket_id = ?', array($id));
+ $db->query('delete from '.$_SESSION['tablename']['bask_actions_groupbaskets'].' where basket_id = ?', array($id));
+
+ $_SESSION['service_tag'] = 'del_basket';
+ $_SESSION['temp_basket_id'] = $id;
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_core_tools.php';
+ $core = new core_tools();
+ echo $core->execute_modules_services($_SESSION['modules_services'], 'del_basket', 'include');
+ echo $core->execute_app_services($_SESSION['app_services'], 'del_basket', 'include');
+
+ // Log in database if needed
+ if ($_SESSION['history']['basketdel'] == 'true') {
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_history.php';
+ $hist = new history();
+ $hist->add($_SESSION['tablename']['bask_baskets'], $id, 'DEL', 'basketdel', _BASKET_DELETION.' : '.$id, $_SESSION['config']['databasetype'], 'basket');
+ }
+ $_SESSION['info'] = _BASKET_DELETION;
+ }
+
+ // Redirection to the baskets list page
+ header('location: '.$_SESSION['config']['businessappurl'].'index.php?page=basket&module=basket&order='.$order.'&order_field='.$order_field.'&start='.$start.'&what='.$what);
+ exit();
+ }
+ }
+ }
+
+ /**
+ * Checks if an action is defined for a given usergroup.
+ *
+ * @param $id_action string Action identifier
+ * @param $ind_group_session string Indice of the group in the $_SESSION['m_admin']['basket']['groups'] array
+ *
+ * @return bool
+ */
+ public function is_action_defined_for_the_group($id_action, $ind_group_session)
+ {
+ if (isset($ind_group_session)
+ && isset($_SESSION['m_admin']['basket']['groups'][$ind_group_session])) {
+ for ($i = 0; $i < count(
+ $_SESSION['m_admin']['basket']['groups'][$ind_group_session]['ACTIONS']
+ ); ++$i ) {
+ if (trim($id_action) == trim(
+ $_SESSION['m_admin']['basket']['groups'][$ind_group_session]['ACTIONS'][$i]['ID_ACTION'])) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Checks if an action is allowed in a mode for a given group.
+ *
+ * @param $ind_group string Indice of the group in the $_SESSION['m_admin']['basket']['groups'] array
+ * @param $id_action string Action identifier
+ * @param $what string Action mode : "MASS_USE" or "PAGE_USE"
+ *
+ * @return string 'Y' if the action is allowed in the mode, 'N' if not allowed, empty string otherwise
+ */
+ public function get_infos_groupbasket_session($ind_group, $id_action, $what)
+ {
+ if (!isset($ind_group)
+ || !isset(
+ $_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS']
+ )) {
+ return '';
+ }
+ for ($i = 0; $i < count($_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS']); ++$i) {
+ if ($id_action == $_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS'][$i]['ID_ACTION']) {
+ if (isset($_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS'][$i][$what])) {
+ return $_SESSION['m_admin']['basket']['groups'][$ind_group]['ACTIONS'][$i][$what];
+ } else {
+ if ($what == 'MASS_USE' || $what == 'PAGE_USE') {
+ return 'N';
+ } else {
+ return '';
+ }
+ }
+ }
+ }
+ if ($what == 'MASS_USE' || $what == 'PAGE_USE') {
+ return 'N';
+ } else {
+ return '';
+ }
+ }
+
+ /**
+ * Manage Basket order.
+ */
+ public function ManageBasketOrder($getFromBdd = true)
+ {
+ echo '<h1><i class="fa fa-inbox fa-2x" title="" /></i> '._MANAGE_BASKET_ORDER.'</h1>';
+ echo '<br/>';
+ $db = new Database();
+
+ if ($getFromBdd) {
+ $stmt = $db->query("SELECT * FROM baskets WHERE is_visible = 'Y' and basket_id <> 'IndexingBasket' ORDER BY basket_order, basket_name");
+
+ $_SESSION['basket_order'] = array();
+
+ while ($allBaskets = $stmt->fetchObject()) {
+ array_push($_SESSION['basket_order'], array('basket_id' => $allBaskets->basket_id, 'basket_name' => $allBaskets->basket_name, 'basket_desc' => $allBaskets->basket_desc, 'basket_order' => $allBaskets->basket_order));
+ }
+ } ?>
<div id="inner_content">
<table class="listing spec" cellspacing="0" border="0" style="width: 100%; margin: 0;">
<head>
<tr>
- <th><?php echo _INDEX;?></th>
- <th><?php echo _ID;?></th>
- <th><?php echo _BASKET;?></th>
- <th><?php echo _DESC;?></th>
+ <th><?php echo _INDEX; ?></th>
+ <th><?php echo _ID; ?></th>
+ <th><?php echo _BASKET; ?></th>
+ <th><?php echo _DESC; ?></th>
<th></th>
<th></th>
<th></th>
@@ -976,68 +923,60 @@ abstract class admin_basket_Abstract extends Database
</tr>
</head>
- <?php
- foreach ($_SESSION['basket_order'] as $key => $value) {
-
- if(($key % 2) == 1) {
- $color = ' class="col"';
- } else {
- $color = ' ';
- }
-
- ?><tr <?php echo $color;?> ><td><?php echo $key;?></td>
- <td><?php echo $_SESSION['basket_order'][$key]['basket_id'];?></td>
- <td><?php echo $_SESSION['basket_order'][$key]['basket_name'];?></td>
- <td><?php echo $_SESSION['basket_order'][$key]['basket_desc'];?></td>
- <td><?php
- if($key > 0){
+ <?php
+ foreach ($_SESSION['basket_order'] as $key => $value) {
+ if (($key % 2) == 1) {
+ $color = ' class="col"';
+ } else {
+ $color = ' ';
+ } ?><tr <?php echo $color; ?> ><td><?php echo $key; ?></td>
+ <td><?php echo $_SESSION['basket_order'][$key]['basket_id']; ?></td>
+ <td><?php echo $_SESSION['basket_order'][$key]['basket_name']; ?></td>
+ <td><?php echo $_SESSION['basket_order'][$key]['basket_desc']; ?></td>
+ <td><?php
+ if ($key > 0) {
?>
- <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl']."index.php?page=setSessionBasketOrder&module=basket&basketIndex=".$key."&mode=topup";?>')" href="javascript://">
- <i class="fa fa-angle-double-up fa-2x" title="<?php echo _MOVE_UP_TOP ;?>"></i>
- </a><?php
+ <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl'].'index.php?page=setSessionBasketOrder&module=basket&basketIndex='.$key.'&mode=topup'; ?>')" href="javascript://">
+ <i class="fa fa-angle-double-up fa-2x" title="<?php echo _MOVE_UP_TOP; ?>"></i>
+ </a><?php
} ?>
</td>
- <td><?php
- if($key > 0){
+ <td><?php
+ if ($key > 0) {
?>
- <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl']."index.php?page=setSessionBasketOrder&module=basket&basketIndex=".$key."&mode=up";?>')" href="javascript://">
- <i class="fa fa-angle-up fa-2x" title="<?php echo _MOVE_UP_ONE_LEVEL ;?>"></i>
- </a><?php
+ <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl'].'index.php?page=setSessionBasketOrder&module=basket&basketIndex='.$key.'&mode=up'; ?>')" href="javascript://">
+ <i class="fa fa-angle-up fa-2x" title="<?php echo _MOVE_UP_ONE_LEVEL; ?>"></i>
+ </a><?php
} ?>
</td>
- <td><?php
- if(isset($_SESSION['basket_order'][$key+1])){
+ <td><?php
+ if (isset($_SESSION['basket_order'][$key + 1])) {
?>
- <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl']."index.php?page=setSessionBasketOrder&module=basket&basketIndex=".$key."&mode=down";?>')" href="javascript://">
- <i class="fa fa-angle-down fa-2x" title="<?php echo _MOVE_DOWN_ONE_LEVEL ;?>"></i>
- </a><?php
+ <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl'].'index.php?page=setSessionBasketOrder&module=basket&basketIndex='.$key.'&mode=down'; ?>')" href="javascript://">
+ <i class="fa fa-angle-down fa-2x" title="<?php echo _MOVE_DOWN_ONE_LEVEL; ?>"></i>
+ </a><?php
} ?>
</td>
- <td><?php
- if(isset($_SESSION['basket_order'][$key+1])){
+ <td><?php
+ if (isset($_SESSION['basket_order'][$key + 1])) {
?>
- <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl']."index.php?page=setSessionBasketOrder&module=basket&basketIndex=".$key."&mode=topdown";?>')" href="javascript://">
- <i class="fa fa-angle-double-down fa-2x" title="<?php echo _MOVE_DOWN_BOTTOM ;?>"></i>
- </a><?php
+ <a onclick="simpleAjaxReturn('<?php echo $_SESSION['config']['businessappurl'].'index.php?page=setSessionBasketOrder&module=basket&basketIndex='.$key.'&mode=topdown'; ?>')" href="javascript://">
+ <i class="fa fa-angle-double-down fa-2x" title="<?php echo _MOVE_DOWN_BOTTOM; ?>"></i>
+ </a><?php
} ?>
</td>
- </tr><?php
- }
-
- ?>
+ </tr><?php
+ } ?>
</table>
<br/>
<div align="center">
- <input class="button" type="button" value="<?php echo _VALIDATE;
- ?>" onclick="window.location.href = '<?php echo $_SESSION['config']['businessappurl']
- . 'index.php?module=basket&page=setSessionBasketOrder&mode=save';?>';"/>
+ <input class="button" type="button" value="<?php echo _VALIDATE; ?>" onclick="window.location.href = '<?php echo $_SESSION['config']['businessappurl']
+ .'index.php?module=basket&page=setSessionBasketOrder&mode=save'; ?>';"/>
- <input class="button" type="button" value="<?php echo _CANCEL;
- ?>" onclick="window.location.href = '<?php echo $_SESSION['config']['businessappurl']
- . 'index.php?module=basket&page=basket';?>';"/>
+ <input class="button" type="button" value="<?php echo _CANCEL; ?>" onclick="window.location.href = '<?php echo $_SESSION['config']['businessappurl']
+ .'index.php?module=basket&page=basket'; ?>';"/>
</div>
</div>
- <?php
-
- }
-}
+ <?php
+ }
+}
diff --git a/modules/basket/css/module.css b/modules/basket/css/module.css
index be4d8f60d14db78d8d77d3a2d964fe1577e49af3..b973b999d1ac93cb92dbe3c8cb9cd62539ff86ef 100755
--- a/modules/basket/css/module.css
+++ b/modules/basket/css/module.css
@@ -1 +1,182 @@
-/* Baskets module */
/* menu */
#menunav li#view_baskets span span {
background-image: url(static.php?module=basket&filename=manage_baskets_off.gif);
text-align:left;
}
#menunav li#view_baskets.on span span {
background-image: url(static.php?module=basket&filename=manage_baskets_on.gif);
text-align:left;
}
/* admin modules board */
#bask_admin_baskets {
background: url(static.php?module=basket&filename=manage_baskets.gif) no-repeat 2px top;
}
#bask_admin_entities {
background: url(static.php?module=basket&filename=manage_entities.gif) no-repeat 2px top;
}
/* show baskets or no in the nav bar */
#nav #baskets {
text-align: right;
float: right;
color: White;
font-weight: bold;
padding: 3px 20px 6px 25px;
height:20px;
}
#nav #no_baskets {
text-align: right;
float: right;
padding: 3px 20px 6px 25px;
height:20px;
color: #FFFFFF;
}
/* basket on the welcome page */
#welcome_desc #basket
{
margin-left: 150px;
}
/*
#baskets_list
{
width: 300px;
height: 45px;
padding-top: 10px;
padding-bottom: 10px;
float:right;
margin-top: 20px;
}
*/
/* box on admin */
#add_box_diff_list .tit {
color: #FFC200;
}
#add_box_diff_list {
/*border: 1px solid #999;*/
background-color: White;
float: right;
width: 465px;
/* margin: 0 10px 0 0;
padding: 20px 25px;*/
}
#add_box_diff_list .frameform2 {
height: 360px;
}
.title
{
text-align:center;
font-size:16px;
font-weight:bold;
}
.listingbasket {
margin: 10px 12px 0 12px;
width: 95%;
}
.listingbasket th {
color: #16ADEB;
}
.listingbasket th .add {
font-weight: normal;
}
.listingbasket th, .listingbasket td {
text-align: left;
padding: 5px 10px 6px 20px;
vertical-align: middle;
}
.listingbasket td {
background-color: #93D1E4;
}
.listingbasket .col td {
background-color: #DEEDF3;
}
.listingbasket .price {
text-align: right;
padding-right: 0;
padding-bottom: 0;
}
.listingbasket tfoot .price {
background-color: transparent;
}
.listingbasket a:hover
{
color: #666665;
}
.listingbasket td input[type="radio"]{
background-color: #93D1E4;
}
.listingbasket .col td input[type="radio"]{
background-color: #DEEDF3;
}
.listingbasket td input
{
width: 200px;
}
/*Automplete*/
div.autocomplete {
position: absolute;
width: 500px;
background-color: white;
border: 1px solid #888;
margin: 0px;
padding: 0px;
}
div.autocomplete ul {
list-style-type: none;
margin: 0px;
padding: 0px;
max-height: 20em;
overflow: auto;
}
div.autocomplete ul li.selected {
background-color: #ffb;
}
div.autocomplete ul li {
/*background-color: #DEEDF3;*/
list-style-type:none;
display: block;
margin: 0;
padding: 2px;
cursor: pointer;
text-align: left;
}
div.autocomplete ul li span.informal {
color: grey;
}
.basket_elem
{
margin-left:10px;
}
#manage_groupbasket li
{
text-align: left;
}
\ No newline at end of file
+#F2F2F2
+/* menu */
+
+#menunav li#view_baskets span span {
+ background-image: url(static.php?module=basket&filename=manage_baskets_off.gif);
+ text-align:left;
+}
+#menunav li#view_baskets.on span span {
+ background-image: url(static.php?module=basket&filename=manage_baskets_on.gif);
+ text-align:left;
+}
+
+/* admin modules board */
+#bask_admin_baskets {
+ background: url(static.php?module=basket&filename=manage_baskets.gif) no-repeat 2px top;
+}
+
+#bask_admin_entities {
+ background: url(static.php?module=basket&filename=manage_entities.gif) no-repeat 2px top;
+}
+
+
+/* show baskets or no in the nav bar */
+#nav #baskets {
+ text-align: right;
+ float: right;
+ color: White;
+ font-weight: bold;
+ padding: 3px 20px 6px 25px;
+ height:20px;
+}
+
+#nav #no_baskets {
+ text-align: right;
+ float: right;
+ padding: 3px 20px 6px 25px;
+ height:20px;
+ color: #FFFFFF;
+}
+
+/* basket on the welcome page */
+
+#welcome_desc #basket
+{
+ margin-left: 150px;
+}
+/*
+#baskets_list
+{
+ width: 300px;
+ height: 45px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ float:right;
+ margin-top: 20px;
+}
+*/
+
+/* box on admin */
+
+#add_box_diff_list .tit {
+ color: #F99830;
+}
+
+#add_box_diff_list {
+ /*border: 1px solid #999;*/
+ background-color: White;
+ float: right;
+ width: 465px;
+/* margin: 0 10px 0 0;
+ padding: 20px 25px;*/
+}
+
+
+
+#add_box_diff_list .frameform2 {
+ height: 360px;
+}
+
+.title
+{
+text-align:center;
+font-size:16px;
+font-weight:bold;
+}
+
+.listingbasket {
+ margin: 10px 12px 0 12px;
+ width: 95%;
+}
+
+.listingbasket th {
+ color: #135F7F;
+}
+
+.listingbasket th .add {
+ font-weight: normal;
+}
+
+
+.listingbasket th, .listingbasket td {
+ text-align: left;
+ padding: 5px 10px 6px 20px;
+ vertical-align: middle;
+}
+.listingbasket td {
+ background-color: #93D1E4;
+}
+.listingbasket .col td {
+ background-color: #DEEDF3;
+}
+
+.listingbasket .price {
+ text-align: right;
+ padding-right: 0;
+ padding-bottom: 0;
+
+}
+
+.listingbasket tfoot .price {
+ background-color: transparent;
+}
+.listingbasket a:hover
+{
+ color: #666665;
+}
+.listingbasket td input[type="radio"]{
+ background-color: #93D1E4;
+}
+.listingbasket .col td input[type="radio"]{
+ background-color: #DEEDF3;
+}
+.listingbasket td input
+{
+ width: 200px;
+}
+
+/*Automplete*/
+div.autocomplete {
+ position: absolute;
+ width: 500px;
+ background-color: white;
+ border: 1px solid #888;
+ margin: 0px;
+ padding: 0px;
+}
+
+div.autocomplete ul {
+ list-style-type: none;
+ margin: 0px;
+ padding: 0px;
+ max-height: 20em;
+ overflow: auto;
+}
+
+div.autocomplete ul li.selected {
+ background-color: #ffb;
+}
+
+div.autocomplete ul li {
+ /*background-color: #DEEDF3;*/
+ list-style-type:none;
+ display: block;
+ margin: 0;
+ padding: 2px;
+ cursor: pointer;
+ text-align: left;
+}
+
+div.autocomplete ul li span.informal {
+ color: grey;
+}
+
+.basket_elem
+{
+ margin-left:10px;
+}
+
+#manage_groupbasket li
+{
+ text-align: left;
+}
diff --git a/modules/basket/groupbasket_popup.php b/modules/basket/groupbasket_popup.php
index ce6454b4d50e8a0eb71ee5e35e24656e605c5691..1b7c5639849979af44eab4e0833772dc3e7ba897 100755
--- a/modules/basket/groupbasket_popup.php
+++ b/modules/basket/groupbasket_popup.php
@@ -20,50 +20,46 @@
*/
/**
-* @brief Popup : manages basket rights and actions in a group
-*
-* @file
-* @author Claire Figueras <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup basket
-*/
-
+ * @brief Popup : manages basket rights and actions in a group
+ *
+ * @file
+ *
+ * @author Claire Figueras <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup basket
+ */
$core_tools = new core_tools();
$core_tools->load_lang();
$db = new Database();
-$group ="";
+$group = '';
$tab1 = array();
$tab2 = array();
-require_once('modules/basket/class/class_admin_basket.php');
+require_once 'modules/basket/class/class_admin_basket.php';
$adminBasket = new admin_basket();
$_SESSION['service_tag'] = 'group_basket';
-if(isset($_GET['id']) && !empty($_GET['id']))
-{
+if (isset($_GET['id']) && !empty($_GET['id'])) {
$group = trim($_GET['id']);
- $stmt = $db->query("select group_desc from ".$_SESSION['tablename']['usergroups']." where group_id = ?",array($group));
+ $stmt = $db->query('select group_desc from '.$_SESSION['tablename']['usergroups'].' where group_id = ?', array($group));
$res = $stmt->fetchObject();
- array_push($tab2, array('ID' =>$group, 'LABEL' => functions::show_string($res->group_desc)));
+ array_push($tab2, array('ID' => $group, 'LABEL' => functions::show_string($res->group_desc)));
}
$_SESSION['m_admin']['basket']['ind_group'] = 0;
$found = false;
-for($i=0; $i < count($_SESSION['m_admin']['basket']['groups']); $i++)
-{
- if(trim($group) == trim($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID']))
- {
+for ($i = 0; $i < count($_SESSION['m_admin']['basket']['groups']); ++$i) {
+ if (trim($group) == trim($_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID'])) {
$_SESSION['m_admin']['basket']['ind_group'] = $i;
$found = true;
}
array_push($tab1, $_SESSION['m_admin']['basket']['groups'][$i]['GROUP_ID']);
}
-for($i=0;$i<count($_SESSION['groups']);$i++)
-{
- if(!in_array($_SESSION['groups'][$i], $tab1))
- {
- $stmt = $db->query("select group_desc from ".$_SESSION['tablename']['usergroups']." where group_id = ?",array($_SESSION['groups'][$i]));
+for ($i = 0; $i < count($_SESSION['groups']); ++$i) {
+ if (!in_array($_SESSION['groups'][$i], $tab1)) {
+ $stmt = $db->query('select group_desc from '.$_SESSION['tablename']['usergroups'].' where group_id = ?', array($_SESSION['groups'][$i]));
$res = $stmt->fetchObject();
- array_push($tab2, array('ID' =>$_SESSION['groups'][$i], 'LABEL' => functions::show_string($res->group_desc)));
+ array_push($tab2, array('ID' => $_SESSION['groups'][$i], 'LABEL' => functions::show_string($res->group_desc)));
}
}
$core_tools->load_html();
@@ -72,66 +68,62 @@ $time = $core_tools->get_session_time_expire();
//$core_tools->show_array( $_SESSION['m_admin']['basket']['groups']);
//$core_tools->show_array( $_SESSION['m_admin']['basket']['all_actions']);
?>
-<body onload="setTimeout(window.close, <?php echo $time;?>*60*1000);">
+<body onload="setTimeout(window.close, <?php echo $time; ?>*60*1000);">
- <div class="error"><?php functions::xecho($_SESSION['error']); $_SESSION['error'] = '';?></div>
+ <div class="error"><?php functions::xecho($_SESSION['error']); $_SESSION['error'] = ''; ?></div>
<div class="block">
<h2><?php echo _ADD_TO_BASKET;
- if(!empty($_SESSION['m_admin']['basket']['basketId']))
- {
+ if (!empty($_SESSION['m_admin']['basket']['basketId'])) {
echo ' "'.functions::xssafe($_SESSION['m_admin']['basket']['name']).'" ';
+ } else {
+ echo ' ';
}
- else
- {
- echo " ";
- }
- echo _TO_THE_GROUP ;?></h2>
+ echo _TO_THE_GROUP; ?></h2>
<br/>
<div style="margin-left: 15px;" >
- <form name="group_basket" id="group_basket" action="<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&module=basket&page=manage_group_basket" method="post" class="forms">
+ <form name="group_basket" id="group_basket" action="<?php echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&module=basket&page=manage_group_basket" method="post" class="forms">
<input type="hidden" name="display" value="true" />
<input type="hidden" name="module" value="basket" />
<input type="hidden" name="page" value="manage_group_basket" />
<p>
- <label><?php echo _CHOOSE_GROUP;?> : </label>
+ <label><?php echo _CHOOSE_GROUP; ?> : </label>
<select name="group" id="group">
- <option value=""><?php echo _CHOOSE;?></option>
+ <option value=""><?php echo _CHOOSE; ?></option>
<?php
- for($i=0; $i < count($tab2); $i++)
- {
- ?>
- <option value="<?php functions::xecho($tab2[$i]['ID']);?>" <?php if($tab2[$i]['ID'] == $group || (isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['GROUP_ID'] ) && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['GROUP_ID'] == $tab2[$i]['ID']) || (isset($_SESSION['m_admin']['basket_popup']['group_id']) && $_SESSION['m_admin']['basket_popup']['group_id'] == $tab2[$i]['ID'])) { echo "selected=\"selected\""; } ?> ><?php functions::xecho($tab2[$i]['LABEL']);?></option>
- <?php }?>
+ for ($i = 0; $i < count($tab2); ++$i) {
+ ?>
+ <option value="<?php functions::xecho($tab2[$i]['ID']); ?>" <?php if ($tab2[$i]['ID'] == $group || (isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['GROUP_ID']) && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['GROUP_ID'] == $tab2[$i]['ID']) || (isset($_SESSION['m_admin']['basket_popup']['group_id']) && $_SESSION['m_admin']['basket_popup']['group_id'] == $tab2[$i]['ID'])) {
+ echo 'selected="selected"';
+ } ?> ><?php functions::xecho($tab2[$i]['LABEL']); ?></option>
+ <?php
+ }?>
</select>
- <?php if($group <> "")
- {
- ?>
- <input type="hidden" name="old_group" id="old_group" value="<?php functions::xecho($group);?>" />
+ <?php if ($group != '') {
+ ?>
+ <input type="hidden" name="old_group" id="old_group" value="<?php functions::xecho($group); ?>" />
<?php
- }?>
+ }?>
</p>
<p> </p>
<p>
- <label><?php echo _BASKET_RESULT_PAGE;?> :</label>
+ <label><?php echo _BASKET_RESULT_PAGE; ?> :</label>
<select name="result_page" id="result_page">
<?php
if (isset($_SESSION['basket_page']) && count($_SESSION['basket_page']) > 0) {
- for ($i=0;$i<count($_SESSION['basket_page']);$i++) {
+ for ($i = 0; $i < count($_SESSION['basket_page']); ++$i) {
if ($adminBasket->isABasketPageOfMyBasketCollection($_SESSION['basket_page'][$i]['ID'], $_SESSION['m_admin']['basket']['coll_id'])) {
?>
- <option value="<?php functions::xecho(
- $_SESSION['basket_page'][$i]['ID']);?>" <?php
- if ((isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['RESULT_PAGE'])
- && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['RESULT_PAGE'] == $_SESSION['basket_page'][$i]['ID'])
- || ( isset($_SESSION['m_admin']['basket_popup']['res_page'])
- && $_SESSION['m_admin']['basket_popup']['res_page'] == $_SESSION['basket_page'][$i]['ID'])) {
- echo "selected=\"selected\"";
- } elseif ($i==0){
- echo "selected=\"selected\"";
- }
- ?>><?php
- functions::xecho($_SESSION['basket_page'][$i]['LABEL']);
- ?></option>
+ <option value="<?php functions::xecho(
+ $_SESSION['basket_page'][$i]['ID']); ?>" <?php
+ if ((isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['RESULT_PAGE'])
+ && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['RESULT_PAGE'] == $_SESSION['basket_page'][$i]['ID'])
+ || (isset($_SESSION['m_admin']['basket_popup']['res_page'])
+ && $_SESSION['m_admin']['basket_popup']['res_page'] == $_SESSION['basket_page'][$i]['ID'])) {
+ echo 'selected="selected"';
+ } elseif ($i == 0) {
+ echo 'selected="selected"';
+ } ?>><?php
+ functions::xecho($_SESSION['basket_page'][$i]['LABEL']); ?></option>
<?php
}
}
@@ -139,50 +131,51 @@ $time = $core_tools->get_session_time_expire();
?>
</select>
<input type="checkbox" id="lock_list" name="lock_list" value="Y" onclick="new Effect.toggle('lock_rules_div', 'blind', {delay:0.2});"
- <?php if(strlen(trim($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_LIST'])) >0
- || strlen(trim($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_SUBLIST'])) >0) {
- echo 'checked="checked"';}?>>
+ <?php if (strlen(trim($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_LIST'])) > 0
+ || strlen(trim($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_SUBLIST'])) > 0) {
+ echo 'checked="checked"';
+ }?>>
<span onclick="new Effect.toggle('lock_rules_div', 'blind', {delay:0.2});"
- style="cursor:pointer; color:#1B91BA; text-decoration:underline;"><?php echo _LOCK_LIST;?></span>
+ style="cursor:pointer; color:#135F7F; text-decoration:underline;"><?php echo _LOCK_LIST; ?></span>
</p>
<div id="lock_rules_div" style="display:none;">
<table border="0" width="60%" align="center">
<tr>
- <td><?php echo _PRINCIPAL_LIST;?> :<br/>
- <textarea name="list_whrere_clause" id="list_whrere_clause" rows="4"><?php functions::xecho($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_LIST']);?></textarea>
+ <td><?php echo _PRINCIPAL_LIST; ?> :<br/>
+ <textarea name="list_whrere_clause" id="list_whrere_clause" rows="4"><?php functions::xecho($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_LIST']); ?></textarea>
</td>
<td rowspan="2">
<div class="block small_text" >
<h3><i class ="fa fa-info" ></i>
- <?php echo _HELP_LIST_KEYWORDS;?></h3>
+ <?php echo _HELP_LIST_KEYWORDS; ?></h3>
<p align="justify">
- <?php echo _HELP_LIST_KEYWORD_EXEMPLE_TITLE;?><br/>
- <em><?php echo _HELP_LIST_KEYWORD1;?></em><br/>
- <em><?php echo _HELP_LIST_KEYWORD2;?></em><br/>
- <div style="border:1px black solid; padding:3px;"><b><?php echo _HELP_LIST_KEYWORD_EXEMPLE;?></b></div>
+ <?php echo _HELP_LIST_KEYWORD_EXEMPLE_TITLE; ?><br/>
+ <em><?php echo _HELP_LIST_KEYWORD1; ?></em><br/>
+ <em><?php echo _HELP_LIST_KEYWORD2; ?></em><br/>
+ <div style="border:1px black solid; padding:3px;"><b><?php echo _HELP_LIST_KEYWORD_EXEMPLE; ?></b></div>
</p>
</div>
<div class='block_end'> </div>
</td>
</tr>
- <tr><td valign="top"><?php echo _SUBLIST;?> :<br/>
- <textarea name="sublist_whrere_clause" id="sublist_whrere_clause" rows="4"><?php functions::xecho($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_SUBLIST']);?></textarea>
+ <tr><td valign="top"><?php echo _SUBLIST; ?> :<br/>
+ <textarea name="sublist_whrere_clause" id="sublist_whrere_clause" rows="4"><?php functions::xecho($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['LOCK_SUBLIST']); ?></textarea>
</td></tr>
</table>
</div>
<p> </p>
<p>
- <label><?php echo _DEFAULT_ACTION_LIST;?> :</label>
+ <label><?php echo _DEFAULT_ACTION_LIST; ?> :</label>
<?php
//print_r($_SESSION['m_admin']['basket']['all_actions']);
foreach ($_SESSION['m_admin']['basket']['all_actions'] as $key => $value) {
- $array_actions['ID']=$value['ID'];
- $array_actions['LABEL']=$value['LABEL'];
- $action_tri[$value['ORIGIN']][]=$array_actions;
+ $array_actions['ID'] = $value['ID'];
+ $array_actions['LABEL'] = $value['LABEL'];
+ $action_tri[$value['ORIGIN']][] = $array_actions;
}
?>
- <select name="default_action_page" id="default_action_page" onchange="manage_actions(this.options[this.selectedIndex].value, true, '<?php echo $_SESSION['config']['businessappurl']."index.php?display=true&module=basket&page=check_action";?>');">
- <option value=""><?php echo _NO_ACTION_DEFINED;?></option>
+ <select name="default_action_page" id="default_action_page" onchange="manage_actions(this.options[this.selectedIndex].value, true, '<?php echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=basket&page=check_action'; ?>');">
+ <option value=""><?php echo _NO_ACTION_DEFINED; ?></option>
<?php
/*for($i=0; $i < count($_SESSION['m_admin']['basket']['all_actions']); $i++)
{
@@ -192,30 +185,27 @@ $time = $core_tools->get_session_time_expire();
} */?>
<?php
foreach ($action_tri as $module_name => $actions_ids) {
- if($module_name == ''){
+ if ($module_name == '') {
echo '<optgroup label="Apps">';
foreach ($actions_ids as $key => $action_id) {
?><option value="<?php
- functions::xecho($action_id['ID']);?>" <?php
- if ((isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION']) && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'] == $action_id['ID']) || (isset($_SESSION['m_admin']['basket_popup']['default_action_page']) && $_SESSION['m_admin']['basket_popup']['default_action_page'] == $action_id['ID'])){
+ functions::xecho($action_id['ID']); ?>" <?php
+ if ((isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION']) && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'] == $action_id['ID']) || (isset($_SESSION['m_admin']['basket_popup']['default_action_page']) && $_SESSION['m_admin']['basket_popup']['default_action_page'] == $action_id['ID'])) {
echo 'selected="selected"';
} ?> ><?php
- functions::xecho($action_id['LABEL']);
- ?></option><?php
+ functions::xecho($action_id['LABEL']); ?></option><?php
}
echo '</optgroup>';
- }else{
+ } else {
echo '<optgroup label="'.ucfirst($module_name).'">';
foreach ($actions_ids as $key => $action_id) {
?><option value="<?php
- functions::xecho($action_id['ID']);?>" <?php
- if ((isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION']) && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'] == $action_id['ID']) || (isset($_SESSION['m_admin']['basket_popup']['default_action_page']) && $_SESSION['m_admin']['basket_popup']['default_action_page'] == $action_id['ID'])){
-
+ functions::xecho($action_id['ID']); ?>" <?php
+ if ((isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION']) && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'] == $action_id['ID']) || (isset($_SESSION['m_admin']['basket_popup']['default_action_page']) && $_SESSION['m_admin']['basket_popup']['default_action_page'] == $action_id['ID'])) {
echo 'selected="selected"';
- }?> ><?php
- functions::xecho($action_id['LABEL']);
- ?></option><?php
+ } ?> ><?php
+ functions::xecho($action_id['LABEL']); ?></option><?php
}
echo '</optgroup>';
}
@@ -226,20 +216,22 @@ $time = $core_tools->get_session_time_expire();
<p> </p>
<div id="allowed_basket_actions" style="float:left; border:1px; width:300px; margin:0 10px 0 13px; display:inline;">
<div align="center">
- <h3 class="sstit"><?php echo _ASSOCIATED_ACTIONS;?> :</h3>
+ <h3 class="sstit"><?php echo _ASSOCIATED_ACTIONS; ?> :</h3>
</div> <?php
- if(count($_SESSION['m_admin']['basket']['all_actions']) > 0)
- {
- $bask = new admin_basket();
- ?>
+ if (count($_SESSION['m_admin']['basket']['all_actions']) > 0) {
+ $bask = new admin_basket(); ?>
<table>
<?php
- echo "<ul>";
- foreach ($action_tri as $module_name => $actions_ids) {
- echo '<li style="margin-top:5px;"><i style="font-weight:bold;font-style: italic;">'.ucfirst($module_name).'</i><ul>';
- foreach ($actions_ids as $key => $action_id) {
- ?>
- <li><input type="checkbox" name="actions[]" value="<?php functions::xecho($action_id['ID']);?>" class="check group_action" id="checkbox_<?php functions::xecho($action_id['ID']); ?>" onclick="$j('#action_<?php functions::xecho($action_id['ID']); ?>_page_use').click();show_config_action(<?php functions::xecho($action_id['ID']);?>, true, <?php if(!empty($action_id['ID'])){ echo 'true';}else{ echo 'false';}?>);" <?php
+ echo '<ul>';
+ foreach ($action_tri as $module_name => $actions_ids) {
+ echo '<li style="margin-top:5px;"><i style="font-weight:bold;font-style: italic;">'.ucfirst($module_name).'</i><ul>';
+ foreach ($actions_ids as $key => $action_id) {
+ ?>
+ <li><input type="checkbox" name="actions[]" value="<?php functions::xecho($action_id['ID']); ?>" class="check group_action" id="checkbox_<?php functions::xecho($action_id['ID']); ?>" onclick="$j('#action_<?php functions::xecho($action_id['ID']); ?>_page_use').click();show_config_action(<?php functions::xecho($action_id['ID']); ?>, true, <?php if (!empty($action_id['ID'])) {
+ echo 'true';
+ } else {
+ echo 'false';
+ } ?>);" <?php
if (isset($action_id['ID'])
&& $bask->is_action_defined_for_the_group(
$action_id['ID'],
@@ -258,75 +250,87 @@ $time = $core_tools->get_session_time_expire();
) && $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'] == $action_id['ID']
) {
echo 'disabled="disabled"';
- }?> />
- <span id="label_<?php functions::xecho($action_id['ID']);?>"><?php functions::xecho($action_id['LABEL']); $tr++; ?></span>
- <a href="javascript://" class="fa fa-cogs" title="<?php echo _CONFIG_ACTION;?>" onclick="show_config_action(<?php functions::xecho($action_id['ID']);?>, true, <?php if(!empty($action_id['ID'])){ echo 'true';}else{ echo 'false';}?>);" class="config" id="link_<?php functions::xecho($action_id['ID']);?>" style="display:inline;"></a>
+ } ?> />
+ <span id="label_<?php functions::xecho($action_id['ID']); ?>"><?php functions::xecho($action_id['LABEL']);
+ ++$tr; ?></span>
+ <a href="javascript://" class="fa fa-cogs" title="<?php echo _CONFIG_ACTION; ?>" onclick="show_config_action(<?php functions::xecho($action_id['ID']); ?>, true, <?php if (!empty($action_id['ID'])) {
+ echo 'true';
+ } else {
+ echo 'false';
+ } ?>);" class="config" id="link_<?php functions::xecho($action_id['ID']); ?>" style="display:inline;"></a>
</li>
<?php
- }
- echo '</ul></li>';
-
}
- ?>
+ echo '</ul></li>';
+ } ?>
</table><?php
- } else {?>
- <div align="center"> <i><?php echo _NO_ACTIONS_DEFINED;?></i></div><?php
+ } else {
+ ?>
+ <div align="center"> <i><?php echo _NO_ACTIONS_DEFINED; ?></i></div><?php
} ?>
</div>
<div id="config_actions" style="width:600px; display:inline; margin-left:auto; margin-right:auto; height:800px; border: 1px;float:left;"><?php
- for($_SESSION['m_admin']['compteur']=0; $_SESSION['m_admin']['compteur'] < count($_SESSION['m_admin']['basket']['all_actions']); $_SESSION['m_admin']['compteur']++)
- {
+ for ($_SESSION['m_admin']['compteur'] = 0; $_SESSION['m_admin']['compteur'] < count($_SESSION['m_admin']['basket']['all_actions']); ++$_SESSION['m_admin']['compteur']) {
$_SESSION['m_admin']['show_where_clause'] = true;
- if($found)
- {
+ if ($found) {
$tmp_mass = 'Y';
$tmp_use = 'Y';
- }
-
- ?><div id="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']);?>" style="display:none; margin-left:10px;">
- <h3 class="tit"><?php echo _CONFIG_ACTION.' <u>'.functions::xssafe($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['LABEL']).'</u>';?> </h3>
- <div id="<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']);?>_actions_uses" style="display:block;">
+ } ?><div id="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']); ?>" style="display:none; margin-left:10px;">
+ <h3 class="tit"><?php echo _CONFIG_ACTION.' <u>'.functions::xssafe($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['LABEL']).'</u>'; ?> </h3>
+ <div id="<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']); ?>_actions_uses" style="display:block;">
<table>
<tr>
- <td><?php echo _USE_IN_MASS;?></td>
+ <td><?php echo _USE_IN_MASS; ?></td>
- <td><input type="checkbox" class="check" name="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']);?>_mass_use" value="Y"
- <?php if($bask->get_infos_groupbasket_session($_SESSION['m_admin']['basket']['ind_group'],$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID'], 'MASS_USE' ) == 'Y' || (isset($_SESSION['m_admin']['basket_popup']) && $_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['MASS_USE'] == 'Y')){ echo 'checked="checked"';}?> /></td>
+ <td><input type="checkbox" class="check" name="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']); ?>_mass_use" value="Y"
+ <?php if ($bask->get_infos_groupbasket_session($_SESSION['m_admin']['basket']['ind_group'], $_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID'], 'MASS_USE') == 'Y' || (isset($_SESSION['m_admin']['basket_popup']) && $_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['MASS_USE'] == 'Y')) {
+ echo 'checked="checked"';
+ } ?> /></td>
<td width="20%"> </td>
- <td><?php echo _USE_ONE;?></td>
+ <td><?php echo _USE_ONE; ?></td>
- <td><input type="checkbox" class="check" name="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']);?>_page_use" id="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']);?>_page_use" value="Y" <?php if($bask->get_infos_groupbasket_session($_SESSION['m_admin']['basket']['ind_group'], $_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID'], 'PAGE_USE' ) == 'Y' || (isset($_SESSION['m_admin']['basket_popup']['actions']) && $_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['PAGE_USE'] == 'Y')){ echo 'checked="checked"';}?> /></td>
+ <td><input type="checkbox" class="check" name="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']); ?>_page_use" id="action_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']); ?>_page_use" value="Y" <?php if ($bask->get_infos_groupbasket_session($_SESSION['m_admin']['basket']['ind_group'], $_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID'], 'PAGE_USE') == 'Y' || (isset($_SESSION['m_admin']['basket_popup']['actions']) && $_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['PAGE_USE'] == 'Y')) {
+ echo 'checked="checked"';
+ } ?> /></td>
</tr>
</table>
</div>
<?php
$keyword = $_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['KEYWORD'];
- echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'groupbasket_popup.php', "include");
- echo $core_tools->execute_app_services($_SESSION['app_services'], 'groupbasket_popup.php', "include");
-
- /*if($_SESSION['m_admin']['show_where_clause'] )
- {*/
- if(isset( $_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['WHERE']))
- {
- $tmp_where = $_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['WHERE'];
- }
- ?>
- <p><?php echo _WHERE_CLAUSE_ACTION_TEXT;?></p>
+ echo $core_tools->execute_modules_services($_SESSION['modules_services'], 'groupbasket_popup.php', 'include');
+ echo $core_tools->execute_app_services($_SESSION['app_services'], 'groupbasket_popup.php', 'include');
+
+ /*if($_SESSION['m_admin']['show_where_clause'] )
+ {*/
+ if (isset($_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['WHERE'])) {
+ $tmp_where = $_SESSION['m_admin']['basket_popup']['actions'][$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']]['WHERE'];
+ } ?>
+ <p><?php echo _WHERE_CLAUSE_ACTION_TEXT; ?></p>
<br/>
- <textarea name="whereclause_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']);?>" rows="10" style="width:500px;"><?php if(empty($tmp_where)){echo $bask->get_infos_groupbasket_session($_SESSION['m_admin']['basket']['ind_group'],$_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID'], 'WHERE' );}else{ echo $tmp_where;} ?></textarea>
+ <textarea name="whereclause_<?php functions::xecho($_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID']); ?>" rows="10" style="width:500px;"><?php if (empty($tmp_where)) {
+ echo $bask->get_infos_groupbasket_session($_SESSION['m_admin']['basket']['ind_group'], $_SESSION['m_admin']['basket']['all_actions'][$_SESSION['m_admin']['compteur']]['ID'], 'WHERE');
+ } else {
+ echo $tmp_where;
+ } ?></textarea>
<?php
/*}*/ ?></div><?php
}
?> </div>
<script type="text/javascript">
- manage_actions('<?php if(isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'])){ echo $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'];}?>', true, '<?php echo $_SESSION['config']['businessappurl']."index.php?display=true&module=basket&page=check_action";?>');
+ manage_actions('<?php if (isset($_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'])) {
+ echo $_SESSION['m_admin']['basket']['groups'][$_SESSION['m_admin']['basket']['ind_group']]['DEFAULT_ACTION'];
+ }?>', true, '<?php echo $_SESSION['config']['businessappurl'].'index.php?display=true&module=basket&page=check_action';?>');
</script>
<p> </p>
<p class="buttons" style="text-align:center;">
- <input type="button" name="submit_form" class="button" value="<?php if(empty($group)){ echo _ADD_THIS_GROUP;}else{ echo _MODIFY_THIS_GROUP;}?>" onclick="valid_actions_param('group_basket');this.form.submit();" />
+ <input type="button" name="submit_form" class="button" value="<?php if (empty($group)) {
+ echo _ADD_THIS_GROUP;
+ } else {
+ echo _MODIFY_THIS_GROUP;
+ }?>" onclick="valid_actions_param('group_basket');this.form.submit();" />
<input type="submit" name="cancel" value="<?php echo _CANCEL;?>" class="button"/>
</p>
</form>
diff --git a/modules/cases/css/module.css b/modules/cases/css/module.css
index 57de5f78c3c712ba7d1a11e03a3b664e5154e44e..d4daa22a7f7d9fb9bfc0e29488dc21a96cb9ffd5 100755
--- a/modules/cases/css/module.css
+++ b/modules/cases/css/module.css
@@ -2,7 +2,7 @@
/* menu */
.whole-panel {
- background: #009DC5;
+ background: #135F7F;
border: 1px solid #000;
height: 650px;
min-width: 995px;
@@ -12,7 +12,7 @@
}
.detailsCasesButton {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -45,7 +45,7 @@
}
.tab-trig {
- background: #deedf3;
+ background: #F2F2F2;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
@@ -67,7 +67,7 @@
}
.frame-trig {
- background: #009DC5;
+ background: #135F7F;
border: 1px solid #000;
display: inline-block;
height: 650px;
diff --git a/modules/cases/detail_index_cases.php b/modules/cases/detail_index_cases.php
index 59d41a32e789cc294de6183f64cf63ead0b150de..784170cebe6701cc03003d2ee5d715795ee4e64c 100755
--- a/modules/cases/detail_index_cases.php
+++ b/modules/cases/detail_index_cases.php
@@ -1,65 +1,58 @@
-<?php
-/**
-* File : details_cases.php
-*
-* Detailed informations on an selected cases
-*
-* @package Maarch Entreprise 1.0
-* @version 1.0
-* @since 10/2005
-* @license GPL
-* @author Loïc Vinet <dev@maarch.org>
-*/
-
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_request.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_security.php");
-require_once('apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_list_show.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_history.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php");
-require_once("modules".DIRECTORY_SEPARATOR."cases".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR.'class_modules_tools.php');
-
-$core_tools = new core_tools();
-$core_tools->test_user();
-$core_tools->load_lang();
-$core_tools->load_html();
-$core_tools->load_header('', true, false);
-$sec = new security();
-$cases = new cases();
-$status_obj = new manage_status();
-
-if(isset($_POST['update']) && $_POST['update'] == true)
-{
- $update_id = $_POST['id'];
- $update_field = array();
- $update_field['case_label'] = $_POST['case_label'];
- $update_field['case_description'] = $_POST['case_description'];
- $update_field['case_description'] = str_replace("\n"," ",$update_field['case_description']);
- $update_field['case_description'] = str_replace("\r","",$update_field['case_description']);
-
- $cases->update_case($update_id, $update_field);
-}
-
-
-//Before display this page, we need to control if this case can be viewed for the user.
-//A case can be viewed only if one ressouce is allowed for this user
-
-$docs_library = $cases->get_res_id($_SESSION['cases']['actual_case_id']);
-$case_id = $_SESSION['cases']['actual_case_id'];
-$case_indexes = $cases->get_case_info($case_id);
-$ressources_status = $cases->get_ressources_status($case_id);
-$ressources_header = array();
-
-
-if(count($docs_library) ==0)
-{
- echo _CANT_SHOW_THIS_CASE;
- exit();
-}
-else
-{
-
-}
-
+<?php
+/**
+* File : details_cases.php.
+*
+* Detailed informations on an selected cases
+*
+* @version 1.0
+*
+* @since 10/2005
+*
+* @license GPL
+* @author Loïc Vinet <dev@maarch.org>
+*/
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_request.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_list_show.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_history.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'cases'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
+
+$core_tools = new core_tools();
+$core_tools->test_user();
+$core_tools->load_lang();
+$core_tools->load_html();
+$core_tools->load_header('', true, false);
+$sec = new security();
+$cases = new cases();
+$status_obj = new manage_status();
+
+if (isset($_POST['update']) && $_POST['update'] == true) {
+ $update_id = $_POST['id'];
+ $update_field = array();
+ $update_field['case_label'] = $_POST['case_label'];
+ $update_field['case_description'] = $_POST['case_description'];
+ $update_field['case_description'] = str_replace("\n", ' ', $update_field['case_description']);
+ $update_field['case_description'] = str_replace("\r", '', $update_field['case_description']);
+
+ $cases->update_case($update_id, $update_field);
+}
+
+//Before display this page, we need to control if this case can be viewed for the user.
+//A case can be viewed only if one ressouce is allowed for this user
+
+$docs_library = $cases->get_res_id($_SESSION['cases']['actual_case_id']);
+$case_id = $_SESSION['cases']['actual_case_id'];
+$case_indexes = $cases->get_case_info($case_id);
+$ressources_status = $cases->get_ressources_status($case_id);
+$ressources_header = array();
+
+if (count($docs_library) == 0) {
+ echo _CANT_SHOW_THIS_CASE;
+ exit();
+} else {
+}
+
?>
<body id="tabricator_frame">
<form method="post" name="update_case" id="update_case" action="#">
@@ -75,112 +68,114 @@ else
</tr>
<tr>
<td>
- <!--<h2 style="color:#1B99C4"><p align="center"><?php /*echo _NUM_CASE." ".functions::xssafe($case_id)*/;?></p></h2>-->
- <h2 style="color:#1B99C4"><p align="center"><?php functions::xecho(functions::show_string($case_indexes['case_label']));?></p></h2>
- <p style="color:#1B99C4" align="center"><?php functions::xecho(functions::show_string($case_indexes['case_description']));?> </p>
+ <!--<h2 style="color:#135F7F"><p align="center"><?php /*echo _NUM_CASE." ".functions::xssafe($case_id)*/?></p></h2>-->
+ <h2 style="color:#135F7F"><p align="center"><?php functions::xecho(functions::show_string($case_indexes['case_label'])); ?></p></h2>
+ <p style="color:#135F7F" align="center"><?php functions::xecho(functions::show_string($case_indexes['case_description'])); ?> </p>
</td>
</tr>
</table>
</td>
<td>
<div class="">
- <h2><?php echo _CASES_INDEXES;?> : </h2>
+ <h2><?php echo _CASES_INDEXES; ?> : </h2>
</div>
<table cellpadding="2" cellspacing="2" border="0" class="block forms details" width="100%">
<tr class="col">
<th align="left" class="picto">
- <i class="fa fa-briefcase fa-2x" title="<?php echo _CASE_ID;?>"></i>
+ <i class="fa fa-briefcase fa-2x" title="<?php echo _CASE_ID; ?>"></i>
</th>
<td align="left" width="200px">
- <?php echo _CASE_ID;?> :
+ <?php echo _CASE_ID; ?> :
</td>
<td>
- <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($case_indexes['case_id']);?>" size="40" />
+ <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($case_indexes['case_id']); ?>" size="40" />
</td>
</tr>
<tr class="col">
<th align="left" class="picto">
- <i class="fa fa-pencil fa-2x" title="<?php echo _CASE_LABEL;?>"></i>
+ <i class="fa fa-pencil fa-2x" title="<?php echo _CASE_LABEL; ?>"></i>
</th>
<td align="left" width="200px">
- <?php echo _CASE_LABEL;?> :
+ <?php echo _CASE_LABEL; ?> :
</td>
<td>
- <?php
- if ($core_tools->test_service('update_case', 'cases',false) == 0)
- echo '<input type="text" class="readonly" readonly="readonly" value="'.functions::xssafe(functions::show_string($case_indexes['case_label'])).'" size="40" />';
- else
- echo '<input type="text" name="case_label" id="case_label" class="" value="'.functions::xssafe(functions::show_string($case_indexes['case_label'])).'" size="40" />'; ?>
+ <?php
+ if ($core_tools->test_service('update_case', 'cases', false) == 0) {
+ echo '<input type="text" class="readonly" readonly="readonly" value="'.functions::xssafe(functions::show_string($case_indexes['case_label'])).'" size="40" />';
+ } else {
+ echo '<input type="text" name="case_label" id="case_label" class="" value="'.functions::xssafe(functions::show_string($case_indexes['case_label'])).'" size="40" />';
+ } ?>
</td>
</tr>
<tr class="col">
<th align="left" class="picto">
- <i class="fa fa-file fa-2x" title="<?php echo _CASE_DESCRIPTION;?>"></i>
+ <i class="fa fa-file fa-2x" title="<?php echo _CASE_DESCRIPTION; ?>"></i>
</th>
<td align="left" width="200px">
- <?php echo _CASE_DESCRIPTION;?> :
+ <?php echo _CASE_DESCRIPTION; ?> :
</td>
<td>
- <?php
- if ($core_tools->test_service('update_case', 'cases',false) == 0)
- echo '<input type="text" class="readonly" readonly="readonly" value="'.functions::xssafe(functions::show_string($case_indexes['case_description'])).'" size="40" />';
- else
- echo '<input type="text" name="case_description" id="case_description" class="" value="'.functions::xssafe(functions::show_string($case_indexes['case_description'])).'" size="40" maxlength="255"/>';
+ <?php
+ if ($core_tools->test_service('update_case', 'cases', false) == 0) {
+ echo '<input type="text" class="readonly" readonly="readonly" value="'.functions::xssafe(functions::show_string($case_indexes['case_description'])).'" size="40" />';
+ } else {
+ echo '<input type="text" name="case_description" id="case_description" class="" value="'.functions::xssafe(functions::show_string($case_indexes['case_description'])).'" size="40" maxlength="255"/>';
+ }
?>
</td>
</tr>
<tr class="col">
<th align="left" class="picto">
- <i class="fa fa-user fa-2x" title="<?php echo _CASE_TYPIST;?>"></i>
+ <i class="fa fa-user fa-2x" title="<?php echo _CASE_TYPIST; ?>"></i>
</th>
<td align="left" width="200px">
- <?php echo _CASE_TYPIST;?> :
+ <?php echo _CASE_TYPIST; ?> :
</td>
<td>
- <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($case_indexes['case_typist']);?>" size="40" />
+ <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho($case_indexes['case_typist']); ?>" size="40" />
</td>
</tr>
<tr class="col">
<th align="left" class="picto">
- <i class="fa fa-calendar-o fa-2x" title="<?php echo _CASE_CREATION_DATE;?>"></i>
+ <i class="fa fa-calendar-o fa-2x" title="<?php echo _CASE_CREATION_DATE; ?>"></i>
</th>
<td align="left" width="200px">
- <?php echo _CASE_CREATION_DATE;?> :
+ <?php echo _CASE_CREATION_DATE; ?> :
</td>
<td>
- <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho(functions::format_date_db($case_indexes['case_creation_date']));?>" size="40" />
+ <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho(functions::format_date_db($case_indexes['case_creation_date'])); ?>" size="40" />
</td>
</tr>
<tr class="col">
<th align="left" class="picto">
- <i class="fa fa-clock-o fa-2x" title="<?php echo _CASE_LAST_UPDATE_DATE;?>"></i>
+ <i class="fa fa-clock-o fa-2x" title="<?php echo _CASE_LAST_UPDATE_DATE; ?>"></i>
</th>
<td align="left" width="200px">
- <?php echo _CASE_LAST_UPDATE_DATE;?> :
+ <?php echo _CASE_LAST_UPDATE_DATE; ?> :
</td>
<td>
- <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho(functions::format_date_db($case_indexes['case_last_update_date']));?>" size="40" />
+ <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho(functions::format_date_db($case_indexes['case_last_update_date'])); ?>" size="40" />
</td>
</tr>
<tr class="col">
<th align="left" class="picto">
- <i class="fa fa-lock fa-2x" title="<?php echo _CASE_CLOSING_DATE;?>"></i>
+ <i class="fa fa-lock fa-2x" title="<?php echo _CASE_CLOSING_DATE; ?>"></i>
</th>
<td align="left" width="200px">
- <?php echo _CASE_CLOSING_DATE;?> :
+ <?php echo _CASE_CLOSING_DATE; ?> :
</td>
<td>
- <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho(functions::format_date_db($case_indexes['case_closing_date']));?>" size="40" />
+ <input type="text" class="readonly" readonly="readonly" value="<?php functions::xecho(functions::format_date_db($case_indexes['case_closing_date'])); ?>" size="40" />
</td>
</tr>
@@ -190,43 +185,42 @@ else
</table>
</table>
<br/>
- <h2><?php echo _RESSOURCES_REPORTS;?> : </h2>
+ <h2><?php echo _RESSOURCES_REPORTS; ?> : </h2>
<div class="block" style="height:120px">
<table border = "0">
<tr>
- <?php
- foreach($ressources_status as $r)
- {
- $temp = $status_obj->get_status_data($r['status']);
- echo '<td><i class="fm '.$temp['IMG_SRC'].' fm-2x"></i></td>';
- echo '<td>'.functions::xssafe($temp['LABEL']).' : </td>';
- echo '<td><b>'.$r['nb_docs'].'</b></td>';
- echo '<td width="40px;"> </td>';
- }
+ <?php
+ foreach ($ressources_status as $r) {
+ $temp = $status_obj->get_status_data($r['status']);
+ echo '<td><i class="fm '.$temp['IMG_SRC'].' fm-2x"></i></td>';
+ echo '<td>'.functions::xssafe($temp['LABEL']).' : </td>';
+ echo '<td><b>'.$r['nb_docs'].'</b></td>';
+ echo '<td width="40px;"> </td>';
+ }
?>
</tr>
</table>
</div>
<input type="hidden" name="update" id="update" value="true" />
- <input type="hidden" name="id" id="id" value="<?php functions::xecho($case_id);?>" />
+ <input type="hidden" name="id" id="id" value="<?php functions::xecho($case_id); ?>" />
<p align="center">
- <?php
- if ($core_tools->test_service('update_case', 'cases',false) == 1 && $case_indexes["case_closing_date"] == NULL)
- { ?>
- <input type="submit" class="button" value="<?php echo _MODIFY_DOC;?>" name="submit_index_doc" />
- <?php
+ <?php
+ if ($core_tools->test_service('update_case', 'cases', false) == 1 && $case_indexes['case_closing_date'] == null) {
+ ?>
+ <input type="submit" class="button" value="<?php echo _MODIFY_DOC; ?>" name="submit_index_doc" />
+ <?php
} ?>
- <?php
- /*if ($core_tools->test_service('join_res_case', 'cases',false) == 1)
- { ?>
- <input type="button" class="button" value="<?php echo _JOIN_RES_ON_THIS_CASE;?>" name="join_res" onclick="window.open('<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&module=cases&page=search_adv_for_cases&searched_item=res_id&searched_value=<?php functions::xecho($case_indexes['case_id']);?>','', 'scrollbars=yes,menubar=no,toolbar=no,resizable=yes,status=no,width=1020,height=710');"/>
- <?php
- }*/
- if ($core_tools->test_service('close_case', 'cases',false) == 1 && $case_indexes["case_closing_date"] == NULL)
- { ?>
- <input type="button" class="button" value="<?php echo _CLOSE_THIS_CASE;?>" name="join_res" onclick="window.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&module=cases&page=db_close_case&case_id=<?php functions::xecho($case_indexes['case_id']);?>' "/>
- <?php
+ <?php
+ /*if ($core_tools->test_service('join_res_case', 'cases',false) == 1)
+ { ?>
+ <input type="button" class="button" value="<?php echo _JOIN_RES_ON_THIS_CASE;?>" name="join_res" onclick="window.open('<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&module=cases&page=search_adv_for_cases&searched_item=res_id&searched_value=<?php functions::xecho($case_indexes['case_id']);?>','', 'scrollbars=yes,menubar=no,toolbar=no,resizable=yes,status=no,width=1020,height=710');"/>
+ <?php
+ }*/
+ if ($core_tools->test_service('close_case', 'cases', false) == 1 && $case_indexes['case_closing_date'] == null) {
+ ?>
+ <input type="button" class="button" value="<?php echo _CLOSE_THIS_CASE; ?>" name="join_res" onclick="window.location.href='<?php echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&module=cases&page=db_close_case&case_id=<?php functions::xecho($case_indexes['case_id']); ?>' "/>
+ <?php
} ?>
</p>
<?php $core_tools->load_js();?>
diff --git a/modules/entities/css/module.css b/modules/entities/css/module.css
index 2045c4c9593d778128bfe2aa1c47e5e091a521f4..a4b4ef4920a74e5844eca4d6005dbfd5651608ed 100755
--- a/modules/entities/css/module.css
+++ b/modules/entities/css/module.css
@@ -55,8 +55,8 @@ width: 320px;
}
#user_entities .tit {
- /*color: #FFC200;*/
- color: #1B99C4;
+ /*color: #F99830;*/
+ color: #135F7F;
}
#user_entities{
border: 0px;
@@ -69,7 +69,7 @@ width: 320px;
span.change {
padding-left: 20px;
background: transparent url(static.php?filename=puce_prev.gif) 10px center no-repeat;
- color: #16ADEB;
+ color: #135F7F;
padding: 5px 0 5px 20px;
background-position: center left;
background-image: url(static.php?filename=picto_change.gif);
diff --git a/modules/entities/entity_late_mail.php b/modules/entities/entity_late_mail.php
index d61bad6cd6e8b1a48b8c2140a2ff7f235d7d2c26..8e404c2337d533ef10f7f22795fab066340b4114 100755
--- a/modules/entities/entity_late_mail.php
+++ b/modules/entities/entity_late_mail.php
@@ -1,125 +1,120 @@
<?php
-require_once('modules'.DIRECTORY_SEPARATOR."reports".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_modules_tools.php");
-require_once('modules'.DIRECTORY_SEPARATOR."entities".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_entities.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php");
+
+require_once 'modules'.DIRECTORY_SEPARATOR.'reports'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
$core_tools = new core_tools();
$rep = new reports();
$core_tools->load_lang();
$id = '';
-if(isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments']))
-{
- $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
+if (isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments'])) {
+ $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
}
$content = '';
-$content .='<div id="params">';
- $content .='<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
- if(!$core_tools->test_service('graphics_reports', 'reports', false)){
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_LATE_MAIL.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }else{
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_LATE_MAIL.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> ' . _GRAPH . ' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }
- $content .='<br/>';
- $content .='<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
- $content .='<table style="width:600px;border: solid 1px #009DC5;margin:auto;" >';
- $content .='<tr>';
- $content .='<td align="left">';
- $content .='<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
+$content .= '<div id="params">';
+ $content .= '<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
+ if (!$core_tools->test_service('graphics_reports', 'reports', false)) {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_LATE_MAIL.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ } else {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_LATE_MAIL.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> '._GRAPH.' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ }
+ $content .= '<br/>';
+ $content .= '<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
+ $content .= '<table style="width:600px;border: solid 1px #135F7F;margin:auto;" >';
+ $content .= '<tr>';
+ $content .= '<td align="left">';
+ $content .= '<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
$content .= _ENTITY_LATE_MAIL_DESC;
- $content .='</p>';
- $content .='<br/>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
+ $content .= '</p>';
+ $content .= '<br/>';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
$content .= _SHOW_YEAR_GRAPH;
- $content .=' <select name="the_year" id="the_year">';
- $year=date("Y");
- $i_current=date("Y'");
- while ($year <> ($i_current-5))
- {
- $content .= '<option value = "'.$year.'">'.$year.'</option>';
- $year= $year-1;
- }
- $content .='</select>';
- $content .='</p>';
+ $content .= ' <select name="the_year" id="the_year">';
+ $year = date('Y');
+ $i_current = date("Y'");
+ while ($year != ($i_current - 5)) {
+ $content .= '<option value = "'.$year.'">'.$year.'</option>';
+ $year = $year - 1;
+ }
+ $content .= '</select>';
+ $content .= '</p>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_month" value="month" />';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_month" value="month" />';
$content .= _SHOW_GRAPH_MONTH;
- $content .=' <select name="the_month" id="the_month">';
- $content .='<option value ="01"> '. _JANUARY.' </option>';
- $content .='<option value ="02"> '._FEBRUARY.' </option>';
- $content .='<option value ="03"> '._MARCH.' </option>';
- $content .='<option value ="04"> '._APRIL.' </option>';
- $content .='<option value ="05"> '._MAY.' </option>';
- $content .='<option value ="06"> '._JUNE.' </option>';
- $content .='<option value ="07"> '._JULY.' </option>';
- $content .='<option value ="08"> '._AUGUST.' </option>';
- $content .='<option value ="09"> '._SEPTEMBER.' </option>';
- $content .='<option value ="10"> '._OCTOBER.'</option>';
- $content .='<option value ="11"> '._NOVEMBER.' </option>';
- $content .='<option value ="12"> '._DECEMBER.' </option>';
- $content .='</select> ';
- $content .= _OF_THIS_YEAR.'.</p>';
- if($id <> 'process_delay')
- {
- $content .='<p class="double">';
- $content .='<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
- }
- $content.='<p class="double" style="margin-left:10px">';
- $content.= _FILTER_BY.' :<br /><br />';
+ $content .= ' <select name="the_month" id="the_month">';
+ $content .= '<option value ="01"> '._JANUARY.' </option>';
+ $content .= '<option value ="02"> '._FEBRUARY.' </option>';
+ $content .= '<option value ="03"> '._MARCH.' </option>';
+ $content .= '<option value ="04"> '._APRIL.' </option>';
+ $content .= '<option value ="05"> '._MAY.' </option>';
+ $content .= '<option value ="06"> '._JUNE.' </option>';
+ $content .= '<option value ="07"> '._JULY.' </option>';
+ $content .= '<option value ="08"> '._AUGUST.' </option>';
+ $content .= '<option value ="09"> '._SEPTEMBER.' </option>';
+ $content .= '<option value ="10"> '._OCTOBER.'</option>';
+ $content .= '<option value ="11"> '._NOVEMBER.' </option>';
+ $content .= '<option value ="12"> '._DECEMBER.' </option>';
+ $content .= '</select> ';
+ $content .= _OF_THIS_YEAR.'.</p>';
+ if ($id != 'process_delay') {
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
+ }
+ $content .= '<p class="double" style="margin-left:10px">';
+ $content .= _FILTER_BY.' :<br /><br />';
$entities = array();
$ent = new entity();
$except[] = $_SESSION['m_admin']['entity']['entityId'];
-
- $entities=$ent->getShortEntityTree($entities, 'all', '', $except );
- $content.='<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
- for($i=0; $i<count($entities);$i++)
- {
- $content.="<option";
+ $entities = $ent->getShortEntityTree($entities, 'all', '', $except);
+
+ $content .= '<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($entities); ++$i) {
+ $content .= '<option';
if ($entities[$i]['ID'] == $_SESSION['user']['primaryentity']['id']) {
$content .= ' selected';
}
- $content.=" value='".$entities[$i]['ID']."'>";
- $content.=$entities[$i]['LABEL']."</option>";
- }
- $content.='</select>';
- $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
- $content .= '<script>titleWithTooltipster("sub_entities");</script>';
- $js .= '$j("#entities_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
+ $content .= " value='".$entities[$i]['ID']."'>";
+ $content .= $entities[$i]['LABEL'].'</option>';
+ }
+ $content .= '</select>';
+ $content .= '<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>titleWithTooltipster("sub_entities");</script>';
+ $js .= '$j("#entities_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
+ $content .= '<br/><br/>';
$status_obj = new manage_status();
$status = $status_obj->get_searchable_status();
- $content.='<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
- for($i=0; $i < count($status); $i++)
- {
- $content.="<option";
- $content.=" value='".$status[$i]['ID']."'>";
- $content.=$status[$i]['LABEL']."</option>";
+ $content .= '<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($status); ++$i) {
+ $content .= '<option';
+ $content .= " value='".$status[$i]['ID']."'>";
+ $content .= $status[$i]['LABEL'].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#status_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
- $content.='<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
- foreach(array_keys($_SESSION['mail_priorities']) as $priority)
- {
- $content.="<option";
- $content.=" value='".$_SESSION['mail_priorities_id'][$priority]."'>";
- $content.=$_SESSION['mail_priorities'][$priority]."</option>";
+ $content .= '<br/><br/>';
+ $content .= '<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
+ foreach (array_keys($_SESSION['mail_priorities']) as $priority) {
+ $content .= '<option';
+ $content .= " value='".$_SESSION['mail_priorities_id'][$priority]."'>";
+ $content .= $_SESSION['mail_priorities'][$priority].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#priority_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.='</p>';
- $content .='</td>';
- $content .='</tr>';
- $content .='<tr>';
- $content .='<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_late_mail\');" /></td>';
- $content .='</tr>';
- $content .='</table>';
- $content .='</form>';
-$content .='</div>';
-$content .='<div id="result_period_report"></div>';
-$js .='valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_late_mail\');';
+ $content .= '</p>';
+ $content .= '</td>';
+ $content .= '</tr>';
+ $content .= '<tr>';
+ $content .= '<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_late_mail\');" /></td>';
+ $content .= '</tr>';
+ $content .= '</table>';
+ $content .= '</form>';
+$content .= '</div>';
+$content .= '<div id="result_period_report"></div>';
+$js .= 'valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_late_mail\');';
echo "{content : '".addslashes($content)."', exec_js : '".addslashes($js)."'}";
exit();
diff --git a/modules/entities/entity_process_delay.php b/modules/entities/entity_process_delay.php
index 97dd6ccf1c6bae289019dd72feb8536e752df1bb..7b0779e349579c981a2e1348af93c2d182c7c411 100755
--- a/modules/entities/entity_process_delay.php
+++ b/modules/entities/entity_process_delay.php
@@ -1,126 +1,121 @@
<?php
-require_once('modules'.DIRECTORY_SEPARATOR."reports".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_modules_tools.php");
-require_once('modules'.DIRECTORY_SEPARATOR."entities".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_entities.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php");
+
+require_once 'modules'.DIRECTORY_SEPARATOR.'reports'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
$core_tools = new core_tools();
$rep = new reports();
$core_tools->load_lang();
$id = '';
-if(isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments']))
-{
- $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
+if (isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments'])) {
+ $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
}
$content = '';
-$content .='<div id="params">';
- $content .='<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
- if(!$core_tools->test_service('graphics_reports', 'reports', false)){
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_PROCESS_DELAY.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }else{
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_PROCESS_DELAY.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> ' . _GRAPH . ' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
+$content .= '<div id="params">';
+ $content .= '<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
+ if (!$core_tools->test_service('graphics_reports', 'reports', false)) {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_PROCESS_DELAY.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ } else {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._ENTITY_PROCESS_DELAY.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> '._GRAPH.' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
}
- $content .='<br/>';
- $content .='<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
- $content .='<table style="width:600px;border: solid 1px #009DC5;margin:auto;" >';
- $content .='<tr>';
- $content .='<td align="left">';
- $content .='<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
+ $content .= '<br/>';
+ $content .= '<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
+ $content .= '<table style="width:600px;border: solid 1px #135F7F;margin:auto;" >';
+ $content .= '<tr>';
+ $content .= '<td align="left">';
+ $content .= '<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
$content .= _ENTITY_PROCESS_DELAY_DESC;
- $content .='</p>';
- $content .='<br/>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
+ $content .= '</p>';
+ $content .= '<br/>';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
$content .= _SHOW_YEAR_GRAPH;
- $content .=' <select name="the_year" id="the_year">';
- $year=date("Y");
- $i_current=date("Y'");
- while ($year <> ($i_current-5))
- {
- $content .= '<option value = "'.$year.'">'.$year.'</option>';
- $year= $year-1;
- }
- $content .='</select>';
- $content .='</p>';
+ $content .= ' <select name="the_year" id="the_year">';
+ $year = date('Y');
+ $i_current = date("Y'");
+ while ($year != ($i_current - 5)) {
+ $content .= '<option value = "'.$year.'">'.$year.'</option>';
+ $year = $year - 1;
+ }
+ $content .= '</select>';
+ $content .= '</p>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_month" value="month" />';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_month" value="month" />';
$content .= _SHOW_GRAPH_MONTH;
- $content .=' <select name="the_month" id="the_month">';
- $content .='<option value ="01"> '. _JANUARY.' </option>';
- $content .='<option value ="02"> '._FEBRUARY.' </option>';
- $content .='<option value ="03"> '._MARCH.' </option>';
- $content .='<option value ="04"> '._APRIL.' </option>';
- $content .='<option value ="05"> '._MAY.' </option>';
- $content .='<option value ="06"> '._JUNE.' </option>';
- $content .='<option value ="07"> '._JULY.' </option>';
- $content .='<option value ="08"> '._AUGUST.' </option>';
- $content .='<option value ="09"> '._SEPTEMBER.' </option>';
- $content .='<option value ="10"> '._OCTOBER.'</option>';
- $content .='<option value ="11"> '._NOVEMBER.' </option>';
- $content .='<option value ="12"> '._DECEMBER.' </option>';
- $content .='</select> ';
- $content .= _OF_THIS_YEAR.'.</p>';
- if($id <> 'process_delay')
- {
- $content .='<p class="double">';
- $content .='<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
- }
- $content.='<p class="double" style="margin-left:10px">';
- $content.= _FILTER_BY.' :<br /><br />';
+ $content .= ' <select name="the_month" id="the_month">';
+ $content .= '<option value ="01"> '._JANUARY.' </option>';
+ $content .= '<option value ="02"> '._FEBRUARY.' </option>';
+ $content .= '<option value ="03"> '._MARCH.' </option>';
+ $content .= '<option value ="04"> '._APRIL.' </option>';
+ $content .= '<option value ="05"> '._MAY.' </option>';
+ $content .= '<option value ="06"> '._JUNE.' </option>';
+ $content .= '<option value ="07"> '._JULY.' </option>';
+ $content .= '<option value ="08"> '._AUGUST.' </option>';
+ $content .= '<option value ="09"> '._SEPTEMBER.' </option>';
+ $content .= '<option value ="10"> '._OCTOBER.'</option>';
+ $content .= '<option value ="11"> '._NOVEMBER.' </option>';
+ $content .= '<option value ="12"> '._DECEMBER.' </option>';
+ $content .= '</select> ';
+ $content .= _OF_THIS_YEAR.'.</p>';
+ if ($id != 'process_delay') {
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
+ }
+ $content .= '<p class="double" style="margin-left:10px">';
+ $content .= _FILTER_BY.' :<br /><br />';
$entities = array();
$ent = new entity();
$except[] = $_SESSION['m_admin']['entity']['entityId'];
-
- $entities=$ent->getShortEntityTree($entities, 'all', '', $except );
- $content.='<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
- for($i=0; $i<count($entities);$i++)
- {
- $content.="<option";
+ $entities = $ent->getShortEntityTree($entities, 'all', '', $except);
+
+ $content .= '<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($entities); ++$i) {
+ $content .= '<option';
if ($entities[$i]['ID'] == $_SESSION['user']['primaryentity']['id']) {
$content .= ' selected';
}
- $content.=" value='".$entities[$i]['ID']."'>";
- $content.=$entities[$i]['LABEL']."</option>";
- }
- $content.='</select>';
- $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
- $content .= '<script>titleWithTooltipster("sub_entities");</script>';
+ $content .= " value='".$entities[$i]['ID']."'>";
+ $content .= $entities[$i]['LABEL'].'</option>';
+ }
+ $content .= '</select>';
+ $content .= '<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>titleWithTooltipster("sub_entities");</script>';
$js .= '$j("#entities_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
+ $content .= '<br/><br/>';
$status_obj = new manage_status();
$status = $status_obj->get_searchable_status();
- $content.='<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
- for($i=0; $i < count($status); $i++)
- {
- $content.="<option";
- $content.=" value='".$status[$i]['ID']."'>";
- $content.=$status[$i]['LABEL']."</option>";
+ $content .= '<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($status); ++$i) {
+ $content .= '<option';
+ $content .= " value='".$status[$i]['ID']."'>";
+ $content .= $status[$i]['LABEL'].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#status_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
- $content.='<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
- foreach(array_keys($_SESSION['mail_priorities']) as $priority)
- {
- $content.="<option";
- $content.=" value='".$_SESSION['mail_priorities_id'][$priority]."'>";
- $content.=$_SESSION['mail_priorities'][$priority]."</option>";
+ $content .= '<br/><br/>';
+ $content .= '<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
+ foreach (array_keys($_SESSION['mail_priorities']) as $priority) {
+ $content .= '<option';
+ $content .= " value='".$_SESSION['mail_priorities_id'][$priority]."'>";
+ $content .= $_SESSION['mail_priorities'][$priority].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#priority_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.='</p>';
- $content .='</td>';
- $content .='</tr>';
- $content .='<tr>';
- $content .='<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_process_delay\');" /></td>';
- $content .='</tr>';
- $content .='</table>';
- $content .='</form>';
-$content .='</div>';
-$content .='<div id="result_period_report"></div>';
-$js .='valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_process_delay\');';
+ $content .= '</p>';
+ $content .= '</td>';
+ $content .= '</tr>';
+ $content .= '<tr>';
+ $content .= '<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_process_delay\');" /></td>';
+ $content .= '</tr>';
+ $content .= '</table>';
+ $content .= '</form>';
+$content .= '</div>';
+$content .= '<div id="result_period_report"></div>';
+$js .= 'valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_process_delay\');';
echo "{content : '".addslashes($content)."', exec_js : '".addslashes($js)."'}";
exit();
diff --git a/modules/entities/entity_response_rate_stat.php b/modules/entities/entity_response_rate_stat.php
index aacd3ff989d8b5e93891d9ea81802055525aeee2..b80d093fc513329493a4fb1fcbc48c05d6390509 100755
--- a/modules/entities/entity_response_rate_stat.php
+++ b/modules/entities/entity_response_rate_stat.php
@@ -1,126 +1,121 @@
<?php
-require_once('modules'.DIRECTORY_SEPARATOR."reports".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_modules_tools.php");
-require_once('modules'.DIRECTORY_SEPARATOR."entities".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_entities.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php");
+
+require_once 'modules'.DIRECTORY_SEPARATOR.'reports'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
$core_tools = new core_tools();
$rep = new reports();
$core_tools->load_lang();
$id = '';
-if(isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments']))
-{
- $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
+if (isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments'])) {
+ $id = $rep->get_arguments_for_report($_REQUEST['arguments'], 'id');
}
$content = '';
-$content .='<div id="params">';
- $content .='<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
- if(!$core_tools->test_service('graphics_reports', 'reports', false)){
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._RESPONSE_RATE_BY_ENTITIES.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }else{
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._RESPONSE_RATE_BY_ENTITIES.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> ' . _GRAPH . ' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
+$content .= '<div id="params">';
+ $content .= '<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
+ if (!$core_tools->test_service('graphics_reports', 'reports', false)) {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._RESPONSE_RATE_BY_ENTITIES.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ } else {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._RESPONSE_RATE_BY_ENTITIES.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> '._GRAPH.' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
}
- $content .='<br/>';
- $content .='<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
- $content .='<table style="width:600px;border: solid 1px #009DC5;margin:auto;" >';
- $content .='<tr>';
- $content .='<td align="left">';
- $content .='<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
+ $content .= '<br/>';
+ $content .= '<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
+ $content .= '<table style="width:600px;border: solid 1px #135F7F;margin:auto;" >';
+ $content .= '<tr>';
+ $content .= '<td align="left">';
+ $content .= '<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
$content .= _RESPONSE_RATE_BY_ENTITIES_DESC;
- $content .='</p>';
- $content .='<br/>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
+ $content .= '</p>';
+ $content .= '<br/>';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
$content .= _SHOW_YEAR_GRAPH;
- $content .=' <select name="the_year" id="the_year">';
- $year=date("Y");
- $i_current=date("Y'");
- while ($year <> ($i_current-5))
- {
- $content .= '<option value = "'.$year.'">'.$year.'</option>';
- $year= $year-1;
- }
- $content .='</select>';
- $content .='</p>';
+ $content .= ' <select name="the_year" id="the_year">';
+ $year = date('Y');
+ $i_current = date("Y'");
+ while ($year != ($i_current - 5)) {
+ $content .= '<option value = "'.$year.'">'.$year.'</option>';
+ $year = $year - 1;
+ }
+ $content .= '</select>';
+ $content .= '</p>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_month" value="month" />';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_month" value="month" />';
$content .= _SHOW_GRAPH_MONTH;
- $content .=' <select name="the_month" id="the_month">';
- $content .='<option value ="01"> '. _JANUARY.' </option>';
- $content .='<option value ="02"> '._FEBRUARY.' </option>';
- $content .='<option value ="03"> '._MARCH.' </option>';
- $content .='<option value ="04"> '._APRIL.' </option>';
- $content .='<option value ="05"> '._MAY.' </option>';
- $content .='<option value ="06"> '._JUNE.' </option>';
- $content .='<option value ="07"> '._JULY.' </option>';
- $content .='<option value ="08"> '._AUGUST.' </option>';
- $content .='<option value ="09"> '._SEPTEMBER.' </option>';
- $content .='<option value ="10"> '._OCTOBER.'</option>';
- $content .='<option value ="11"> '._NOVEMBER.' </option>';
- $content .='<option value ="12"> '._DECEMBER.' </option>';
- $content .='</select> ';
- $content .= _OF_THIS_YEAR.'.</p>';
- if($id <> 'process_delay')
- {
- $content .='<p class="double">';
- $content .='<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
- }
- $content.='<p class="double" style="margin-left:10px">';
- $content.= _FILTER_BY.' :<br /><br />';
+ $content .= ' <select name="the_month" id="the_month">';
+ $content .= '<option value ="01"> '._JANUARY.' </option>';
+ $content .= '<option value ="02"> '._FEBRUARY.' </option>';
+ $content .= '<option value ="03"> '._MARCH.' </option>';
+ $content .= '<option value ="04"> '._APRIL.' </option>';
+ $content .= '<option value ="05"> '._MAY.' </option>';
+ $content .= '<option value ="06"> '._JUNE.' </option>';
+ $content .= '<option value ="07"> '._JULY.' </option>';
+ $content .= '<option value ="08"> '._AUGUST.' </option>';
+ $content .= '<option value ="09"> '._SEPTEMBER.' </option>';
+ $content .= '<option value ="10"> '._OCTOBER.'</option>';
+ $content .= '<option value ="11"> '._NOVEMBER.' </option>';
+ $content .= '<option value ="12"> '._DECEMBER.' </option>';
+ $content .= '</select> ';
+ $content .= _OF_THIS_YEAR.'.</p>';
+ if ($id != 'process_delay') {
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
+ }
+ $content .= '<p class="double" style="margin-left:10px">';
+ $content .= _FILTER_BY.' :<br /><br />';
$entities = array();
$ent = new entity();
$except[] = $_SESSION['m_admin']['entity']['entityId'];
-
- $entities=$ent->getShortEntityTree($entities, 'all', '', $except );
- $content.='<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
- for($i=0; $i<count($entities);$i++)
- {
- $content .= "<option";
+ $entities = $ent->getShortEntityTree($entities, 'all', '', $except);
+
+ $content .= '<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($entities); ++$i) {
+ $content .= '<option';
if ($entities[$i]['ID'] == $_SESSION['user']['primaryentity']['id']) {
- $content .= ' selected';
+ $content .= ' selected';
}
- $content .= " value='".$entities[$i]['ID']."'>";
- $content .= $entities[$i]['LABEL']."</option>";
- }
- $content.='</select>';
- $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
- $content .= '<script>titleWithTooltipster("sub_entities");</script>';
+ $content .= " value='".$entities[$i]['ID']."'>";
+ $content .= $entities[$i]['LABEL'].'</option>';
+ }
+ $content .= '</select>';
+ $content .= '<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>titleWithTooltipster("sub_entities");</script>';
$js .= '$j("#entities_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
+ $content .= '<br/><br/>';
$status_obj = new manage_status();
$status = $status_obj->get_searchable_status();
- $content.='<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
- for($i=0; $i < count($status); $i++)
- {
- $content.="<option";
- $content.=" value='".$status[$i]['ID']."'>";
- $content.=$status[$i]['LABEL']."</option>";
+ $content .= '<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($status); ++$i) {
+ $content .= '<option';
+ $content .= " value='".$status[$i]['ID']."'>";
+ $content .= $status[$i]['LABEL'].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#status_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
- $content.='<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
- foreach(array_keys($_SESSION['mail_priorities']) as $priority)
- {
- $content.="<option";
- $content.=" value='".$_SESSION['mail_priorities_id'][$priority]."'>";
- $content.=$_SESSION['mail_priorities'][$priority]."</option>";
+ $content .= '<br/><br/>';
+ $content .= '<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
+ foreach (array_keys($_SESSION['mail_priorities']) as $priority) {
+ $content .= '<option';
+ $content .= " value='".$_SESSION['mail_priorities_id'][$priority]."'>";
+ $content .= $_SESSION['mail_priorities'][$priority].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#priority_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.='</p>';
- $content .='</td>';
- $content .='</tr>';
- $content .='<tr>';
- $content .='<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_response_rate_stat\');" /></td>';
- $content .='</tr>';
- $content .='</table>';
- $content .='</form>';
-$content .='</div>';
-$content .='<div id="result_period_report"></div>';
-$js .='valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_response_rate_stat\');';
+ $content .= '</p>';
+ $content .= '</td>';
+ $content .= '</tr>';
+ $content .= '<tr>';
+ $content .= '<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_response_rate_stat\');" /></td>';
+ $content .= '</tr>';
+ $content .= '</table>';
+ $content .= '</form>';
+$content .= '</div>';
+$content .= '<div id="result_period_report"></div>';
+$js .= 'valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_response_rate_stat\');';
echo "{content : '".addslashes($content)."', exec_js : '".addslashes($js)."'}";
exit();
diff --git a/modules/entities/entity_vol_stat.php b/modules/entities/entity_vol_stat.php
index f0ddd091dc0ecb3b2d3f7d216843bfba359d3952..692c19614628b29444d21087e50a636c42ad9957 100755
--- a/modules/entities/entity_vol_stat.php
+++ b/modules/entities/entity_vol_stat.php
@@ -4,14 +4,15 @@
* See LICENCE.txt file at the root folder for more details.
* This file is part of Maarch software.
+*
* @brief entity_vol_stat
+*
* @author dev <dev@maarch.org>
* @ingroup entities
*/
-
-require_once 'modules'.DIRECTORY_SEPARATOR."reports".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_modules_tools.php";
-require_once 'modules'.DIRECTORY_SEPARATOR."entities".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_entities.php";
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php";
+require_once 'modules'.DIRECTORY_SEPARATOR.'reports'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
+require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
$core_tools = new core_tools();
$rep = new reports();
@@ -22,116 +23,111 @@ if (isset($_REQUEST['arguments']) && !empty($_REQUEST['arguments'])) {
}
$content = '';
-$content .='<div id="params">';
- $content .='<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
- if(!$core_tools->test_service('graphics_reports', 'reports', false)){
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._MAIL_VOL_BY_ENT_REPORT.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked"/><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }else{
- $content .='<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._MAIL_VOL_BY_ENT_REPORT.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> ' . _GRAPH . ' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '. _ARRAY . '</label>)</span></div>';
- }
- $content .='<br/>';
- $content .='<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
- $content .='<table style="width:600px;border: solid 1px #009DC5;margin:auto;" >';
- $content .='<tr>';
- $content .='<td align="left">';
- $content .='<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
+$content .= '<div id="params">';
+ $content .= '<form id="report_by_period_form" name="report_by_period_form" method="get" action="">';
+ if (!$core_tools->test_service('graphics_reports', 'reports', false)) {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._MAIL_VOL_BY_ENT_REPORT.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_array" value="array" checked="checked"/><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ } else {
+ $content .= '<div id="statLabel" style="font-weight:bold;text-align:center;text-transform:uppercase;">'._MAIL_VOL_BY_ENT_REPORT.' <span style="font-weight: initial;">(<input type="radio" name="form_report" id="report_graph" value="graph" checked="checked" /><label for="report_graph"> '._GRAPH.' </label><input type="radio" name="form_report" id="report_array" value="array" /><label for="report_array"> '._ARRAY.'</label>)</span></div>';
+ }
+ $content .= '<br/>';
+ $content .= '<input type="hidden" name="id_report" id="id_report" value="'.$id.'" />';
+ $content .= '<table style="width:600px;border: solid 1px #135F7F;margin:auto;" >';
+ $content .= '<tr>';
+ $content .= '<td align="left">';
+ $content .= '<p class="double" style="padding:10px;text-align:justify;border:solid 1px #ccc;">';
$content .= _ENTITY_VOL_STAT_DESC;
- $content .='</p>';
- $content .='<br/>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
+ $content .= '</p>';
+ $content .= '<br/>';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_year" value="year" checked="checked" />';
$content .= _SHOW_YEAR_GRAPH;
- $content .=' <select name="the_year" id="the_year">';
- $year=date("Y");
- $i_current=date("Y'");
- while ($year <> ($i_current-5))
-{
- $content .= '<option value = "'.$year.'">'.$year.'</option>';
- $year= $year-1;
- }
- $content .='</select>';
- $content .='</p>';
+ $content .= ' <select name="the_year" id="the_year">';
+ $year = date('Y');
+ $i_current = date("Y'");
+ while ($year != ($i_current - 5)) {
+ $content .= '<option value = "'.$year.'">'.$year.'</option>';
+ $year = $year - 1;
+ }
+ $content .= '</select>';
+ $content .= '</p>';
- $content .='<p class="double">';
- $content .='<input type="radio" name="type_period" id="period_by_month" value="month" />';
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" name="type_period" id="period_by_month" value="month" />';
$content .= _SHOW_GRAPH_MONTH;
- $content .=' <select name="the_month" id="the_month">';
- $content .='<option value ="01"> '. _JANUARY.' </option>';
- $content .='<option value ="02"> '._FEBRUARY.' </option>';
- $content .='<option value ="03"> '._MARCH.' </option>';
- $content .='<option value ="04"> '._APRIL.' </option>';
- $content .='<option value ="05"> '._MAY.' </option>';
- $content .='<option value ="06"> '._JUNE.' </option>';
- $content .='<option value ="07"> '._JULY.' </option>';
- $content .='<option value ="08"> '._AUGUST.' </option>';
- $content .='<option value ="09"> '._SEPTEMBER.' </option>';
- $content .='<option value ="10"> '._OCTOBER.'</option>';
- $content .='<option value ="11"> '._NOVEMBER.' </option>';
- $content .='<option value ="12"> '._DECEMBER.' </option>';
- $content .='</select> ';
- $content .= _OF_THIS_YEAR.'.</p>';
- if($id <> 'process_delay')
- {
- $content .='<p class="double">';
- $content .='<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
- }
- $content.='<p class="double" style="margin-left:10px">';
- $content.= _FILTER_BY.' :<br /><br />';
+ $content .= ' <select name="the_month" id="the_month">';
+ $content .= '<option value ="01"> '._JANUARY.' </option>';
+ $content .= '<option value ="02"> '._FEBRUARY.' </option>';
+ $content .= '<option value ="03"> '._MARCH.' </option>';
+ $content .= '<option value ="04"> '._APRIL.' </option>';
+ $content .= '<option value ="05"> '._MAY.' </option>';
+ $content .= '<option value ="06"> '._JUNE.' </option>';
+ $content .= '<option value ="07"> '._JULY.' </option>';
+ $content .= '<option value ="08"> '._AUGUST.' </option>';
+ $content .= '<option value ="09"> '._SEPTEMBER.' </option>';
+ $content .= '<option value ="10"> '._OCTOBER.'</option>';
+ $content .= '<option value ="11"> '._NOVEMBER.' </option>';
+ $content .= '<option value ="12"> '._DECEMBER.' </option>';
+ $content .= '</select> ';
+ $content .= _OF_THIS_YEAR.'.</p>';
+ if ($id != 'process_delay') {
+ $content .= '<p class="double">';
+ $content .= '<input type="radio" id="custom_period" name="type_period" value="custom_period" /><label for="period">'._TITLE_STATS_CHOICE_PERIOD.'. </label>'._SINCE.' : <input name="datestart" type="text" id="datestart" onclick="showCalender(this);" /> '._FOR.' : <input name="dateend" type="text" id="dateend" onclick="showCalender(this);" /></p>';
+ }
+ $content .= '<p class="double" style="margin-left:10px">';
+ $content .= _FILTER_BY.' :<br /><br />';
$entities = array();
$ent = new entity();
$except[] = $_SESSION['m_admin']['entity']['entityId'];
-
- $entities=$ent->getShortEntityTree($entities, 'all', '', $except );
- $content.='<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
- for($i=0; $i<count($entities);$i++)
- {
- $content.="<option";
+ $entities = $ent->getShortEntityTree($entities, 'all', '', $except);
+
+ $content .= '<select name="entities_chosen" data-placeholder="'._DEPARTMENT_DEST.'" id="entities_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($entities); ++$i) {
+ $content .= '<option';
if ($entities[$i]['ID'] == $_SESSION['user']['primaryentity']['id']) {
$content .= ' selected';
}
- $content.=" value='".$entities[$i]['ID']."'>";
- $content.=$entities[$i]['LABEL']."</option>";
- }
- $content.='</select>';
- $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= " value='".$entities[$i]['ID']."'>";
+ $content .= $entities[$i]['LABEL'].'</option>';
+ }
+ $content .= '</select>';
+ $content .= '<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
$content .= '<script>titleWithTooltipster("sub_entities");</script>';
$js .= '$j("#entities_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
+ $content .= '<br/><br/>';
$status_obj = new manage_status();
$status = $status_obj->get_searchable_status();
- $content.='<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
- for($i=0; $i < count($status); $i++)
- {
- $content.="<option";
- $content.=" value='".$status[$i]['ID']."'>";
- $content.=$status[$i]['LABEL']."</option>";
+ $content .= '<select name="status_chosen" data-placeholder="'._STATUS.'" id="status_chosen" size="10" multiple="multiple">';
+ for ($i = 0; $i < count($status); ++$i) {
+ $content .= '<option';
+ $content .= " value='".$status[$i]['ID']."'>";
+ $content .= $status[$i]['LABEL'].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#status_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.= '<br/><br/>';
- $content.='<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
- foreach(array_keys($_SESSION['mail_priorities']) as $priority)
- {
- $content.="<option";
- $content.=" value='".$_SESSION['mail_priorities_id'][$priority]."'>";
- $content.=$_SESSION['mail_priorities'][$priority]."</option>";
+ $content .= '<br/><br/>';
+ $content .= '<select name="priority_chosen" data-placeholder="'._PRIORITY.'" id="priority_chosen" size="10" multiple="multiple">';
+ foreach (array_keys($_SESSION['mail_priorities']) as $priority) {
+ $content .= '<option';
+ $content .= " value='".$_SESSION['mail_priorities_id'][$priority]."'>";
+ $content .= $_SESSION['mail_priorities'][$priority].'</option>';
}
- $content.='</select>';
+ $content .= '</select>';
$js .= '$j("#priority_chosen").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});';
- $content.='</p>';
- $content .='</td>';
- $content .='</tr>';
- $content .='<tr>';
- $content .='<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_vol\');" /></td>';
- $content .='</tr>';
- $content .='</table>';
- $content .='</form>';
-$content .='</div>';
-$content .='<div id="result_period_report"></div>';
+ $content .= '</p>';
+ $content .= '</td>';
+ $content .= '</tr>';
+ $content .= '<tr>';
+ $content .= '<td style="text-align:center;"><input type="button" id="validate" name="validate" value="'._VALIDATE.'" class="button" onclick="valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_vol\');" /></td>';
+ $content .= '</tr>';
+ $content .= '</table>';
+ $content .= '</form>';
+$content .= '</div>';
+$content .= '<div id="result_period_report"></div>';
$js .= 'valid_report_by_period(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&module=entities&page=get_entity_vol\');';
echo "{content : '".addslashes($content)."', exec_js : '".addslashes($js)."'}";
diff --git a/modules/folder/css/module.css b/modules/folder/css/module.css
index efd86cfd2bd1ca1279522e3e6f4e502e078b26f2..842e301c093feb9228a25ebb31a4ab337186c7d3 100755
--- a/modules/folder/css/module.css
+++ b/modules/folder/css/module.css
@@ -1 +1,138 @@
-/* menu */
#menunav li#folder_search span span {
background-image: url(static.php?module=folder&filename=folder_search.gif);
text-align:left;
}
#menunav li#folder_search.on span span {
background-image: url(static.php?module=folder&filename=folder_search_on.gif);
text-align:left;
}
td#folder_search {
background: url(static.php?module=folder&filename=folder_search.gif) no-repeat;
}
/*#menunav li#salary_sheet span span {
background-image: url(static.php?module=folder&filename=salary_sheet.gif);
}
#menunav li#salary_sheet.on span span {
background-image: url(static.php?module=folder&filename=salary_sheet_on.gif);
}*/
#menunav li#folder_out span span {
background-image: url(static.php?module=folder&filename=folder_out.gif);
}
#menunav li#folder_out.on span span {
background-image: url(static.php?module=folder&filename=folder_out_on.gif);
}
td#folder_out {
background: url(static.php?module=folder&filename=folder_out.gif) no-repeat;
}
#menunav li#create_folder span span {
background-image: url(static.php?module=folder&filename=create_folder_off.gif);
}
#menunav li#create_folder.on span span {
background-image: url(static.php?module=folder&filename=create_folder_on.gif);
}
td#create_folder {
background: url(static.php?module=folder&filename=create_folder_off.gif) no-repeat;
}
/* admin modules board */
#fold_admin_foldertypes {
background: url(static.php?module=folder&filename=manage_foldertypes.gif) no-repeat 2px top;
}
.create_folder {
background: url(static.php?module=folder&filename=manage_foldertypes.gif) no-repeat 2px top;
width: 315px;
min-height: 110px;
float: left;
padding-top: 0px;
padding-right: 18px;
padding-bottom: 0px;
padding-left: 0px;
margin: 0px 0px 15px;
position: relative;
display: block;
}
/* Others */
#select_new_folder
{
width: 95%;
}
#choose_doctypes .multiple_list
{
width: 300px;
height:180px;
}
.select_folder
{
color:#00CCFF;
}
.folder_forms input, .folder_forms select
{
width: 140px;
}
.folder_forms .medium
{
width: 90px;
}
.fold_addforms{
width: 280px;
}
.fold_addforms input{
width: 120px;
}
input.button {
width:auto;
}
.folder-tab{
background: #deedf3;
border: 1px solid #666;
border-bottom: 0;
cursor: pointer;
display: inline;
float: right;
margin: 2px 0 0 -1px;
padding: 2px 5px;
position: relative;
font-size: 14px;
}
.folder-tab-open {
background: #fff;
margin-top: 0;
margin-bottom: -3px;
padding-bottom: 5px;
position: relative;
z-index: 1;
}
.panel-folder {
background: #009DC5;
border: 1px solid #000;
display: inline-block;
height: 650px;
min-width: 995px;
margin: 0 auto 1em;
padding: 5px 0 0 5px;
display: block;
}
.frame-targ {
background: #fff;
border-top: 1px solid #666;
clear: both;
margin: 0 0 0 -5px;
overflow: auto;
padding: 5px;
height: 92%;
width: auto;
}
\ No newline at end of file
+/* menu */
+
+#menunav li#folder_search span span {
+ background-image: url(static.php?module=folder&filename=folder_search.gif);
+ text-align:left;
+}
+#menunav li#folder_search.on span span {
+ background-image: url(static.php?module=folder&filename=folder_search_on.gif);
+ text-align:left;
+}
+
+td#folder_search {
+ background: url(static.php?module=folder&filename=folder_search.gif) no-repeat;
+}
+/*#menunav li#salary_sheet span span {
+ background-image: url(static.php?module=folder&filename=salary_sheet.gif);
+}
+#menunav li#salary_sheet.on span span {
+ background-image: url(static.php?module=folder&filename=salary_sheet_on.gif);
+}*/
+#menunav li#folder_out span span {
+ background-image: url(static.php?module=folder&filename=folder_out.gif);
+}
+#menunav li#folder_out.on span span {
+ background-image: url(static.php?module=folder&filename=folder_out_on.gif);
+}
+td#folder_out {
+ background: url(static.php?module=folder&filename=folder_out.gif) no-repeat;
+}
+#menunav li#create_folder span span {
+ background-image: url(static.php?module=folder&filename=create_folder_off.gif);
+}
+#menunav li#create_folder.on span span {
+ background-image: url(static.php?module=folder&filename=create_folder_on.gif);
+}
+td#create_folder {
+ background: url(static.php?module=folder&filename=create_folder_off.gif) no-repeat;
+}
+/* admin modules board */
+#fold_admin_foldertypes {
+ background: url(static.php?module=folder&filename=manage_foldertypes.gif) no-repeat 2px top;
+}
+
+.create_folder {
+ background: url(static.php?module=folder&filename=manage_foldertypes.gif) no-repeat 2px top;
+ width: 315px;
+ min-height: 110px;
+ float: left;
+ padding-top: 0px;
+ padding-right: 18px;
+ padding-bottom: 0px;
+ padding-left: 0px;
+ margin: 0px 0px 15px;
+ position: relative;
+ display: block;
+}
+
+/* Others */
+#select_new_folder
+{
+ width: 95%;
+}
+
+#choose_doctypes .multiple_list
+{
+ width: 300px;
+ height:180px;
+}
+
+.select_folder
+{
+ color:#00CCFF;
+}
+
+.folder_forms input, .folder_forms select
+{
+ width: 140px;
+}
+
+.folder_forms .medium
+{
+ width: 90px;
+}
+
+.fold_addforms{
+ width: 280px;
+}
+.fold_addforms input{
+ width: 120px;
+}
+input.button {
+width:auto;
+}
+
+.folder-tab{
+ background: #F2F2F2;
+ border: 1px solid #666;
+ border-bottom: 0;
+ cursor: pointer;
+ display: inline;
+ float: right;
+ margin: 2px 0 0 -1px;
+ padding: 2px 5px;
+ position: relative;
+ font-size: 14px;
+}
+
+.folder-tab-open {
+ background: #fff;
+ margin-top: 0;
+ margin-bottom: -3px;
+ padding-bottom: 5px;
+ position: relative;
+ z-index: 1;
+}
+
+.panel-folder {
+ background: #135F7F;
+ border: 1px solid #000;
+ display: inline-block;
+ height: 650px;
+ min-width: 995px;
+ margin: 0 auto 1em;
+ padding: 5px 0 0 5px;
+ display: block;
+}
+
+.frame-targ {
+ background: #fff;
+ border-top: 1px solid #666;
+ clear: both;
+ margin: 0 0 0 -5px;
+ overflow: auto;
+ padding: 5px;
+ height: 92%;
+ width: auto;
+}
+
diff --git a/modules/folder/get_tree_info.php b/modules/folder/get_tree_info.php
index f2e1608e2853476e5377953944700636759dc8a1..bdb7236bc8334c68cf3117b8ec557568b03ed784 100755
--- a/modules/folder/get_tree_info.php
+++ b/modules/folder/get_tree_info.php
@@ -19,20 +19,22 @@
*/
/**
-* @brief Returns in a json structure all allowed first branches of a tree for
-* the current user (Ajax)
-*
-* @file
-* @author Claire Figueras <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup apps
-*/
-require_once "core/class/class_security.php";
-require_once "core/class/class_core_tools.php";
-require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
-. DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR
-. 'class_business_app_tools.php';
+ * @brief Returns in a json structure all allowed first branches of a tree for
+ * the current user (Ajax)
+ *
+ * @file
+ *
+ * @author Claire Figueras <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup apps
+ */
+require_once 'core/class/class_security.php';
+require_once 'core/class/class_core_tools.php';
+require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR
+.'class_business_app_tools.php';
$appTools = new business_app_tools();
$core = new core_tools();
$core->load_lang();
@@ -52,62 +54,58 @@ $whereClause = $sec->get_where_clause_from_coll_id($_SESSION['collection_id_choi
which.style.display="block"
}
</script>
-<style type="text/css">.link_open{border-left:dashed 1px #FFC200;}li{cursor: pointer;}li.folder{list-style-image: url('static.php?filename=folder.gif');list-style-position: inside;margin-top: 10px;white-space: pre;}li.folder span:hover{background-color: #BAD1E2;padding:5px;border-radius:2px;}li.folder span{padding:5px;}ul.doc a{padding:5px;}ul.doc a:hover{background-color: #BAD1E2;border-radius:2px;}</style>
+<style type="text/css">.link_open{border-left:dashed 1px #F99830;}li{cursor: pointer;}li.folder{list-style-image: url('static.php?filename=folder.gif');list-style-position: inside;margin-top: 10px;white-space: pre;}li.folder span:hover{background-color: #BAD1E2;padding:5px;border-radius:2px;}li.folder span{padding:5px;}ul.doc a{padding:5px;}ul.doc a:hover{background-color: #BAD1E2;border-radius:2px;}</style>
<?php
$subject = $_REQUEST['project'];
$pattern = '/\([0-9]*\)/';
-preg_match($pattern, substr($subject,3), $matches, PREG_OFFSET_CAPTURE);
-$fold_id=str_replace("(", "", $matches[0][0]);
-$fold_id=str_replace(")", "", $fold_id);
+preg_match($pattern, substr($subject, 3), $matches, PREG_OFFSET_CAPTURE);
+$fold_id = str_replace('(', '', $matches[0][0]);
+$fold_id = str_replace(')', '', $fold_id);
//print_r($fold_id);
$entitiesTab = $sec->getEntitiesForCurrentUser();
-if($matches[0] != ''){
- $stmt = $db->query(
- "SELECT folders_system_id, folder_name, parent_id FROM folders WHERE foldertype_id not in (100) AND folders_system_id IN (?) AND status NOT IN ('DEL') order by folder_id asc ", array($fold_id)
- );
-
-}else{
- if (!empty($entitiesTab)) {
- $stmt = $db->query(
- "SELECT folders_system_id, folder_name, parent_id FROM folders WHERE foldertype_id not in (100) AND parent_id=0 AND status NOT IN ('DEL')
+if ($matches[0] != '') {
+ $stmt = $db->query(
+ "SELECT folders_system_id, folder_name, parent_id FROM folders WHERE foldertype_id not in (100) AND folders_system_id IN (?) AND status NOT IN ('DEL') order by folder_id asc ", array($fold_id)
+ );
+} else {
+ if (!empty($entitiesTab)) {
+ $stmt = $db->query(
+ "SELECT folders_system_id, folder_name, parent_id FROM folders WHERE foldertype_id not in (100) AND parent_id=0 AND status NOT IN ('DEL')
AND (destination in (?) OR destination is null) order by folder_id asc ", [$entitiesTab]
- );
- } else {
- $stmt = $db->query(
- "SELECT folders_system_id, folder_name, parent_id FROM folders WHERE foldertype_id not in (100) AND parent_id=0 AND status NOT IN ('DEL') order by folder_id asc "
- );
- }
+ );
+ } else {
+ $stmt = $db->query(
+ "SELECT folders_system_id, folder_name, parent_id FROM folders WHERE foldertype_id not in (100) AND parent_id=0 AND status NOT IN ('DEL') order by folder_id asc "
+ );
+ }
}
$categories = array();
-$html.="<ul class='folder' id='folder_tree_content'>";
-while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
- if (empty($entitiesTab)) {
- $stmt2 = $db->query(
- "SELECT count(*) as total FROM res_view_letterbox WHERE folders_system_id in (?) AND (".$whereClause.") AND status NOT IN ('DEL')"
- , [$row['folders_system_id']]);
- } else {
- $stmt2 = $db->query(
- "SELECT count(*) as total FROM res_view_letterbox WHERE folders_system_id in (?) AND (".$whereClause."OR folder_destination IN (?)) AND status NOT IN ('DEL')"
- , [$row['folders_system_id'], $entitiesTab]);
- }
- $row2 = $stmt2->fetch(PDO::FETCH_ASSOC);
- $stmt3 = $db->query(
- "SELECT count(*) as total FROM folders WHERE foldertype_id not in (100) AND parent_id IN (?) AND status NOT IN ('DEL')"
- ,array($row['folders_system_id']));
- $row3 = $stmt3->fetch(PDO::FETCH_ASSOC);
+$html .= "<ul class='folder' id='folder_tree_content'>";
+while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+ if (empty($entitiesTab)) {
+ $stmt2 = $db->query(
+ 'SELECT count(*) as total FROM res_view_letterbox WHERE folders_system_id in (?) AND ('.$whereClause.") AND status NOT IN ('DEL')", [$row['folders_system_id']]);
+ } else {
+ $stmt2 = $db->query(
+ 'SELECT count(*) as total FROM res_view_letterbox WHERE folders_system_id in (?) AND ('.$whereClause."OR folder_destination IN (?)) AND status NOT IN ('DEL')", [$row['folders_system_id'], $entitiesTab]);
+ }
+ $row2 = $stmt2->fetch(PDO::FETCH_ASSOC);
+ $stmt3 = $db->query(
+ "SELECT count(*) as total FROM folders WHERE foldertype_id not in (100) AND parent_id IN (?) AND status NOT IN ('DEL')", array($row['folders_system_id']));
+ $row3 = $stmt3->fetch(PDO::FETCH_ASSOC);
- $folders_system_id=$row['folders_system_id'];
- $html.="<li id='".$row['folders_system_id']."' class='folder'>";
- $html.="<span onclick='get_folders(".functions::xssafe($folders_system_id).")'>"
- .functions::xssafe($row['folder_name'])
- ."</span><b>(<span>".functions::xssafe($row3['total'])
- ." "._MARKET."</span>, <span onclick='get_folder_docs(".functions::xssafe($folders_system_id).")'>"
- .functions::xssafe($row2['total'])." document(s)</span>)</b>";
- $html.="</li>";
+ $folders_system_id = $row['folders_system_id'];
+ $html .= "<li id='".$row['folders_system_id']."' class='folder'>";
+ $html .= "<span onclick='get_folders(".functions::xssafe($folders_system_id).")'>"
+ .functions::xssafe($row['folder_name'])
+ .'</span><b>(<span>'.functions::xssafe($row3['total'])
+ .' '._MARKET."</span>, <span onclick='get_folder_docs(".functions::xssafe($folders_system_id).")'>"
+ .functions::xssafe($row2['total']).' document(s)</span>)</b>';
+ $html .= '</li>';
}
-$html.="</ul>";
+$html .= '</ul>';
echo $html;
?>
diff --git a/modules/notifications/css/template.css b/modules/notifications/css/template.css
index 42ab59b277729a3cf65331dfd8705324d72e9b85..9263390d6c0ac0d2b16518af8c9f4dba4574f137 100755
--- a/modules/notifications/css/template.css
+++ b/modules/notifications/css/template.css
@@ -47,7 +47,7 @@ table {
th {
border: 1px;
- background-color : #16ADEB;
+ background-color : #135F7F;
text-align: center;
padding: 5px 10px 6px 20px;
vertical-align: middle;
@@ -70,7 +70,7 @@ a, a:link, a:visited, a:hover {
}
a:hover {
- color: #1B99C4;
+ color: #135F7F;
}
diff --git a/modules/notifications/schedule_notifications.php b/modules/notifications/schedule_notifications.php
index 65ade7215699fe6f49df610def64af29f1f1357f..97713cb7396b6cb80a54aa31e4179fae0fc93c53 100755
--- a/modules/notifications/schedule_notifications.php
+++ b/modules/notifications/schedule_notifications.php
@@ -20,16 +20,17 @@
*/
/**
-* @brief schedule notifications
-*
-*
-* @file
-* @author <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup admin
-*/
-
+ * @brief schedule notifications
+ *
+ *
+ * @file
+ *
+ * @author <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup admin
+ */
$core_tools = new core_tools();
$core_tools->test_user();
$core_tools->test_admin('admin_notif', 'notifications');
@@ -49,10 +50,10 @@ require_once 'modules/notifications/class/class_schedule_notifications.php';
$level = $_REQUEST['level'];
}
- $pagePath = $_SESSION['config']['businessappurl'] . 'index.php?page='
- . 'schedule_notifications&module=notifications' ;
+ $pagePath = $_SESSION['config']['businessappurl'].'index.php?page='
+ .'schedule_notifications&module=notifications';
$pageLabel = _SCHEDULE_NOTIFICATIONS;
- $pageId = "schedule_notifications";
+ $pageId = 'schedule_notifications';
$ct = new core_tools();
$ct->manage_location_bar($pagePath, $pageLabel, $pageId, $init, $level);
/***********************************************************/
@@ -60,7 +61,7 @@ require_once 'modules/notifications/class/class_schedule_notifications.php';
?>
<h1>
<i class='fa fa-clock-o fa-2x'></i>
- <?php echo _SCHEDULE_NOTIFICATIONS;?>
+ <?php echo _SCHEDULE_NOTIFICATIONS; ?>
</h1>
<?php
@@ -74,7 +75,7 @@ $flag_notif = false;
?>
<script>
- var linecount = <?php echo count($data);?>;
+ var linecount = <?php echo count($data); ?>;
function add_cronLine(){
$("cron").innerHTML += "<tr id='row-"+linecount+"'>\
@@ -82,89 +83,110 @@ $flag_notif = false;
<select name='data["+linecount+"][h]'>\
<option value=\"*\">*</option>\
<?php
- for($iHours=0;$iHours<24;$iHours++){?>\
- <option value='<?php functions::xecho($iHours);?>'\
- <?php if ($iHours == $e['h']) { ?>\
+ for ($iHours = 0; $iHours < 24; ++$iHours) {
+ ?>\
+ <option value='<?php functions::xecho($iHours); ?>'\
+ <?php if ($iHours == $e['h']) {
+ ?>\
selected=\"selected\"\
- <?php } ?>\
+ <?php
+ } ?>\
>\
- <?php functions::xecho($iHours);?>\
+ <?php functions::xecho($iHours); ?>\
</option>\
- <?php } ?>\
+ <?php
+ } ?>\
</select>\
</td>\
<td width=\"10%\">\
<select name='data["+linecount+"][m]'>\
<option value=\"*\">*</option>\
<?php
- for($iMinutes=0;$iMinutes<60;$iMinutes++){ ?>\
- <option value='<?php functions::xecho($iMinutes);?>'\
- <?php if ($iMinutes == $e['m']) { ?>\
+ for ($iMinutes = 0; $iMinutes < 60; ++$iMinutes) {
+ ?>\
+ <option value='<?php functions::xecho($iMinutes); ?>'\
+ <?php if ($iMinutes == $e['m']) {
+ ?>\
selected=\"selected\"\
- <?php } ?>\
+ <?php
+ } ?>\
>\
- <?php functions::xecho($iMinutes);?>\
+ <?php functions::xecho($iMinutes); ?>\
</option>\
- <?php } ?>\
+ <?php
+ } ?>\
</select>\
</td>\
<td width=\"10%\">\
<select name='data["+linecount+"][dom]'>\
<option value=\"*\">*</option>\
<?php
- for($iDay=1;$iDay<32;$iDay++){ ?>\
- <option value='<?php functions::xecho($iDay);?>'\
- <?php if ($iDay == $e['dom']) { ?>\
+ for ($iDay = 1; $iDay < 32; ++$iDay) {
+ ?>\
+ <option value='<?php functions::xecho($iDay); ?>'\
+ <?php if ($iDay == $e['dom']) {
+ ?>\
selected=\"selected\"\
- <?php } ?>\
+ <?php
+ } ?>\
>\
- <?php functions::xecho($iDay);?>\
+ <?php functions::xecho($iDay); ?>\
</option>\
- <?php } ?>\
+ <?php
+ } ?>\
</select>\
</td>\
<td width=\"15%\">\
<select name='data["+linecount+"][mon]'>\
<option value =\"*\">*</option>\
<?php $month_array = array(1 => _JANUARY, _FEBRUARY, _MARCH, _APRIL, _MAY, _JUNE, _JULY, _AUGUST, _SEPTEMBER, _OCTOBER, _NOVEMBER, _DECEMBER);
- for($iMonth=1;$iMonth<13;$iMonth++) {
- ?> <option value=\"<?php functions::xecho($iMonth);?>\"\
- <?php if ($iMonth == $e['mon']) { ?>\
+ for ($iMonth = 1; $iMonth < 13; ++$iMonth) {
+ ?> <option value=\"<?php functions::xecho($iMonth); ?>\"\
+ <?php if ($iMonth == $e['mon']) {
+ ?>\
selected=\"selected\"\
- <?php } ?>\
+ <?php
+ } ?>\
>\
- <?php functions::xecho($month_array[$iMonth]);?>\
+ <?php functions::xecho($month_array[$iMonth]); ?>\
</option>\
- <?php } ?>\
+ <?php
+ } ?>\
</select>\
</td>\
<td width=\"20%\">\
<select name='data["+linecount+"][dow]'>\
<option value =\"*\">*</option>\
<?php $weekday_array = array(1 => _MONDAY, _TUESDAY, _WEDNESDAY, _THURSDAY, _FRIDAY, _SATURDAY, _SUNDAY);
- for($iWeekDay=1;$iWeekDay<8;$iWeekDay++) {
- ?> <option value=\"<?php functions::xecho($iWeekDay);?>\"\
- <?php if ($iWeekDay == $e['dow']) { ?>\
+ for ($iWeekDay = 1; $iWeekDay < 8; ++$iWeekDay) {
+ ?> <option value=\"<?php functions::xecho($iWeekDay); ?>\"\
+ <?php if ($iWeekDay == $e['dow']) {
+ ?>\
selected=\"selected\"\
- <?php } ?>\
+ <?php
+ } ?>\
>\
- <?php functions::xecho($weekday_array[$iWeekDay]);?>\
+ <?php functions::xecho($weekday_array[$iWeekDay]); ?>\
</option>\
- <?php } ?>\
+ <?php
+ } ?>\
</select>\
</td>\
<td width=\"40%\">\
<select style=\"width:100%\" name='data["+linecount+"][cmd]'>\
- <option><?php echo _CHOOSE_NOTIF;?></option>\
+ <option><?php echo _CHOOSE_NOTIF; ?></option>\
<?php foreach ($notifications as $key => $value) {
- ?><option value=\"<?php functions::xecho($key);?>\"\
- <?php if ($key == $e['cmd']) { ?>\
+ ?><option value=\"<?php functions::xecho($key); ?>\"\
+ <?php if ($key == $e['cmd']) {
+ ?>\
selected=\"selected\"\
- <?php } ?>\
+ <?php
+ } ?>\
>\
- <?php functions::xecho($value);?>\
+ <?php functions::xecho($value); ?>\
</option>\
- <?php } ?>\
+ <?php
+ } ?>\
</select></td>\
<td width=\"20px\" align=\"center\">\
<input type='hidden' id='state-"+linecount+"' name='data["+linecount+"][state]' value='new' />\
@@ -178,152 +200,173 @@ $flag_notif = false;
<div class="block" style="margin-top:15px;">
<br/>
<br/>
-<?php echo _HELP_CRON;?>
+<?php echo _HELP_CRON; ?>
<br/>
<br/>
<div class='crontab'>
- <form method='POST' class="forms" action="<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&module=notifications&page=schedule_notifications_controler">
+ <form method='POST' class="forms" action="<?php echo $_SESSION['config']['businessappurl']; ?>index.php?display=true&module=notifications&page=schedule_notifications_controler">
<table id='cron'>
<tr>
- <td style="color:#16adeb"><?php echo _HOUR ?></td>
- <td width="10%" style="color:#16adeb"><?php echo _MINUTE ?></td>
- <td width="10%" style="color:#16adeb"><?php echo _DAY ?></td>
- <td width="15%" style="color:#16adeb"><?php echo _MONTH ?></td>
- <td width="20%" style="color:#16adeb"><?php echo _WEEKDAY ?></td>
- <td width="40%" style="color:#16adeb"><?php echo _NOTIF_DESCRIPTION ?></td>
+ <td style="color:#135F7F"><?php echo _HOUR; ?></td>
+ <td width="10%" style="color:#135F7F"><?php echo _MINUTE; ?></td>
+ <td width="10%" style="color:#135F7F"><?php echo _DAY; ?></td>
+ <td width="15%" style="color:#135F7F"><?php echo _MONTH; ?></td>
+ <td width="20%" style="color:#135F7F"><?php echo _WEEKDAY; ?></td>
+ <td width="40%" style="color:#135F7F"><?php echo _NOTIF_DESCRIPTION; ?></td>
<td></td>
</tr>
- <?php foreach ($data as $id => $e) {
-
- if ($e['state'] == "hidden") {?>
- <tr id='row-<?php functions::xecho($id);?>' style="display:none">
+ <?php foreach ($data as $id => $e) {
+ if ($e['state'] == 'hidden') {
+ ?>
+ <tr id='row-<?php functions::xecho($id); ?>' style="display:none">
<td>
- <input name='data[<?php functions::xecho($id);?>][h]' value="<?php functions::xecho($e['h']);?>">
+ <input name='data[<?php functions::xecho($id); ?>][h]' value="<?php functions::xecho($e['h']); ?>">
</td>
<td width="10%">
- <input name='data[<?php functions::xecho($id);?>][m]' value="<?php functions::xecho($e['m']);?>">
+ <input name='data[<?php functions::xecho($id); ?>][m]' value="<?php functions::xecho($e['m']); ?>">
</td>
<td width="10%">
- <input name='data[<?php functions::xecho($id);?>][dom]' value="<?php functions::xecho($e['dom']);?>">
+ <input name='data[<?php functions::xecho($id); ?>][dom]' value="<?php functions::xecho($e['dom']); ?>">
</td>
<td width="15%">
- <input name='data[<?php functions::xecho($id);?>][mon]' value="<?php functions::xecho($e['mon']);?>">
+ <input name='data[<?php functions::xecho($id); ?>][mon]' value="<?php functions::xecho($e['mon']); ?>">
</td>
<td width="20%">
- <input name='data[<?php functions::xecho($id);?>][dow]' value="<?php functions::xecho($e['dow']);?>">
+ <input name='data[<?php functions::xecho($id); ?>][dow]' value="<?php functions::xecho($e['dow']); ?>">
</td>
<td width="40%">
- <input name='data[<?php functions::xecho($id);?>][cmd]' value="<?php functions::xecho($e['cmd']);?>">
+ <input name='data[<?php functions::xecho($id); ?>][cmd]' value="<?php functions::xecho($e['cmd']); ?>">
</td>
<td width="20px" align="center">
- <input type='hidden' id='state-<?php functions::xecho($id);?>' name='data[<?php functions::xecho($id);?>][state]' value='hidden' />
+ <input type='hidden' id='state-<?php functions::xecho($id); ?>' name='data[<?php functions::xecho($id); ?>][state]' value='hidden' />
</td>
</tr>
<?php
- } else {
- $flag_notif = true;
-
- ?>
- <tr id='row-<?php functions::xecho($id);?>'>
+ } else {
+ $flag_notif = true; ?>
+ <tr id='row-<?php functions::xecho($id); ?>'>
<td>
- <select name='data[<?php functions::xecho($id);?>][h]'>
+ <select name='data[<?php functions::xecho($id); ?>][h]'>
<option value="*">*</option>
<?php
- for($iHours=0;$iHours<24;$iHours++){?>
- <option value='<?php functions::xecho($iHours);?>'
- <?php if ((string)$iHours == $e['h']) { ?>
+ for ($iHours = 0; $iHours < 24; ++$iHours) {
+ ?>
+ <option value='<?php functions::xecho($iHours); ?>'
+ <?php if ((string) $iHours == $e['h']) {
+ ?>
selected="selected"
- <?php } ?>
+ <?php
+ } ?>
>
- <?php functions::xecho($iHours);?>
+ <?php functions::xecho($iHours); ?>
</option>
- <?php } ?>
+ <?php
+ } ?>
</select>
</td>
<td width="10%">
- <select name='data[<?php functions::xecho($id);?>][m]'>
+ <select name='data[<?php functions::xecho($id); ?>][m]'>
<option value="*">*</option>
<?php
- for($iMinutes=0;$iMinutes<60;$iMinutes++){ ?>
- <option value='<?php functions::xecho($iMinutes);?>'
- <?php if ((string)$iMinutes == $e['m']) { ?>
+ for ($iMinutes = 0; $iMinutes < 60; ++$iMinutes) {
+ ?>
+ <option value='<?php functions::xecho($iMinutes); ?>'
+ <?php if ((string) $iMinutes == $e['m']) {
+ ?>
selected="selected"
- <?php } ?>
+ <?php
+ } ?>
>
- <?php functions::xecho($iMinutes);?>
+ <?php functions::xecho($iMinutes); ?>
</option>
- <?php } ?>
+ <?php
+ } ?>
</select>
</td>
<td width="10%">
- <select name='data[<?php functions::xecho($id);?>][dom]'>
+ <select name='data[<?php functions::xecho($id); ?>][dom]'>
<option value="*">*</option>
<?php
- for($iDay=1;$iDay<32;$iDay++){ ?>
- <option value='<?php functions::xecho($iDay);?>'
- <?php if ($iDay == $e['dom']) { ?>
+ for ($iDay = 1; $iDay < 32; ++$iDay) {
+ ?>
+ <option value='<?php functions::xecho($iDay); ?>'
+ <?php if ($iDay == $e['dom']) {
+ ?>
selected="selected"
- <?php } ?>
+ <?php
+ } ?>
>
- <?php functions::xecho($iDay);?>
+ <?php functions::xecho($iDay); ?>
</option>
- <?php } ?>
+ <?php
+ } ?>
</select>
</td>
<td width="15%">
- <select name='data[<?php functions::xecho($id);?>][mon]'>
+ <select name='data[<?php functions::xecho($id); ?>][mon]'>
<option value ="*">*</option>
<?php $month_array = array(1 => _JANUARY, _FEBRUARY, _MARCH, _APRIL, _MAY, _JUNE, _JULY, _AUGUST, _SEPTEMBER, _OCTOBER, _NOVEMBER, _DECEMBER);
- for($iMonth=1;$iMonth<13;$iMonth++) {
- ?> <option value="<?php functions::xecho($iMonth);?>"
- <?php if ($iMonth == $e['mon']) { ?>
+ for ($iMonth = 1; $iMonth < 13; ++$iMonth) {
+ ?> <option value="<?php functions::xecho($iMonth); ?>"
+ <?php if ($iMonth == $e['mon']) {
+ ?>
selected="selected"
- <?php } ?>
+ <?php
+ } ?>
>
- <?php functions::xecho($month_array[$iMonth]);?>
+ <?php functions::xecho($month_array[$iMonth]); ?>
</option>
- <?php } ?>
+ <?php
+ } ?>
</select>
</td>
<td width="20%">
- <select name='data[<?php functions::xecho($id);?>][dow]'>
+ <select name='data[<?php functions::xecho($id); ?>][dow]'>
<option value ="*">*</option>
<?php $weekday_array = array(1 => _MONDAY, _TUESDAY, _WEDNESDAY, _THURSDAY, _FRIDAY, _SATURDAY, _SUNDAY);
- for($iWeekDay=1;$iWeekDay<8;$iWeekDay++) {
- ?> <option value="<?php functions::xecho($iWeekDay);?>"
- <?php if ($iWeekDay == $e['dow']) { ?>
+ for ($iWeekDay = 1; $iWeekDay < 8; ++$iWeekDay) {
+ ?> <option value="<?php functions::xecho($iWeekDay); ?>"
+ <?php if ($iWeekDay == $e['dow']) {
+ ?>
selected="selected"
- <?php } ?>
+ <?php
+ } ?>
>
- <?php functions::xecho($weekday_array[$iWeekDay]);?>
+ <?php functions::xecho($weekday_array[$iWeekDay]); ?>
</option>
- <?php } ?>
+ <?php
+ } ?>
</select>
</td>
<td width="40%">
- <select style="width:100%" name='data[<?php functions::xecho($id);?>][cmd]'>
- <option><?php echo _CHOOSE_NOTIF;?></option>
+ <select style="width:100%" name='data[<?php functions::xecho($id); ?>][cmd]'>
+ <option><?php echo _CHOOSE_NOTIF; ?></option>
<?php foreach ($notifications as $key => $value) {
- ?><option value="<?php functions::xecho($key);?>"
- <?php if ($key == $e['cmd']) { ?>
+ ?><option value="<?php functions::xecho($key); ?>"
+ <?php if ($key == $e['cmd']) {
+ ?>
selected="selected"
- <?php } ?>
+ <?php
+ } ?>
>
- <?php functions::xecho($value);?>
+ <?php functions::xecho($value); ?>
</option>
- <?php } ?>
+ <?php
+ } ?>
</select>
</td>
<td width="20px" align="center">
- <input type='hidden' id='state-<?php functions::xecho($id);?>' name='data[<?php functions::xecho($id);?>][state]' value='normal' />
- <i class='fa fa-remove fa-2x' onclick='del(<?php functions::xecho($id);?>);' onmouseover="this.style.cursor='pointer'"></i>
+ <input type='hidden' id='state-<?php functions::xecho($id); ?>' name='data[<?php functions::xecho($id); ?>][state]' value='normal' />
+ <i class='fa fa-remove fa-2x' onclick='del(<?php functions::xecho($id); ?>);' onmouseover="this.style.cursor='pointer'"></i>
</td>
</tr>
<?php
- }
- } ?>
+ }
+ } ?>
</table>
- <span <?php if($flag_notif){?> style="display:none" <?php } ;?> id="no_notif">
+ <span <?php if ($flag_notif) {
+ ?> style="display:none" <?php
+ } ?> id="no_notif">
<i><?php echo _NO_NOTIF;?></i>
</span><br/>
<i class='fa fa-plus-square fa-2x' onclick='add_cronLine();' onmouseover="this.style.cursor='pointer'"></i>
diff --git a/modules/tags/css/template.css b/modules/tags/css/template.css
index 42ab59b277729a3cf65331dfd8705324d72e9b85..9263390d6c0ac0d2b16518af8c9f4dba4574f137 100755
--- a/modules/tags/css/template.css
+++ b/modules/tags/css/template.css
@@ -47,7 +47,7 @@ table {
th {
border: 1px;
- background-color : #16ADEB;
+ background-color : #135F7F;
text-align: center;
padding: 5px 10px 6px 20px;
vertical-align: middle;
@@ -70,7 +70,7 @@ a, a:link, a:visited, a:hover {
}
a:hover {
- color: #1B99C4;
+ color: #135F7F;
}
diff --git a/modules/tags/manage_tag_list.php b/modules/tags/manage_tag_list.php
index f785523049260324195af5ae62bc761f68ce9684..959e847ec5605ad9a71f6758c715d45bc85e6429 100755
--- a/modules/tags/manage_tag_list.php
+++ b/modules/tags/manage_tag_list.php
@@ -4,11 +4,12 @@
* See LICENCE.txt file at the root folder for more details.
* This file is part of Maarch software.
+*
* @brief managage_tag_list
+*
* @author dev <dev@maarch.org>
* @ingroup tags
*/
-
if ($mode == 'list') {
$list = new list_show();
$list->admin_list(
@@ -46,204 +47,195 @@ if ($mode == 'list') {
echo _MODIFY_TAG;
} elseif ($mode == 'add') {
echo _ADD_TAG;
- }?>
+ } ?>
</h1>
<div id="inner_content" class="clearfix" align="center">
<br />
<?php
if ($state == false) {
- echo '<br /><br /><br /><br />' . _THIS_EVENT . ' ' . _IS_UNKNOWN
- . '<br /><br /><br /><br />';
- } else { ?>
+ echo '<br /><br /><br /><br />'._THIS_EVENT.' '._IS_UNKNOWN
+ .'<br /><br /><br /><br />';
+ } else {
+ ?>
<div class="block">
<form name="frmevent" id="frmevent" method="post" action="<?php
- echo $_SESSION['config']['businessappurl'] . 'index.php?display=true'
- . '&module=tags&page=manage_tag_list_controller&mode='
- . $mode;?>" class="forms addforms">
+ echo $_SESSION['config']['businessappurl'].'index.php?display=true'
+ .'&module=tags&page=manage_tag_list_controller&mode='
+ .$mode; ?>" class="forms addforms">
<input type="hidden" name="display" value="true" />
<input type="hidden" name="admin" value="tags" />
<input type="hidden" name="page" value="manage_tag_list_controler" />
- <input type="hidden" name="mode" value="<?php functions::xecho($mode);?>" />
+ <input type="hidden" name="mode" value="<?php functions::xecho($mode); ?>" />
- <input type="hidden" name="tag_id" id="tag_label" value="<?php functions::xecho($_SESSION['m_admin']['tag']['tag_id']);?>" />
+ <input type="hidden" name="tag_id" id="tag_label" value="<?php functions::xecho($_SESSION['m_admin']['tag']['tag_id']); ?>" />
<input type="hidden" name="order" id="order" value="<?php
- functions::xecho($_REQUEST['order']);?>" />
+ functions::xecho($_REQUEST['order']); ?>" />
<input type="hidden" name="order_field" id="order_field" value="<?php
- functions::xecho($_REQUEST['order_field']);?>" />
+ functions::xecho($_REQUEST['order_field']); ?>" />
<input type="hidden" name="what" id="what" value="<?php
- functions::xecho($_REQUEST['what']);?>" />
+ functions::xecho($_REQUEST['what']); ?>" />
<input type="hidden" name="start" id="start" value="<?php
- functions::xecho($_REQUEST['start']);?>" />
+ functions::xecho($_REQUEST['start']); ?>" />
<p>
- <label for="label"><?php echo _ID;?> : </label>
+ <label for="label"><?php echo _ID; ?> : </label>
<input name="tag_label" type="text" id="tag_label_id" class="readonly" readonly="readonly" value="<?php
- echo $_SESSION['m_admin']['tag']['tag_id'];?>"/>
+ echo $_SESSION['m_admin']['tag']['tag_id']; ?>"/>
</p>
<p>
- <label for="label"><?php echo _NAME_TAGS;?> : </label>
+ <label for="label"><?php echo _NAME_TAGS; ?> : </label>
<input name="tag_label" type="text" id="tag_label_id" value="<?php
echo functions::show_str(
$_SESSION['m_admin']['tag']['tag_label']
- );?>"/>
+ ); ?>"/>
</p>
<?php
- if($core->test_service('private_tag', 'tags',false) == 1){
- ?>
+ if ($core->test_service('private_tag', 'tags', false) == 1) {
+ ?>
<p>
- <label for="label"><?php echo _VISIBLE_BY;?> : </label>
+ <label for="label"><?php echo _VISIBLE_BY; ?> : </label>
<?php
- require_once "modules".DIRECTORY_SEPARATOR."entities".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."EntityControler.php";
-
- $content .= '<select data-placeholder=" " name="entitieslist[]" id="entitieslist" size="7" style="width: 206px" ';
- $content .= 'ondblclick=\'moveclick($(entitieslist), $(entities_chosen));\' multiple="multiple">';
-
- //entitiesRestriction
- $entitiesRestriction = array();
- $entitiesDirection = users_controler::getParentEntitiesWithType($_SESSION['user']['UserId'],'Direction');
- //var_dump($entitiesDirection);
- foreach ($entitiesDirection as $entity_id) {
- $entitiesRestriction[] = $entity_id;
- $tmp_arr = users_entities_Abstract::getEntityChildren($entity_id);
- $entitiesRestriction = array_merge($entitiesRestriction,$tmp_arr);
- }
- //entitiesList
- $entitiesList = array();
- //$entitiesList = EntityControler::getAllEntities();
- require_once('modules'.DIRECTORY_SEPARATOR."entities".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_entities.php");
- $ent = new entity();
- $except = array();
- $entitiesList = $ent->getShortEntityTree($entitiesList, 'all', '', $except );
- for ($i=0;$i<count($entitiesList);$i++) {
+ require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'EntityControler.php';
+
+ $content .= '<select data-placeholder=" " name="entitieslist[]" id="entitieslist" size="7" style="width: 206px" ';
+ $content .= 'ondblclick=\'moveclick($(entitieslist), $(entities_chosen));\' multiple="multiple">';
- $content .= '<option value="'
+ //entitiesRestriction
+ $entitiesRestriction = array();
+ $entitiesDirection = users_controler::getParentEntitiesWithType($_SESSION['user']['UserId'], 'Direction');
+ //var_dump($entitiesDirection);
+ foreach ($entitiesDirection as $entity_id) {
+ $entitiesRestriction[] = $entity_id;
+ $tmp_arr = users_entities_Abstract::getEntityChildren($entity_id);
+ $entitiesRestriction = array_merge($entitiesRestriction, $tmp_arr);
+ }
+ //entitiesList
+ $entitiesList = array();
+ //$entitiesList = EntityControler::getAllEntities();
+ require_once 'modules'.DIRECTORY_SEPARATOR.'entities'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_entities.php';
+ $ent = new entity();
+ $except = array();
+ $entitiesList = $ent->getShortEntityTree($entitiesList, 'all', '', $except);
+ for ($i = 0; $i < count($entitiesList); ++$i) {
+ $content .= '<option value="'
.$entitiesList[$i]['ID'].'" alt="'
.$entitiesList[$i]['LABEL'].'" title="'
.$entitiesList[$i]['LABEL'].'"';
- if ($mode == 'add') {
- if($_SESSION['user']['UserId'] != 'superadmin'){
- if(in_array($entitiesList[$i]['ID'], $entitiesRestriction)){
+ if ($mode == 'add') {
+ if ($_SESSION['user']['UserId'] != 'superadmin') {
+ if (in_array($entitiesList[$i]['ID'], $entitiesRestriction)) {
+ $content .= 'selected="selected"';
+ } else {
+ $content .= 'disabled="disabled"';
+ }
+ }
+ } else {
+ if (in_array($entitiesList[$i]['ID'], $_SESSION['m_admin']['tag']['entities'])) {
$content .= 'selected="selected"';
- }else{
- $content .= 'disabled="disabled"';
- }
- }
-
- }else{
- if(in_array($entitiesList[$i]['ID'], $_SESSION['m_admin']['tag']['entities'])){
- $content .= 'selected="selected"';
- }
- if(!in_array($entitiesList[$i]['ID'], $entitiesRestriction) && $_SESSION['user']['UserId'] != 'superadmin'){
- $content .= 'disabled="disabled"';
+ }
+ if (!in_array($entitiesList[$i]['ID'], $entitiesRestriction) && $_SESSION['user']['UserId'] != 'superadmin') {
+ $content .= 'disabled="disabled"';
+ }
}
-
- }
- $content .= '>';
- $content .= $entitiesList[$i]['LABEL'].'</option>';
-
- }
- $content .= '</select>';
- $content .= '<p style="text-align: right;margin-right: 20px;"><a style="cursor: pointer;" onclick="resetSelect(\'entitieslist\')">'._UNSELECT_ALL.'</a></p>';
- $content .= '<script> $j("#entitieslist").chosen({width: "95%", disable_search_threshold: 10, search_contains: true,display_disabled_options: false});</script>';
- echo $content;
- ?>
+ $content .= '>';
+ $content .= $entitiesList[$i]['LABEL'].'</option>';
+ }
+ $content .= '</select>';
+ $content .= '<p style="text-align: right;margin-right: 20px;"><a style="cursor: pointer;" onclick="resetSelect(\'entitieslist\')">'._UNSELECT_ALL.'</a></p>';
+ $content .= '<script> $j("#entitieslist").chosen({width: "95%", disable_search_threshold: 10, search_contains: true,display_disabled_options: false});</script>';
+ echo $content; ?>
</p>
- <?php } ?>
+ <?php
+ } ?>
<?php
- if ($mode == 'up') { ?>
+ if ($mode == 'up') {
+ ?>
<!--<p>
- <label for="label"><?php echo _COLL_ID;?> : </label>
+ <label for="label"><?php echo _COLL_ID; ?> : </label>
<span><?php
echo functions::show_str(
$_SESSION['m_admin']['tag']['tag_coll']
- );?>
+ ); ?>
</span>
</p>-->
<?php
} else {
- $arrayColl = $_SESSION['m_admin']['tags']['coll_id'];
- ?>
+ $arrayColl = $_SESSION['m_admin']['tags']['coll_id']; ?>
<p>
- <label for="collection"><?php echo _COLLECTION;?> : </label>
+ <label for="collection"><?php echo _COLLECTION; ?> : </label>
<select disabled name="collection" id="collection" >
- <!--<option value="" ><?php echo _CHOOSE_COLLECTION;?></option>-->
+ <!--<option value="" ><?php echo _CHOOSE_COLLECTION; ?></option>-->
<?php
- for ($i = 0; $i < count($arrayColl); $i ++) {
+ for ($i = 0; $i < count($arrayColl); ++$i ) {
?>
<option value="<?php
- functions::xecho($arrayColl[$i]['id']);
- ?>" <?php
+ functions::xecho($arrayColl[$i]['id']); ?>" <?php
if (isset($_SESSION['m_admin']['doctypes']['COLL_ID'])
&& $_SESSION['m_admin']['doctypes']['COLL_ID'] == $arrayColl[$i]['id']
) {
echo 'selected="selected"';
- }
- ?> ><?php functions::xecho($arrayColl[$i]['label']);?></option>
+ } ?> ><?php functions::xecho($arrayColl[$i]['label']); ?></option>
<?php
- }
-
- ?>
+ } ?>
</select>
</p>
<?php
}
- if ($mode == 'up') { ?>
- <p style="font-style: italic;color:#009DC5;">
+ if ($mode == 'up') {
+ ?>
+ <p style="font-style: italic;color:#135F7F;">
<span><?php
- echo $_SESSION['m_admin']['tag']['tag_count'].' '._NB_DOCS_FOR_THIS_TAG;?>
+ echo $_SESSION['m_admin']['tag']['tag_count'].' '._NB_DOCS_FOR_THIS_TAG; ?>
</span>
</p>
<?php
- }
- ?>
+ } ?>
<p class="buttons">
<?php
- if ($mode == 'up') { ?>
+ if ($mode == 'up') {
+ ?>
<input class="button" type="submit" name="tag_submit" value=
- "<?php echo _MODIFY;?>" />
+ "<?php echo _MODIFY; ?>" />
<?php
- } elseif ($mode == 'add') { ?>
+ } elseif ($mode == 'add') {
+ ?>
<input type="submit" class="button" name="tag_submit" value=
- "<?php echo _ADD;?>" />
+ "<?php echo _ADD; ?>" />
<?php
- }
- ?>
+ } ?>
<input type="button" class="button" name="cancel" value="<?php
- echo _CANCEL;?>" onclick="javascript:window.location.href='<?php
- echo $_SESSION['config']['businessappurl'];
- ?>index.php?page=manage_tag_list_controller&mode=list&module=tags'"/>
+ echo _CANCEL; ?>" onclick="javascript:window.location.href='<?php
+ echo $_SESSION['config']['businessappurl']; ?>index.php?page=manage_tag_list_controller&mode=list&module=tags'"/>
<?php
if ($mode == 'up') {
?>
<hr/>
<p>
- <label for="label"><?php echo _TAG_FUSION_ACTIONLABEL;?> : </label>
+ <label for="label"><?php echo _TAG_FUSION_ACTIONLABEL; ?> : </label>
<select name="tagfusion" id="tagfusion">
<?php
foreach ($_SESSION['tmp_all_tags'] as $tmp_selectvalue_tag) {
- if($tmp_selectvalue_tag['tag_id'] <> $_SESSION['m_admin']['tag']['tag_id']){
- ?>
- <option value="<?php functions::xecho($tmp_selectvalue_tag['tag_id']);?>">
+ if ($tmp_selectvalue_tag['tag_id'] != $_SESSION['m_admin']['tag']['tag_id']) {
+ ?>
+ <option value="<?php functions::xecho($tmp_selectvalue_tag['tag_id']); ?>">
<?php //functions::xecho($tmp_selectvalue_tag['tag_label']." ::".$tmp_selectvalue_tag['coll_id']);?>
- <?php functions::xecho($tmp_selectvalue_tag['tag_label']);?>
+ <?php functions::xecho($tmp_selectvalue_tag['tag_label']); ?>
</option>
<?php
}
- }
- ?>
+ } ?>
</select>
<input type="button" class="button" name="cancel" style="border-radius:8px;font-size:8px;"
- onclick = "tag_fusion('<?php echo $_SESSION['m_admin']['tag']['tag_id'];?>',
- $('tagfusion').value, <?php functions::xecho($route_tag_fusion_tags);?>,'<?php
- echo _TAGFUSION_GOODRESULT;?>' , '<?php
- echo $_SESSION['config']['businessappurl'] . 'index.php?page=manage_tag_list_controller&module=tags'
- ?>');" value="<?php echo _TAGFUSION;?> ">
+ onclick = "tag_fusion('<?php echo $_SESSION['m_admin']['tag']['tag_id']; ?>',
+ $('tagfusion').value, <?php functions::xecho($route_tag_fusion_tags); ?>,'<?php
+ echo _TAGFUSION_GOODRESULT; ?>' , '<?php
+ echo $_SESSION['config']['businessappurl'].'index.php?page=manage_tag_list_controller&module=tags'; ?>');" value="<?php echo _TAGFUSION; ?> ">
</p>
<?php
@@ -252,6 +244,5 @@ if ($mode == 'list') {
</form >
</div>
<?php
- }
- ?></div><?php
+ } ?></div><?php
}
diff --git a/modules/templates/templates_management.php b/modules/templates/templates_management.php
index d78bd40f3fca062a2aacd1e62a4884d1d1b47f39..ac67f664299abe545b637178ca3de8b7bdda5d06 100755
--- a/modules/templates/templates_management.php
+++ b/modules/templates/templates_management.php
@@ -211,7 +211,7 @@ if ($mode == 'list') {
<?php
echo '<label for="template_style">'._TEMPLATE_STYLE.' : ';
if ($mode == 'add') {
- echo '<i id="template_style_icon" class="fa fa-paperclip fa-lg" title="'._LOADED_FILE.'" onclick="$j(\'#templateEditTr\').hide();$j(\'#addTemplateFile\').click();$(\'template_style_icon\').setStyle({color: \'#009DC5\'});$(\'template_style_icon2\').setStyle({color: \'#666\'});"></i> <i id="template_style_icon2" class="fa fa-file-text-o fa-lg" title="'._GENERATED_FILE.'" onclick="$j(\'#templateEditTr\').show();$j(\'#template_style\').show();$j(\'#addTemplate\').hide();$(\'template_style_icon\').setStyle({color: \'#666\'});$(\'template_style_icon2\').setStyle({color: \'#009DC5\'});" style="color:#009DC5"></i>';
+ echo '<i id="template_style_icon" class="fa fa-paperclip fa-lg" title="'._LOADED_FILE.'" onclick="$j(\'#templateEditTr\').hide();$j(\'#addTemplateFile\').click();$(\'template_style_icon\').setStyle({color: \'#135F7F\'});$(\'template_style_icon2\').setStyle({color: \'#666\'});"></i> <i id="template_style_icon2" class="fa fa-file-text-o fa-lg" title="'._GENERATED_FILE.'" onclick="$j(\'#templateEditTr\').show();$j(\'#template_style\').show();$j(\'#addTemplate\').hide();$(\'template_style_icon\').setStyle({color: \'#666\'});$(\'template_style_icon2\').setStyle({color: \'#135F7F\'});" style="color:#135F7F"></i>';
}
echo '</label>';
if ($mode == 'up') {
@@ -279,7 +279,7 @@ if ($mode == 'list') {
</span>
<?php if ($mode == 'up') {
?>
- <a href="#" onclick="$j('#addTemplateFile').click();$('template_style_icon').setStyle({color: '#009DC5'})" style="margin-left:15px">
+ <a href="#" onclick="$j('#addTemplateFile').click();$('template_style_icon').setStyle({color: '#135F7F'})" style="margin-left:15px">
<i id="template_style_icon" class="fa fa-paperclip fa-2x"></i> Importer un fichier
</a>
<input class="button" name="addTemplate" id="addTemplate" onclick="$j('#addTemplateFile').click();" style="display:none;margin-left:15px" value="+" type="button"/>
diff --git a/modules/thesaurus/autocomplete_thesaurus.php b/modules/thesaurus/autocomplete_thesaurus.php
index 068a670648ac6bd5971df959796f80058054c5d6..c18d283e00e303047dde1b2d2ab06aa31de1c9d0 100755
--- a/modules/thesaurus/autocomplete_thesaurus.php
+++ b/modules/thesaurus/autocomplete_thesaurus.php
@@ -19,53 +19,50 @@
*/
/**
-* @brief List of thesaurus for autocompletion
-*
-*
-* @file
-* @author Alex Orluc <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup admin
-*/
-if(isset($_REQUEST['Input'])){
+ * @brief List of thesaurus for autocompletion
+ *
+ *
+ * @file
+ *
+ * @author Alex Orluc <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup admin
+ */
+if (isset($_REQUEST['Input'])) {
$_REQUEST['what'] = $_REQUEST['Input'];
}
$db = new Database();
$stmt = $db->query(
- "SELECT distinct thesaurus_name,thesaurus_name_associate,thesaurus_id FROM thesaurus WHERE lower(thesaurus_name) like lower(?) OR lower(thesaurus_name_associate) like lower(?) order by thesaurus_name",
- array('%'.$_REQUEST['what'].'%','%'.$_REQUEST['what'].'%')
+ 'SELECT distinct thesaurus_name,thesaurus_name_associate,thesaurus_id FROM thesaurus WHERE lower(thesaurus_name) like lower(?) OR lower(thesaurus_name_associate) like lower(?) order by thesaurus_name',
+ array('%'.$_REQUEST['what'].'%', '%'.$_REQUEST['what'].'%')
);
$listArray = array();
echo "<ul>\n";
$authViewList = 0;
-while($line = $stmt->fetchObject())
-{
+while ($line = $stmt->fetchObject()) {
$default_thesarus_name = $line->thesaurus_name;
$line->thesaurus_name = str_replace(strtolower($_REQUEST['what']), '<b>'.strtolower($_REQUEST['what']).'</b>', strtolower($line->thesaurus_name));
$line->thesaurus_name_associate = str_replace($_REQUEST['what'], '<b>'.$_REQUEST['what'].'</b>', strtolower($line->thesaurus_name_associate));
-
- if($authViewList >= 10)
- {
+ if ($authViewList >= 10) {
$flagAuthView = true;
}
- echo "<li onclick=\"add_thes_by_autocomplete('".$line->thesaurus_id."');\" id=\"".$line->thesaurus_id.",\"><span title='terme'>".$line->thesaurus_name."</span>";
+ echo "<li onclick=\"add_thes_by_autocomplete('".$line->thesaurus_id."');\" id=\"".$line->thesaurus_id.",\"><span title='terme'>".$line->thesaurus_name.'</span>';
- if($line->thesaurus_name_associate != ""){
- echo " <i title='terme(s) associé(s)' style='color: #009dc5;font-size:10px;'>(".$line->thesaurus_name_associate.")</i></li>\n";
+ if ($line->thesaurus_name_associate != '') {
+ echo " <i title='terme(s) associé(s)' style='color: #135F7F;font-size:10px;'>(".$line->thesaurus_name_associate.")</i></li>\n";
}
- if(isset($flagAuthView))
- {
+ if (isset($flagAuthView)) {
echo "<li>...</li>\n";
break;
}
- $authViewList++;
-
+ ++$authViewList;
}
-echo "</ul>";
+echo '</ul>';
diff --git a/modules/thesaurus/manage_thesaurus_list_by_name.php b/modules/thesaurus/manage_thesaurus_list_by_name.php
index 421250b8499656927681efe4706d058838d661f9..4ccc8cdeed8fa7f02e16da98780669c7995e172b 100755
--- a/modules/thesaurus/manage_thesaurus_list_by_name.php
+++ b/modules/thesaurus/manage_thesaurus_list_by_name.php
@@ -19,49 +19,45 @@
*/
/**
-* @brief List of thesaurus for autocompletion
-*
-*
-* @file
-* @author Alex Orluc <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup admin
-*/
+ * @brief List of thesaurus for autocompletion
+ *
+ *
+ * @file
+ *
+ * @author Alex Orluc <dev@maarch.org>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup admin
+ */
$db = new Database();
$stmt = $db->query(
- "SELECT distinct thesaurus_name,thesaurus_name_associate FROM thesaurus WHERE lower(thesaurus_name) like lower(?) OR lower(thesaurus_name_associate) like lower(?) order by thesaurus_name",
- array('%'.$_REQUEST['what'].'%','%'.$_REQUEST['what'].'%')
+ 'SELECT distinct thesaurus_name,thesaurus_name_associate FROM thesaurus WHERE lower(thesaurus_name) like lower(?) OR lower(thesaurus_name_associate) like lower(?) order by thesaurus_name',
+ array('%'.$_REQUEST['what'].'%', '%'.$_REQUEST['what'].'%')
);
$listArray = array();
echo "<ul>\n";
$authViewList = 0;
-while($line = $stmt->fetchObject())
-{
-
+while ($line = $stmt->fetchObject()) {
$line->thesaurus_name = str_replace(strtolower($_REQUEST['what']), '<b>'.strtolower($_REQUEST['what']).'</b>', strtolower($line->thesaurus_name));
$line->thesaurus_name_associate = str_replace($_REQUEST['what'], '<b>'.$_REQUEST['what'].'</b>', strtolower($line->thesaurus_name_associate));
-
- if($authViewList >= 10)
- {
+ if ($authViewList >= 10) {
$flagAuthView = true;
}
- echo "<li><span title='terme'>".$line->thesaurus_name."</span>";
+ echo "<li><span title='terme'>".$line->thesaurus_name.'</span>';
- if($line->thesaurus_name_associate != ""){
- echo " <i title='terme(s) associé(s)' style='color: #009dc5;font-size:10px;'>(".$line->thesaurus_name_associate.")</i></li>\n";
+ if ($line->thesaurus_name_associate != '') {
+ echo " <i title='terme(s) associé(s)' style='color: #135F7F;font-size:10px;'>(".$line->thesaurus_name_associate.")</i></li>\n";
}
- if(isset($flagAuthView))
- {
+ if (isset($flagAuthView)) {
echo "<li>...</li>\n";
break;
}
- $authViewList++;
-
+ ++$authViewList;
}
-echo "</ul>";
+echo '</ul>';
diff --git a/modules/visa/class/class_modules_tools_Abstract.php b/modules/visa/class/class_modules_tools_Abstract.php
index a7e6f981a53139204c352de532322539dd8232df..357552fb455a0977130a1a51cd86a3bd60dbe0a5 100755
--- a/modules/visa/class/class_modules_tools_Abstract.php
+++ b/modules/visa/class/class_modules_tools_Abstract.php
@@ -19,1350 +19,1403 @@
*/
/**
-* @brief Contains the functions to manage visa and notice workflow.
-*
-* @file
-* @author Nicolas Couture <couture@docimsol.com>
-* @date $date$
-* @version $Revision$
-* @ingroup visa
-*/
-
-define('FPDF_FONTPATH',$core_path.'apps/maarch_entreprise/tools/pdfb/fpdf_1_7/font/');
-require($core_path.'apps/maarch_entreprise/tools/pdfb/fpdf_1_7/fpdf.php');
-require($core_path.'apps/maarch_entreprise/tools/pdfb/fpdf_1_7/fpdi.php');
+ * @brief Contains the functions to manage visa and notice workflow.
+ *
+ * @file
+ *
+ * @author Nicolas Couture <couture@docimsol.com>
+ * @date $date$
+ *
+ * @version $Revision$
+ * @ingroup visa
+ */
+define('FPDF_FONTPATH', $core_path.'apps/maarch_entreprise/tools/pdfb/fpdf_1_7/font/');
+require $core_path.'apps/maarch_entreprise/tools/pdfb/fpdf_1_7/fpdf.php';
+require $core_path.'apps/maarch_entreprise/tools/pdfb/fpdf_1_7/fpdi.php';
abstract class visa_Abstract extends Database
{
-
- var $errorMessageVisa;
-
- /***
- * Build Maarch module tables into sessions vars with a xml configuration file
- *
- *
- */
- public function build_modules_tables() {
- if (file_exists(
- $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR
- . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . "modules"
- . DIRECTORY_SEPARATOR . "visa" . DIRECTORY_SEPARATOR . "xml"
- . DIRECTORY_SEPARATOR . "config.xml"
+ public $errorMessageVisa;
+
+ /***
+ * Build Maarch module tables into sessions vars with a xml configuration file
+ *
+ *
+ */
+ public function build_modules_tables()
+ {
+ if (file_exists(
+ $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
+ .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'modules'
+ .DIRECTORY_SEPARATOR.'visa'.DIRECTORY_SEPARATOR.'xml'
+ .DIRECTORY_SEPARATOR.'config.xml'
)
) {
- $configPath = $_SESSION['config']['corepath'] . 'custom'
- . DIRECTORY_SEPARATOR . $_SESSION['custom_override_id']
- . DIRECTORY_SEPARATOR . "modules" . DIRECTORY_SEPARATOR
- . "visa" . DIRECTORY_SEPARATOR . "xml"
- . DIRECTORY_SEPARATOR . "config.xml";
+ $configPath = $_SESSION['config']['corepath'].'custom'
+ .DIRECTORY_SEPARATOR.$_SESSION['custom_override_id']
+ .DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR
+ .'visa'.DIRECTORY_SEPARATOR.'xml'
+ .DIRECTORY_SEPARATOR.'config.xml';
} else {
- $configPath = "modules" . DIRECTORY_SEPARATOR . "visa"
- . DIRECTORY_SEPARATOR . "xml" . DIRECTORY_SEPARATOR
- . "config.xml";
+ $configPath = 'modules'.DIRECTORY_SEPARATOR.'visa'
+ .DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR
+ .'config.xml';
}
-
- $xmlconfig = simplexml_load_file($configPath);
- $conf = $xmlconfig->CONFIG;
- $_SESSION['modules_loaded']['visa']['exeSign'] = (string) $conf->exeSign;
- $_SESSION['modules_loaded']['visa']['showAppletSign'] = (string) $conf->showAppletSign;
- $_SESSION['modules_loaded']['visa']['reason'] = (string) $conf->reason;
- $_SESSION['modules_loaded']['visa']['location'] = (string) $conf->location;
- $_SESSION['modules_loaded']['visa']['licence_number'] = (string) $conf->licence_number;
-
- $_SESSION['modules_loaded']['visa']['width_blocsign'] = (string) $conf->width_blocsign;
- $_SESSION['modules_loaded']['visa']['height_blocsign'] = (string) $conf->height_blocsign;
-
- $_SESSION['modules_loaded']['visa']['confirm_sign_by_email'] = (string) $conf->confirm_sign_by_email;
-
- $routing_template = (string) $conf->routing_template;
-
- if (file_exists(
- $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR
- . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . "modules"
- . DIRECTORY_SEPARATOR . "visa" . DIRECTORY_SEPARATOR . "Bordereau_visa_modele.pdf"
+
+ $xmlconfig = simplexml_load_file($configPath);
+ $conf = $xmlconfig->CONFIG;
+ $_SESSION['modules_loaded']['visa']['exeSign'] = (string) $conf->exeSign;
+ $_SESSION['modules_loaded']['visa']['showAppletSign'] = (string) $conf->showAppletSign;
+ $_SESSION['modules_loaded']['visa']['reason'] = (string) $conf->reason;
+ $_SESSION['modules_loaded']['visa']['location'] = (string) $conf->location;
+ $_SESSION['modules_loaded']['visa']['licence_number'] = (string) $conf->licence_number;
+
+ $_SESSION['modules_loaded']['visa']['width_blocsign'] = (string) $conf->width_blocsign;
+ $_SESSION['modules_loaded']['visa']['height_blocsign'] = (string) $conf->height_blocsign;
+
+ $_SESSION['modules_loaded']['visa']['confirm_sign_by_email'] = (string) $conf->confirm_sign_by_email;
+
+ $routing_template = (string) $conf->routing_template;
+
+ if (file_exists(
+ $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
+ .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'modules'
+ .DIRECTORY_SEPARATOR.'visa'.DIRECTORY_SEPARATOR.'Bordereau_visa_modele.pdf'
)
) {
- $routing_template = $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR
- . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . "modules"
- . DIRECTORY_SEPARATOR . "visa" . DIRECTORY_SEPARATOR . "Bordereau_visa_modele.pdf";
+ $routing_template = $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR
+ .$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'modules'
+ .DIRECTORY_SEPARATOR.'visa'.DIRECTORY_SEPARATOR.'Bordereau_visa_modele.pdf';
}
- $_SESSION['modules_loaded']['visa']['routing_template'] = $routing_template;
- }
-
- public function getDocsBasket(){
- require_once 'core/class/class_request.php';
- $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");
-
- $where_tab = array();
-
- // $_SESSION['current_basket']['last_query']['select'] = $select;
- // $_SESSION['current_basket']['last_query']['where'] = $where;
- // $_SESSION['current_basket']['last_query']['arrayPDO'] = $arrayPDO;
- // $_SESSION['current_basket']['last_query']['orderstr'] = $orderstr;
- // $_SESSION['current_basket']['last_query']['limit'] = $_SESSION['config']['databasesearchlimit'];
-
- //From basket
- if (!empty($_SESSION['current_basket']['last_query']['where'])) {
- $where_tab[] = stripslashes($_SESSION['current_basket']['last_query']['where']); //Basket clause
- } elseif (!empty($_SESSION['current_basket']['clause'])) {
- $where_tab[] = stripslashes($_SESSION['current_basket']['clause']); //Basket clause
- }
-
- //Order
- $orderstr = "order by creation_date desc";
- if (!empty($_SESSION['current_basket']['last_query']['orderstr'])) {
- $orderstr = $_SESSION['current_basket']['last_query']['orderstr'];
- } elseif (isset($_SESSION['last_order_basket'])) {
- $orderstr = $_SESSION['last_order_basket'];
- }
-
- //Request
- $where = implode(' and ', $where_tab);
- $tab=$request->PDOselect(
- $select,
- $where,
- array(),
- $orderstr,
- $_SESSION['config']['databasetype'],
- $_SESSION['config']['databasesearchlimit'],
- false, "", "", "", false, false, 'distinct'
- );
-
- $tab_docs = array();
- foreach($tab as $doc){
- array_push($tab_docs,$doc[0]['value']);
- }
- return $tab_docs;
- }
-
- public function get_rep_path($res_id, $coll_id)
- {
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_security.php");
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."docservers_controler.php");
- $docserverControler = new docservers_controler();
- $sec =new security();
- $view = $sec->retrieve_view_from_coll_id($coll_id);
- if(empty($view))
- {
- $view = $sec->retrieve_table_from_coll($coll_id);
- }
-
- $db = new Database();
- $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));
- 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));
-
- $res = $stmt->fetchObject();
- $docserver_path = $res->path_template;
-
- $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_reponses = array();
- $cpt_rep = 0;
- while ($res2 = $stmt->fetchObject()) {
- $filename = $res2->filename;
- $format = "pdf";
+ $_SESSION['modules_loaded']['visa']['routing_template'] = $routing_template;
+ }
+
+ public function getDocsBasket()
+ {
+ require_once 'core/class/class_request.php';
+ $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');
+
+ $where_tab = array();
+
+ // $_SESSION['current_basket']['last_query']['select'] = $select;
+ // $_SESSION['current_basket']['last_query']['where'] = $where;
+ // $_SESSION['current_basket']['last_query']['arrayPDO'] = $arrayPDO;
+ // $_SESSION['current_basket']['last_query']['orderstr'] = $orderstr;
+ // $_SESSION['current_basket']['last_query']['limit'] = $_SESSION['config']['databasesearchlimit'];
+
+ //From basket
+ if (!empty($_SESSION['current_basket']['last_query']['where'])) {
+ $where_tab[] = stripslashes($_SESSION['current_basket']['last_query']['where']); //Basket clause
+ } elseif (!empty($_SESSION['current_basket']['clause'])) {
+ $where_tab[] = stripslashes($_SESSION['current_basket']['clause']); //Basket clause
+ }
+
+ //Order
+ $orderstr = 'order by creation_date desc';
+ if (!empty($_SESSION['current_basket']['last_query']['orderstr'])) {
+ $orderstr = $_SESSION['current_basket']['last_query']['orderstr'];
+ } elseif (isset($_SESSION['last_order_basket'])) {
+ $orderstr = $_SESSION['last_order_basket'];
+ }
+
+ //Request
+ $where = implode(' and ', $where_tab);
+ $tab = $request->PDOselect(
+ $select,
+ $where,
+ array(),
+ $orderstr,
+ $_SESSION['config']['databasetype'],
+ $_SESSION['config']['databasesearchlimit'],
+ false, '', '', '', false, false, 'distinct'
+ );
+
+ $tab_docs = array();
+ foreach ($tab as $doc) {
+ array_push($tab_docs, $doc[0]['value']);
+ }
+
+ return $tab_docs;
+ }
+
+ public function get_rep_path($res_id, $coll_id)
+ {
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_security.php';
+ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'docservers_controler.php';
+ $docserverControler = new docservers_controler();
+ $sec = new security();
+ $view = $sec->retrieve_view_from_coll_id($coll_id);
+ if (empty($view)) {
+ $view = $sec->retrieve_table_from_coll($coll_id);
+ }
+
+ $db = new Database();
+ $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));
+ 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));
+
+ $res = $stmt->fetchObject();
+ $docserver_path = $res->path_template;
+
+ $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_reponses = array();
+ $cpt_rep = 0;
+ while ($res2 = $stmt->fetchObject()) {
+ $filename = $res2->filename;
+ $format = 'pdf';
$filename_pdf = str_ireplace($res2->format, $format, $filename);
- $path = preg_replace('/#/', DIRECTORY_SEPARATOR, $res2->path);
- //$filename_pdf = str_replace(pathinfo($filename, PATHINFO_EXTENSION), "pdf",$filename);
- if (file_exists($docserver_path . $path . $filename_pdf)) {
- $array_reponses[$cpt_rep]['path'] = $docserver_path . $path . $filename_pdf;
- $array_reponses[$cpt_rep]['title'] = $res2->title;
- $array_reponses[$cpt_rep]['attachment_type'] = $res2->attachment_type;
- if ($res2->res_id_version == 0) {
- $array_reponses[$cpt_rep]['res_id'] = $res2->res_id;
- $array_reponses[$cpt_rep]['is_version'] = 0;
- } else {
- $array_reponses[$cpt_rep]['res_id'] = $res2->res_id_version;
- $array_reponses[$cpt_rep]['is_version'] = 1;
- }
- if ($res2->res_id_version == 0 && $array_reponses[$cpt_rep]['attachment_type'] == 'outgoing_mail') {
- $array_reponses[$cpt_rep]['is_version'] = 2;
- }
- $cpt_rep++;
- }
- }
- /*echo "<pre>";
- print_r($array_reponses);
- echo "</pre>";*/
- return $array_reponses;
- }
-
- protected function isSameFile($firstFile, $secondFile){
- $nb1 = strrpos($firstFile, '.');
- $nb2 = strrpos($secondFile, '.');
-
- return (substr($firstFile, 0, $nb1) === substr($secondFile, 0, $nb2));
- }
-
- protected function hasSameFileInArray($fileName, $filesArray){
- foreach($filesArray as $tmpFileName){
- if ($this->isSameFile($fileName, $tmpFileName))
- return true;
- }
- return false;
- }
-
- public function checkResponseProject($res_id, $coll_id) {
- $this->errorMessageVisa = null;
-
- $attachmentTypes = \Attachment\models\AttachmentModel::getAttachmentsTypesByXML();
-
- $noSignableAttachments = [];
- foreach ($attachmentTypes as $key => $value) {
- if (!$value['sign']) {
- $noSignableAttachments[] = $key;
- }
- }
-
- $db = new Database();
- if (empty($noSignableAttachments)) {
- $stmt = $db->query("SELECT * FROM res_view_attachments WHERE res_id_master = ? AND coll_id = ? AND status NOT IN ('DEL','OBS','TMP') IN in_signature_book = ?", [$res_id, $coll_id, true]);
- } else {
- $stmt = $db->query("SELECT * FROM res_view_attachments WHERE res_id_master = ? AND coll_id = ? AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN (?) AND in_signature_book = ? ", [$res_id, $coll_id, $noSignableAttachments, true]);
- }
- if ($stmt->rowCount() <= 0) {
- $this->errorMessageVisa = _NO_RESPONSE_PROJECT_VISA;
- return false;
- }
-
- $resFirstFiles = [];
-
- while($res = $stmt->fetchObject()){
- if (($res->format == 'doc' || $res->format == 'docx' || $res->format == 'odt') && !in_array($res->attachment_type, ['simple_attachment', 'simple_attachment_rp']))
- array_push($resFirstFiles, $res);
- }
-
- $stmt = $db->query("SELECT * FROM res_attachments WHERE res_id_master = ? AND coll_id = ? AND attachment_type IN ('converted_pdf') AND status NOT IN ('DEL','OBS','TMP')", array($res_id, $coll_id));
-
- $resSecondFiles = [];
-
- while($res = $stmt->fetchObject()){
- array_push($resSecondFiles, $res->filename);
- }
- foreach($resFirstFiles as $tmpObj){
- if ($this->hasSameFileInArray($tmpObj->filename, $resSecondFiles))
- continue;
- if (!$this->errorMessageVisa)
- $this->errorMessageVisa .= _PLEASE_CONVERT_PDF_VISA;
- $this->errorMessageVisa .= '<br/> ';
- $this->errorMessageVisa .= $_SESSION['attachment_types'][$tmpObj->attachment_type] . ' : ';
- $this->errorMessageVisa .= $tmpObj->title;
- }
- return true;
- }
-
- public function getWorkflow($res_id, $coll_id, $typeList){
- require_once('modules/entities/class/class_manage_listdiff.php');
+ $path = preg_replace('/#/', DIRECTORY_SEPARATOR, $res2->path);
+ //$filename_pdf = str_replace(pathinfo($filename, PATHINFO_EXTENSION), "pdf",$filename);
+ if (file_exists($docserver_path.$path.$filename_pdf)) {
+ $array_reponses[$cpt_rep]['path'] = $docserver_path.$path.$filename_pdf;
+ $array_reponses[$cpt_rep]['title'] = $res2->title;
+ $array_reponses[$cpt_rep]['attachment_type'] = $res2->attachment_type;
+ if ($res2->res_id_version == 0) {
+ $array_reponses[$cpt_rep]['res_id'] = $res2->res_id;
+ $array_reponses[$cpt_rep]['is_version'] = 0;
+ } else {
+ $array_reponses[$cpt_rep]['res_id'] = $res2->res_id_version;
+ $array_reponses[$cpt_rep]['is_version'] = 1;
+ }
+ if ($res2->res_id_version == 0 && $array_reponses[$cpt_rep]['attachment_type'] == 'outgoing_mail') {
+ $array_reponses[$cpt_rep]['is_version'] = 2;
+ }
+ ++$cpt_rep;
+ }
+ }
+ /*echo "<pre>";
+ print_r($array_reponses);
+ echo "</pre>";*/
+ return $array_reponses;
+ }
+
+ protected function isSameFile($firstFile, $secondFile)
+ {
+ $nb1 = strrpos($firstFile, '.');
+ $nb2 = strrpos($secondFile, '.');
+
+ return substr($firstFile, 0, $nb1) === substr($secondFile, 0, $nb2);
+ }
+
+ protected function hasSameFileInArray($fileName, $filesArray)
+ {
+ foreach ($filesArray as $tmpFileName) {
+ if ($this->isSameFile($fileName, $tmpFileName)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public function checkResponseProject($res_id, $coll_id)
+ {
+ $this->errorMessageVisa = null;
+
+ $attachmentTypes = \Attachment\models\AttachmentModel::getAttachmentsTypesByXML();
+
+ $noSignableAttachments = [];
+ foreach ($attachmentTypes as $key => $value) {
+ if (!$value['sign']) {
+ $noSignableAttachments[] = $key;
+ }
+ }
+
+ $db = new Database();
+ if (empty($noSignableAttachments)) {
+ $stmt = $db->query("SELECT * FROM res_view_attachments WHERE res_id_master = ? AND coll_id = ? AND status NOT IN ('DEL','OBS','TMP') IN in_signature_book = ?", [$res_id, $coll_id, true]);
+ } else {
+ $stmt = $db->query("SELECT * FROM res_view_attachments WHERE res_id_master = ? AND coll_id = ? AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN (?) AND in_signature_book = ? ", [$res_id, $coll_id, $noSignableAttachments, true]);
+ }
+ if ($stmt->rowCount() <= 0) {
+ $this->errorMessageVisa = _NO_RESPONSE_PROJECT_VISA;
+
+ return false;
+ }
+
+ $resFirstFiles = [];
+
+ while ($res = $stmt->fetchObject()) {
+ if (($res->format == 'doc' || $res->format == 'docx' || $res->format == 'odt') && !in_array($res->attachment_type, ['simple_attachment', 'simple_attachment_rp'])) {
+ array_push($resFirstFiles, $res);
+ }
+ }
+
+ $stmt = $db->query("SELECT * FROM res_attachments WHERE res_id_master = ? AND coll_id = ? AND attachment_type IN ('converted_pdf') AND status NOT IN ('DEL','OBS','TMP')", array($res_id, $coll_id));
+
+ $resSecondFiles = [];
+
+ while ($res = $stmt->fetchObject()) {
+ array_push($resSecondFiles, $res->filename);
+ }
+ foreach ($resFirstFiles as $tmpObj) {
+ if ($this->hasSameFileInArray($tmpObj->filename, $resSecondFiles)) {
+ continue;
+ }
+ if (!$this->errorMessageVisa) {
+ $this->errorMessageVisa .= _PLEASE_CONVERT_PDF_VISA;
+ }
+ $this->errorMessageVisa .= '<br/> ';
+ $this->errorMessageVisa .= $_SESSION['attachment_types'][$tmpObj->attachment_type].' : ';
+ $this->errorMessageVisa .= $tmpObj->title;
+ }
+
+ return true;
+ }
+
+ public function getWorkflow($res_id, $coll_id, $typeList)
+ {
+ require_once 'modules/entities/class/class_manage_listdiff.php';
$listdiff = new diffusion_list();
$roles = $listdiff->list_difflist_roles();
$circuit = $listdiff->get_listinstance($res_id, false, $coll_id, $typeList);
- if (isset($circuit['copy'])) unset($circuit['copy']);
- return $circuit;
- }
-
- public function saveWorkflow($res_id, $coll_id, $workflow, $typeList){
- require_once('modules/entities/class/class_manage_listdiff.php');
- $diff_list = new diffusion_list();
-
- $diff_list->save_listinstance(
- $workflow,
+ if (isset($circuit['copy'])) {
+ unset($circuit['copy']);
+ }
+
+ return $circuit;
+ }
+
+ public function saveWorkflow($res_id, $coll_id, $workflow, $typeList)
+ {
+ require_once 'modules/entities/class/class_manage_listdiff.php';
+ $diff_list = new diffusion_list();
+
+ $diff_list->save_listinstance(
+ $workflow,
$typeList,
- $coll_id,
- $res_id,
+ $coll_id,
+ $res_id,
$_SESSION['user']['UserId'],
$_SESSION['user']['primaryentity']['id']
- );
-
- }
-
- public function saveModelWorkflow($id_list, $workflow, $typeList, $title){
- require_once('modules/entities/class/class_manage_listdiff.php');
- $diff_list = new diffusion_list();
-
-
- $diff_list->save_listmodel(
- $workflow,
- $typeList,
- $id_list,
- $title
- );
- }
-
-
- protected function getWorkflowsNumberByTitle($title){
- $db = new Database();
- $stmt = $db->query("SELECT * FROM listmodels WHERE title = ?", array($title));
- return $stmt->rowCount();
- }
-
- public function isWorkflowTitleFree($title){
- $nb = $this->getWorkflowsNumberByTitle($title);
- if ($nb == 0)
- return true;
- else
- return false;
- }
-
- public function deleteWorkflow($res_id, $coll_id){
- $db = new Database();
- $db->query("DELETE FROM visa_circuit WHERE res_id= ? AND coll_id= ?",array($res_id, $coll_id));
- }
-
- public function nbVisa($res_id, $coll_id){
- $db = new Database();
- $stmt = $db->query("SELECT listinstance_id from listinstance WHERE res_id= ? and coll_id = ? and item_mode = ?", array($res_id, $coll_id, 'visa'));
- return $stmt->rowCount();
- }
-
- public function getCurrentStep($res_id, $coll_id, $listDiffType){
- $db = new Database();
- $where = "res_id= ? and coll_id = ? and difflist_type = ? and process_date IS NULL";
- $order = "ORDER BY listinstance_id ASC";
+ );
+ }
+
+ public function saveModelWorkflow($id_list, $workflow, $typeList, $title)
+ {
+ require_once 'modules/entities/class/class_manage_listdiff.php';
+ $diff_list = new diffusion_list();
+
+ $diff_list->save_listmodel(
+ $workflow,
+ $typeList,
+ $id_list,
+ $title
+ );
+ }
+
+ protected function getWorkflowsNumberByTitle($title)
+ {
+ $db = new Database();
+ $stmt = $db->query('SELECT * FROM listmodels WHERE title = ?', array($title));
+
+ return $stmt->rowCount();
+ }
+
+ public function isWorkflowTitleFree($title)
+ {
+ $nb = $this->getWorkflowsNumberByTitle($title);
+ if ($nb == 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public function deleteWorkflow($res_id, $coll_id)
+ {
+ $db = new Database();
+ $db->query('DELETE FROM visa_circuit WHERE res_id= ? AND coll_id= ?', array($res_id, $coll_id));
+ }
+
+ public function nbVisa($res_id, $coll_id)
+ {
+ $db = new Database();
+ $stmt = $db->query('SELECT listinstance_id from listinstance WHERE res_id= ? and coll_id = ? and item_mode = ?', array($res_id, $coll_id, 'visa'));
+
+ return $stmt->rowCount();
+ }
+
+ public function getCurrentStep($res_id, $coll_id, $listDiffType)
+ {
+ $db = new Database();
+ $where = 'res_id= ? and coll_id = ? and difflist_type = ? and process_date IS NULL';
+ $order = 'ORDER BY listinstance_id ASC';
$query = $db->limit_select(0, 1, 'sequence, item_mode', 'listinstance', $where, '', '', $order);
- $stmt = $db->query($query, array($res_id, $coll_id, $listDiffType));
- $res = $stmt->fetchObject();
- if ($res->item_mode == 'sign'){
- return $this->nbVisa($res_id, $coll_id);
- }
- return $res->sequence;
- }
-
- public function getUsersCurrentVis($res_id){
- $db = new Database();
- $result = array();
- $stmt = $db->query("SELECT item_id from listinstance WHERE res_id= ? and difflist_type = 'VISA_CIRCUIT' ORDER BY sequence ASC", array($res_id));
- while ( $res = $stmt->fetchObject()) {
- $result[] = $res->item_id;
- }
- return $result;
- }
-
- public function getCurrentUserStep($res_id){
- $db = new Database();
- $stmt = $db->query("SELECT item_id from listinstance WHERE res_id= ? and coll_id = ? and difflist_type = ? and process_date ISNULL ORDER BY listinstance_id ASC LIMIT 1", array($res_id, 'letterbox_coll', 'VISA_CIRCUIT'));
- $res = $stmt->fetchObject();
- return $res->item_id;
- }
-
- public function getStepDetails($res_id, $coll_id, $listDiffType, $sequence)
- {
- $stepDetails = array();
- $db = new Database();
- $order = "ORDER by listinstance_id ASC";
- $where = "res_id= ? and coll_id = ? and difflist_type = ? and sequence = ? ";
- $query = $db->limit_select(0, 1, '*', 'listinstance', $where, '', '', $order);
-
- $stmt = $db->query($query, array($res_id, $coll_id, $listDiffType, $sequence));
-
- $res = $stmt->fetchObject();
- $stepDetails['listinstance_id'] = $res->listinstance_id;
- $stepDetails['coll_id'] = $res->coll_id;
- $stepDetails['res_id'] = $res->res_id;
- $stepDetails['listinstance_type'] = $res->listinstance_type;
- $stepDetails['sequence'] = $res->sequence;
- $stepDetails['item_id'] = $res->item_id;
- $stepDetails['item_type'] = $res->item_type;
- $stepDetails['item_mode'] = $res->item_mode;
- $stepDetails['added_by_user'] = $res->added_by_user;
- $stepDetails['added_by_entity'] = $res->added_by_entity;
- $stepDetails['visible'] = $res->visible;
- $stepDetails['viewed'] = $res->viewed;
- $stepDetails['difflist_type'] = $res->difflist_type;
- $stepDetails['process_date'] = $res->process_date;
- $stepDetails['process_comment'] = $res->process_comment;
-
- return $stepDetails;
- }
-
- public function myPosVisa($res_id, $coll_id, $listDiffType){
- $db = new Database();
- $order = "ORDER by listinstance_id ASC";
- $where = "res_id= ? and coll_id = ? and difflist_type = ? and item_id = ? and process_date IS NULL";
- $query = $db->limit_select(0, 1, 'sequence, item_mode', 'listinstance', $where, '', '', $order);
-
- $stmt = $db->query($select, array($res_id, $coll_id, $listDiffType, $_SESSION['user']['UserId']));
-
- $res = $stmt->fetchObject();
- if ($res->item_mode == 'sign'){
- return $this->nbVisa($res_id, $coll_id);
- }
- return $res->sequence;
- }
-
- public function getUsersVis($group_id = null){
- $db = new Database();
-
- if($group_id <> null){
- $stmt = $db->query("SELECT users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and users.status <> 'DEL' and
+ $stmt = $db->query($query, array($res_id, $coll_id, $listDiffType));
+ $res = $stmt->fetchObject();
+ if ($res->item_mode == 'sign') {
+ return $this->nbVisa($res_id, $coll_id);
+ }
+
+ return $res->sequence;
+ }
+
+ public function getUsersCurrentVis($res_id)
+ {
+ $db = new Database();
+ $result = array();
+ $stmt = $db->query("SELECT item_id from listinstance WHERE res_id= ? and difflist_type = 'VISA_CIRCUIT' ORDER BY sequence ASC", array($res_id));
+ while ($res = $stmt->fetchObject()) {
+ $result[] = $res->item_id;
+ }
+
+ return $result;
+ }
+
+ public function getCurrentUserStep($res_id)
+ {
+ $db = new Database();
+ $stmt = $db->query('SELECT item_id from listinstance WHERE res_id= ? and coll_id = ? and difflist_type = ? and process_date ISNULL ORDER BY listinstance_id ASC LIMIT 1', array($res_id, 'letterbox_coll', 'VISA_CIRCUIT'));
+ $res = $stmt->fetchObject();
+
+ return $res->item_id;
+ }
+
+ public function getStepDetails($res_id, $coll_id, $listDiffType, $sequence)
+ {
+ $stepDetails = array();
+ $db = new Database();
+ $order = 'ORDER by listinstance_id ASC';
+ $where = 'res_id= ? and coll_id = ? and difflist_type = ? and sequence = ? ';
+ $query = $db->limit_select(0, 1, '*', 'listinstance', $where, '', '', $order);
+
+ $stmt = $db->query($query, array($res_id, $coll_id, $listDiffType, $sequence));
+
+ $res = $stmt->fetchObject();
+ $stepDetails['listinstance_id'] = $res->listinstance_id;
+ $stepDetails['coll_id'] = $res->coll_id;
+ $stepDetails['res_id'] = $res->res_id;
+ $stepDetails['listinstance_type'] = $res->listinstance_type;
+ $stepDetails['sequence'] = $res->sequence;
+ $stepDetails['item_id'] = $res->item_id;
+ $stepDetails['item_type'] = $res->item_type;
+ $stepDetails['item_mode'] = $res->item_mode;
+ $stepDetails['added_by_user'] = $res->added_by_user;
+ $stepDetails['added_by_entity'] = $res->added_by_entity;
+ $stepDetails['visible'] = $res->visible;
+ $stepDetails['viewed'] = $res->viewed;
+ $stepDetails['difflist_type'] = $res->difflist_type;
+ $stepDetails['process_date'] = $res->process_date;
+ $stepDetails['process_comment'] = $res->process_comment;
+
+ return $stepDetails;
+ }
+
+ public function myPosVisa($res_id, $coll_id, $listDiffType)
+ {
+ $db = new Database();
+ $order = 'ORDER by listinstance_id ASC';
+ $where = 'res_id= ? and coll_id = ? and difflist_type = ? and item_id = ? and process_date IS NULL';
+ $query = $db->limit_select(0, 1, 'sequence, item_mode', 'listinstance', $where, '', '', $order);
+
+ $stmt = $db->query($select, array($res_id, $coll_id, $listDiffType, $_SESSION['user']['UserId']));
+
+ $res = $stmt->fetchObject();
+ if ($res->item_mode == 'sign') {
+ return $this->nbVisa($res_id, $coll_id);
+ }
+
+ return $res->sequence;
+ }
+
+ public function getUsersVis($group_id = null)
+ {
+ $db = new Database();
+
+ if ($group_id != null) {
+ $stmt = $db->query("SELECT users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and users.status <> 'DEL' and
users_entities.primary_entity = 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
- (SELECT group_id FROM usergroups_services WHERE service_id = ? AND group_id = ?) order by users.lastname", array('visa_documents',$group_id));
- }else{
- $stmt = $db->query("SELECT distinct on(users.user_id) users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id, users.enabled from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and users.status <> 'DEL' and
+ (SELECT group_id FROM usergroups_services WHERE service_id = ? AND group_id = ?) order by users.lastname", array('visa_documents', $group_id));
+ } else {
+ $stmt = $db->query("SELECT distinct on(users.user_id) users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id, users.enabled from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and users.status <> 'DEL' and
users_entities.primary_entity = 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
(SELECT group_id FROM usergroups_services WHERE service_id = ?)
order by users.user_id,users.lastname", array('visa_documents'));
- }
-
- $tab_users = array();
-
- while($res = $stmt->fetchObject()){
- array_push($tab_users,array('id'=>$res->user_id, 'firstname'=>$res->firstname,'lastname'=>$res->lastname,'group_id'=>$res->group_id,'entity_id'=>$res->entity_id, 'enabled'=>$res->enabled));
- }
- return $tab_users;
- }
-
- public function getGroupVis(){
- $db = new Database();
-
- $stmt = $db->query("SELECT DISTINCT(usergroup_content.group_id),group_desc FROM usergroups, usergroup_content WHERE usergroups.group_id = usergroup_content.group_id AND usergroup_content.group_id IN (SELECT group_id FROM usergroups_services WHERE service_id = ?)", array('visa_documents'));
-
- $tab_usergroup = array();
-
- while($res = $stmt->fetchObject()){
- array_push($tab_usergroup,array('group_id'=>$res->group_id,'group_desc'=>$res->group_desc));
- }
-
- return $tab_usergroup;
- }
-
- public function getEntityVis(){
- $db = new Database();
-
- $stmt = $db->query("SELECT distinct(entities.entity_id) FROM users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
+ }
+
+ $tab_users = array();
+
+ while ($res = $stmt->fetchObject()) {
+ array_push($tab_users, array('id' => $res->user_id, 'firstname' => $res->firstname, 'lastname' => $res->lastname, 'group_id' => $res->group_id, 'entity_id' => $res->entity_id, 'enabled' => $res->enabled));
+ }
+
+ return $tab_users;
+ }
+
+ public function getGroupVis()
+ {
+ $db = new Database();
+
+ $stmt = $db->query('SELECT DISTINCT(usergroup_content.group_id),group_desc FROM usergroups, usergroup_content WHERE usergroups.group_id = usergroup_content.group_id AND usergroup_content.group_id IN (SELECT group_id FROM usergroups_services WHERE service_id = ?)', array('visa_documents'));
+
+ $tab_usergroup = array();
+
+ while ($res = $stmt->fetchObject()) {
+ array_push($tab_usergroup, array('group_id' => $res->group_id, 'group_desc' => $res->group_desc));
+ }
+
+ return $tab_usergroup;
+ }
+
+ public function getEntityVis()
+ {
+ $db = new Database();
+
+ $stmt = $db->query("SELECT distinct(entities.entity_id) FROM users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
users_entities.primary_entity = 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
(SELECT group_id FROM usergroups_services WHERE service_id = ?)
order by entities.entity_id", array('visa_documents'));
-
- $tab_userentities = array();
-
- while($res = $stmt->fetchObject()){
- array_push($tab_userentities,array('entity_id'=>$res->entity_id));
- }
-
- return $tab_userentities;
- }
-
- public function allUserVised($res_id, $coll_id, $typeList){
- $circuit = $this->getWorkflow($res_id, $coll_id, 'VISA_CIRCUIT');
- if (isset($circuit['visa'])) {
- foreach($circuit['visa']['users'] as $seq=>$step){
- if ($step['process_date'] == ''){
- return false;
- }
- }
- }
- return true;
- }
-
- public function getConsigne($res_id, $coll_id, $userId){
- $circuit = $this->getWorkflow($res_id, $coll_id, 'VISA_CIRCUIT');
- if (isset($circuit['visa'])) {
- foreach($circuit['visa']['users'] as $seq=>$step){
- if ($step['user_id'] == $userId){
- return $step['process_comment'];
- }
- }
- }
- if (isset($circuit['sign'])) {
- foreach($circuit['sign']['users'] as $seq=>$step){
- if ($step['user_id'] == $userId){
- return $step['process_comment'];
- }
- }
- }
- return '';
- }
-
- public function setStatusVisa($res_id, $coll_id){
- $curr_visa_wf = $this->getWorkflow($res_id, $coll_id, 'VISA_CIRCUIT');
-
- $db = new Database();
- $where = "res_id= ? and coll_id = ? and difflist_type = ? and process_date IS NULL";
- $order = "ORDER BY listinstance_id ASC";
- $query = $db->limit_select(0, 1, 'requested_signature', 'listinstance', $where, '', '', $order);
- $stmt = $db->query($query, array($res_id, $coll_id, 'VISA_CIRCUIT'));
- $resListDiffVisa = $stmt->fetchObject();
-
- // If there is only one step in the visa workflow, we set status to ESIG
- if ($resListDiffVisa->requested_signature){
- $mailStatus = 'ESIG';
- } else {
- $mailStatus = 'EVIS';
- }
-
- $db->query("UPDATE res_letterbox SET status = ? WHERE res_id = ? ", array($mailStatus, $res_id));
-
- }
- public function getList($res_id, $coll_id, $bool_modif=false, $typeList, $isVisaStep = false, $fromDetail = ""){
- $core = new core_tools();
- $circuit = $this->getWorkflow($res_id, $coll_id, $typeList);
- $sAllAttachmentSigned = $this->isAllAttachementSigned($res_id);
- if ($sAllAttachmentSigned == 'noAttachment') {
- $str = '<input type="hidden" id="isAllAttachementSigned" value="false"/>';
- $isAllAttachementSigned = "";
- $isAllAttachementSignedInfo = "";
-
- } else if ($sAllAttachmentSigned == 'yes') {
- $str = '<input type="hidden" id="isAllAttachementSigned" value="allsigned"/>';
- $isAllAttachementSigned = "";
- $isAllAttachementSignedInfo = _IS_ALL_ATTACHMENT_SIGNED_INFO2;
- }else{
- $str = '<input type="hidden" id="isAllAttachementSigned" value="false"/>';
- $isAllAttachementSigned = "";
- }
-
- $str .= '<div class="error" id="divErrorVisa" onclick="this.hide();"></div>';
- $str .= '<div class="info" id="divInfoVisa" onclick="this.hide();"></div>';
-
- //VISA USER LIST
- if($bool_modif ==true){
- $str .= '<select data-placeholder="' . _ADD_VISA_ROLE . '" id="visaUserList" onchange="addVisaUser();">';
- $str .= '<option value="" ></option>';
-
- $tab_userentities = $this->getEntityVis();
- $tab_users = $this->getUsersVis();
- /** Order by parent entity **/
- foreach ($tab_userentities as $key => $value) {
- $str .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
- foreach($tab_users as $user){
- if($user['enabled'] == 'Y'){
- if($tab_userentities[$key]['entity_id'] == $user['entity_id']){
- $selected = " ";
- if ($user['id'] == $step['user_id']) {
- $selected = " selected";
- }
- $str .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].' '.$user['firstname'].'</option>';
- }
- }
- }
- $str .= '</optgroup>';
- }
- $str .= '</select>';
- $str .= '<script>';
- $str .=' $j("#visaUserList").chosen({width: "250px", disable_search_threshold: 10});';
- $str .= '</script>';
-
- require_once("modules/entities/class/class_manage_listdiff.php");
- $diff_list = new diffusion_list();
- $listModels = $diff_list->select_listmodels($typeList);
-
- $str .= ' <select data-placeholder="'._ADD_VISA_MODEL.'" name="modelList" id="modelList" onchange="loadVisaModelUsers();">';
- $str .= '<option value=""></option>';
- foreach($listModels as $lm){
-
- $str .= '<option value="'.$lm['object_id'].'">'.$lm['title'].'</option>';
+ $tab_userentities = array();
+
+ while ($res = $stmt->fetchObject()) {
+ array_push($tab_userentities, array('entity_id' => $res->entity_id));
+ }
+
+ return $tab_userentities;
+ }
+
+ public function allUserVised($res_id, $coll_id, $typeList)
+ {
+ $circuit = $this->getWorkflow($res_id, $coll_id, 'VISA_CIRCUIT');
+ if (isset($circuit['visa'])) {
+ foreach ($circuit['visa']['users'] as $seq => $step) {
+ if ($step['process_date'] == '') {
+ return false;
}
- $str .= '</select>';
+ }
+ }
+
+ return true;
+ }
- $str .= '<script>';
- $str .=' $j("#modelList").chosen({width: "250px", disable_search_threshold: 10});';
- $str .= '</script>';
- $str .= '<br/><br/>';
+ public function getConsigne($res_id, $coll_id, $userId)
+ {
+ $circuit = $this->getWorkflow($res_id, $coll_id, 'VISA_CIRCUIT');
+ if (isset($circuit['visa'])) {
+ foreach ($circuit['visa']['users'] as $seq => $step) {
+ if ($step['user_id'] == $userId) {
+ return $step['process_comment'];
+ }
}
- if (!empty($isAllAttachementSignedInfo)) {
- $str .= '<b style="color:red;">'.$isAllAttachementSignedInfo.'</b>';
- }
- $str .= '<div id="visa_content">';
- //VISA USER IN DOCUMENT
- $i = 1;
- $lastUserVis = true;
-
- if(count($circuit['visa']['users']) == 0 && $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){
- $isCurrentVisa = false;
- foreach ($circuit['visa']['users'] as $it=>$info_userVis) {
- if(empty($info_userVis['process_date'])){
- if($lastUserVis == true && $isVisaStep == true && $isCurrentVisa === false){
- $vised = ' currentVis';
- $disabled = '';
- $link_vis = 'arrow-right ';
- $del_vis = '<div class="delete_visa"></div>';
- if($info_userVis['requested_signature'] && $info_userVis['user_id'] <> $_SESSION['user']['UserId']){
- $info_vised = '<p style="color:red;">'._SIGN_USER_COU_DESC.' '.$info_userVis['firstname'].' '.$info_userVis['lastname'].'</p>';
- $dropZone = '';
- }else if($info_userVis['requested_signature'] && $info_userVis['user_id'] == $_SESSION['user']['UserId']){
- $info_vised = '<p style="font-weight:normal;">'._SIGN_USER_COU.'</p>';
- $dropZone = '';
- }else if(!$info_userVis['requested_signature'] && $info_userVis['user_id'] <> $_SESSION['user']['UserId']){
- $info_vised = '<p style="color:red;">'._VISA_USER_COU_DESC.' '.$info_userVis['firstname'].' '.$info_userVis['lastname'].'</p>';
- $dropZone = '';
- }else {
- $info_vised = '<p style="font-weight:normal;">'._VISA_USER_COU.'</p>';
- $dropZone = '';
- }
- if($core->test_service('modify_visa_in_signatureBook', 'visa', false)){
- $modif = 'true';
- $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
- $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
- }else{
- $modif = 'false';
- }
-
- $info_vised .= '<select style="display:none;" id="signRequest_'.$i.'" '.$isAllAttachementSigned;
- $info_vised .= ' disabled="disabled" ';
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true"';
- if (!empty($info_userVis['requested_signature'])) {
- $info_vised .= ' selected="selected" ';
- }
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
-
- }else{
- $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
- $vised = '';
- if($bool_modif == true){
- $modif = 'true';
- $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
- $disabled = '';
- }else{
- $modif = 'false';
- $dropZone = '';
- $del_vis = '';
- $disabled = ' disabled="disabled"';
- }
-
- $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
- if (!empty($info_userVis['signatory'])) {
- $info_vised .= ' disabled="disabled" ';
- }
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true"';
- if (!empty($info_userVis['requested_signature'])) {
- $info_vised .= ' selected="selected" ';
- }
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
- $link_vis = 'hourglass-half';
- }
-
+ }
+ if (isset($circuit['sign'])) {
+ foreach ($circuit['sign']['users'] as $seq => $step) {
+ if ($step['user_id'] == $userId) {
+ return $step['process_comment'];
+ }
+ }
+ }
+ return '';
+ }
- $lastUserVis = false;
- $isCurrentVisa = true;
- }else{
- $lastUserVis = true;
- $modif = 'false';
-
-
- $disabled = ' disabled="disabled"';
- if(preg_match("/\[DEL\]/", $info_userVis['process_comment'])){
- $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
- if (!empty($info_userVis['signatory'])) {
- $info_vised .= ' disabled="disabled" ';
- }
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true"';
- if (!empty($info_userVis['requested_signature'])) {
- $info_vised .= ' selected="selected" ';
- }
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
- $link_vis = 'times';
- $vised = ' moved vised';
- $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
- }else{
- if (!empty($info_userVis['signatory'])) {
- $info_vised = '<br/><sub>signé le : '.functions::format_date_db($info_userVis['process_date'],'','',true).'</sub>';
- $info_vised .= '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" disabled="disabled" '.$isAllAttachementSigned;
- $info_vised .= '>';
- $info_vised .= '<option value="false" selected="selected">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true"';
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
- }else{
- $info_vised = '<br/><sub>visé le : '.functions::format_date_db($info_userVis['process_date'],'','',true).'</sub>';
-
- $info_vised .= '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" disabled="disabled" '.$isAllAttachementSigned;
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true" selected="selected"';
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
- }
-
- $link_vis = 'check';
- $vised = ' vised';
- $del_vis = '';
- }
-
-
- }
- //VISA USER LINE CIRCUIT
- $str .= '<div class="droptarget'.$vised.'" id="visa_'.$i.'" draggable="'.$modif.'">';
- $str .= '<span class="visaUserStatus">';
- $str .= '<i class="fa fa-'.$link_vis.'" aria-hidden="true"></i>';
- $str .= '</span>';
- $str .= '<span class="visaUserInfo">';
- $str .= '<sup class="visaUserPos nbResZero">'.$i.'</sup> ';
- $str .= '<i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userVis['lastname'].' '.$info_userVis['firstname'].' <sup class="nbRes">'.$info_userVis['entity_id'].'</sup>';
- $str .= ' <sub><i id="signedUser_'.$i.'" title="au moins un document a été signé par cet utilisateur" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#FDD16C;';
- if (empty($info_userVis['signatory'])) {
- $str .= 'visibility:hidden';
+ public function setStatusVisa($res_id, $coll_id)
+ {
+ $curr_visa_wf = $this->getWorkflow($res_id, $coll_id, 'VISA_CIRCUIT');
+
+ $db = new Database();
+ $where = 'res_id= ? and coll_id = ? and difflist_type = ? and process_date IS NULL';
+ $order = 'ORDER BY listinstance_id ASC';
+ $query = $db->limit_select(0, 1, 'requested_signature', 'listinstance', $where, '', '', $order);
+
+ $stmt = $db->query($query, array($res_id, $coll_id, 'VISA_CIRCUIT'));
+ $resListDiffVisa = $stmt->fetchObject();
+
+ // If there is only one step in the visa workflow, we set status to ESIG
+ if ($resListDiffVisa->requested_signature) {
+ $mailStatus = 'ESIG';
+ } else {
+ $mailStatus = 'EVIS';
+ }
+
+ $db->query('UPDATE res_letterbox SET status = ? WHERE res_id = ? ', array($mailStatus, $res_id));
+ }
+
+ public function getList($res_id, $coll_id, $bool_modif = false, $typeList, $isVisaStep = false, $fromDetail = '')
+ {
+ $core = new core_tools();
+ $circuit = $this->getWorkflow($res_id, $coll_id, $typeList);
+ $sAllAttachmentSigned = $this->isAllAttachementSigned($res_id);
+ if ($sAllAttachmentSigned == 'noAttachment') {
+ $str = '<input type="hidden" id="isAllAttachementSigned" value="false"/>';
+ $isAllAttachementSigned = '';
+ $isAllAttachementSignedInfo = '';
+ } elseif ($sAllAttachmentSigned == 'yes') {
+ $str = '<input type="hidden" id="isAllAttachementSigned" value="allsigned"/>';
+ $isAllAttachementSigned = '';
+ $isAllAttachementSignedInfo = _IS_ALL_ATTACHMENT_SIGNED_INFO2;
+ } else {
+ $str = '<input type="hidden" id="isAllAttachementSigned" value="false"/>';
+ $isAllAttachementSigned = '';
+ }
+
+ $str .= '<div class="error" id="divErrorVisa" onclick="this.hide();"></div>';
+ $str .= '<div class="info" id="divInfoVisa" onclick="this.hide();"></div>';
+
+ //VISA USER LIST
+ if ($bool_modif == true) {
+ $str .= '<select data-placeholder="'._ADD_VISA_ROLE.'" id="visaUserList" onchange="addVisaUser();">';
+ $str .= '<option value="" ></option>';
+
+ $tab_userentities = $this->getEntityVis();
+ $tab_users = $this->getUsersVis();
+ /* Order by parent entity **/
+ foreach ($tab_userentities as $key => $value) {
+ $str .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
+ foreach ($tab_users as $user) {
+ if ($user['enabled'] == 'Y') {
+ if ($tab_userentities[$key]['entity_id'] == $user['entity_id']) {
+ $selected = ' ';
+ if ($user['id'] == $step['user_id']) {
+ $selected = ' selected';
}
- $str .= '"></i>'.$info_vised;
- $str .= '</span>';
- $str .= '<span class="visaUserAction">';
- $str .= $del_vis;
- $str .= '</span>';
- $str .= '<span class="visaUserConsigne">';
- $str .= '<input class="userId" type="hidden" value="'.$info_userVis['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userVis['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userVis['process_comment'].'"/>';
- $str .= '</span>';
-
- $str .= '<span id="dropZone">';
- $str .= $dropZone;
- $str .= '</span>';
- $str .= '</div>';
-
- $i++;
+ $str .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].' '.$user['firstname'].'</option>';
+ }
}
-
}
-
+ $str .= '</optgroup>';
+ }
+ $str .= '</select>';
+ $str .= '<script>';
+ $str .= ' $j("#visaUserList").chosen({width: "250px", disable_search_threshold: 10});';
+ $str .= '</script>';
+
+ require_once 'modules/entities/class/class_manage_listdiff.php';
+ $diff_list = new diffusion_list();
+ $listModels = $diff_list->select_listmodels($typeList);
+
+ $str .= ' <select data-placeholder="'._ADD_VISA_MODEL.'" name="modelList" id="modelList" onchange="loadVisaModelUsers();">';
+ $str .= '<option value=""></option>';
+ foreach ($listModels as $lm) {
+ $str .= '<option value="'.$lm['object_id'].'">'.$lm['title'].'</option>';
+ }
+ $str .= '</select>';
- //FOR USER SIGN
- foreach ($circuit['sign']['users'] as $info_userSign) {
- if(empty($info_userSign['process_date'])) {
- if(($lastUserVis == true && $isVisaStep == true)) {
+ $str .= '<script>';
+ $str .= ' $j("#modelList").chosen({width: "250px", disable_search_threshold: 10});';
+ $str .= '</script>';
+ $str .= '<br/><br/>';
+ }
+ if (!empty($isAllAttachementSignedInfo)) {
+ $str .= '<b style="color:red;">'.$isAllAttachementSignedInfo.'</b>';
+ }
+ $str .= '<div id="visa_content">';
+ //VISA USER IN DOCUMENT
+ $i = 1;
+ $lastUserVis = true;
+
+ if (count($circuit['visa']['users']) == 0 && $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) {
+ $isCurrentVisa = false;
+ foreach ($circuit['visa']['users'] as $it => $info_userVis) {
+ if (empty($info_userVis['process_date'])) {
+ if ($lastUserVis == true && $isVisaStep == true && $isCurrentVisa === false) {
$vised = ' currentVis';
- $modif = 'false';
$disabled = '';
- $del_vis = '';
$link_vis = 'arrow-right ';
- if($info_userSign['requested_signature'] && $info_userSign['user_id'] <> $_SESSION['user']['UserId']){
- $dropZone = '';
- $info_vised = '<p style="color:red;">'._SIGN_USER_COU_DESC.' '.$info_userSign['firstname'].' '.$info_userSign['lastname'].'</p>';
- }else if($info_userSign['requested_signature'] && $info_userSign['user_id'] == $_SESSION['user']['UserId']){
- $dropZone = '';
+ $del_vis = '<div class="delete_visa"></div>';
+ if ($info_userVis['requested_signature'] && $info_userVis['user_id'] != $_SESSION['user']['UserId']) {
+ $info_vised = '<p style="color:red;">'._SIGN_USER_COU_DESC.' '.$info_userVis['firstname'].' '.$info_userVis['lastname'].'</p>';
+ $dropZone = '';
+ } elseif ($info_userVis['requested_signature'] && $info_userVis['user_id'] == $_SESSION['user']['UserId']) {
$info_vised = '<p style="font-weight:normal;">'._SIGN_USER_COU.'</p>';
- }else if(!$info_userSign['requested_signature'] && $info_userSign['user_id'] <> $_SESSION['user']['UserId']){
- $dropZone = '';
- $info_vised = '<p style="color:red;">'._VISA_USER_COU_DESC.' '.$info_userSign['firstname'].' '.$info_userSign['lastname'].'</p>';
- }else {
- $dropZone = '';
+ $dropZone = '';
+ } elseif (!$info_userVis['requested_signature'] && $info_userVis['user_id'] != $_SESSION['user']['UserId']) {
+ $info_vised = '<p style="color:red;">'._VISA_USER_COU_DESC.' '.$info_userVis['firstname'].' '.$info_userVis['lastname'].'</p>';
+ $dropZone = '';
+ } else {
$info_vised = '<p style="font-weight:normal;">'._VISA_USER_COU.'</p>';
+ $dropZone = '';
}
- if($core->test_service('modify_visa_in_signatureBook', 'visa', false)){
- $modif = 'true';
- $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
- $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
- }else{
- $modif = 'false';
- }
- $info_vised .= '<select style="display:none;" id="signRequest_'.$i.'" '.$isAllAttachementSigned;
- $info_vised .= ' disabled="disabled" ';
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true"';
- if (!empty($info_userSign['requested_signature'])) {
- $info_vised .= ' selected="selected" ';
- }
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
-
- }else{
- $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
- $vised = '';
- if($bool_modif == true){
- $modif = 'true';
+ if ($core->test_service('modify_visa_in_signatureBook', 'visa', false)) {
+ $modif = 'true';
+ $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
$del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
- $disabled = '';
- }else{
- $dropZone = '';
+ } else {
$modif = 'false';
+ }
+
+ $info_vised .= '<select style="display:none;" id="signRequest_'.$i.'" '.$isAllAttachementSigned;
+ $info_vised .= ' disabled="disabled" ';
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true"';
+ if (!empty($info_userVis['requested_signature'])) {
+ $info_vised .= ' selected="selected" ';
+ }
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ } else {
+ $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
+ $vised = '';
+ if ($bool_modif == true) {
+ $modif = 'true';
+ $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
+ $disabled = '';
+ } else {
+ $modif = 'false';
+ $dropZone = '';
$del_vis = '';
$disabled = ' disabled="disabled"';
- }
-
- $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
- if (!empty($info_userSign['signatory'])) {
- $info_vised .= ' disabled="disabled" ';
- }
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true"';
- if (!empty($info_userSign['requested_signature'])) {
- $info_vised .= ' selected="selected" ';
- }
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
- $link_vis = 'hourglass-half';
+ }
+
+ $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
+ if (!empty($info_userVis['signatory'])) {
+ $info_vised .= ' disabled="disabled" ';
+ }
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true"';
+ if (!empty($info_userVis['requested_signature'])) {
+ $info_vised .= ' selected="selected" ';
+ }
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ $link_vis = 'hourglass-half';
}
- }else{
- $modif = 'false';
- if (preg_match("/\[DEL\]/", $info_userSign['process_comment'])) {
-
- $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
- if (!empty($info_userSign['signatory'])) {
- $info_vised .= ' disabled="disabled" ';
- }
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
-
- $info_vised .= '<option value="true"';
- if (!empty($info_userSign['requested_signature'])) {
- $info_vised .= ' selected="selected" ';
- }
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
-
- $link_vis = 'hourglass-half';
- $link_vis = 'times';
- $vised = ' moved vised';
- $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
- }else{
- $vised = ' vised';
- $link_vis = 'check';
- if (!empty($info_userVis['signatory'])) {
- $info_vised = '<br/><sub>signé le : '.functions::format_date_db($info_userSign['process_date'],'','',true).'</sub>';
-
- $info_vised = '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" '.$isAllAttachementSigned;
- $info_vised .= ' disabled="disabled" ';
- $info_vised .= '>';
- $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
- $info_vised .= '<option value="true"';
- $info_vised .= ' selected="selected" ';
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
- }else{
- $info_vised = '<br/><sub>visé le : '.functions::format_date_db($info_userSign['process_date'],'','',true).'</sub>';
-
- $info_vised = '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" '.$isAllAttachementSigned;
- $info_vised .= ' disabled="disabled" ';
- $info_vised .= '>';
- $info_vised .= '<option value="false" selected="selected">'._VISA_USER_SEARCH.'</option>';
- $info_vised .= '<option value="true"';
- $info_vised .= '>'._SIGNATORY.'</option>';
- $info_vised .= '</select>';
- }
- }
-
+ $lastUserVis = false;
+ $isCurrentVisa = true;
+ } else {
+ $lastUserVis = true;
+ $modif = 'false';
+
+ $disabled = ' disabled="disabled"';
+ if (preg_match("/\[DEL\]/", $info_userVis['process_comment'])) {
+ $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
+ if (!empty($info_userVis['signatory'])) {
+ $info_vised .= ' disabled="disabled" ';
+ }
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true"';
+ if (!empty($info_userVis['requested_signature'])) {
+ $info_vised .= ' selected="selected" ';
+ }
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ $link_vis = 'times';
+ $vised = ' moved vised';
+ $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
+ } else {
+ if (!empty($info_userVis['signatory'])) {
+ $info_vised = '<br/><sub>signé le : '.functions::format_date_db($info_userVis['process_date'], '', '', true).'</sub>';
+ $info_vised .= '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" disabled="disabled" '.$isAllAttachementSigned;
+ $info_vised .= '>';
+ $info_vised .= '<option value="false" selected="selected">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true"';
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ } else {
+ $info_vised = '<br/><sub>visé le : '.functions::format_date_db($info_userVis['process_date'], '', '', true).'</sub>';
+
+ $info_vised .= '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" disabled="disabled" '.$isAllAttachementSigned;
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true" selected="selected"';
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ }
+
+ $link_vis = 'check';
+ $vised = ' vised';
+ $del_vis = '';
+ }
}
//VISA USER LINE CIRCUIT
$str .= '<div class="droptarget'.$vised.'" id="visa_'.$i.'" draggable="'.$modif.'">';
- $str .= '<span class="visaUserStatus">';
- $str .= '<i class="fa fa-'.$link_vis.'" aria-hidden="true"></i>';
- $str .= '</span>';
+ $str .= '<span class="visaUserStatus">';
+ $str .= '<i class="fa fa-'.$link_vis.'" aria-hidden="true"></i>';
+ $str .= '</span>';
$str .= '<span class="visaUserInfo">';
- $str .= '<sup class="visaUserPos nbResZero">'.$i.'</sup> ';
- $str .= '<i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userSign['lastname'].' '.$info_userSign['firstname'].' <sup class="nbRes">'.$info_userSign['entity_id'].'</sup>';
- $str .= ' <sub><i id="signedUser_'.$i.'" title="au moins un document a été signé par cet utilisateur" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#FDD16C;';
- if (empty($info_userSign['signatory'])) {
- $str .= 'visibility:hidden';
- }
- $str .= '"></i>'.$info_vised;
+ $str .= '<sup class="visaUserPos nbResZero">'.$i.'</sup> ';
+ $str .= '<i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userVis['lastname'].' '.$info_userVis['firstname'].' <sup class="nbRes">'.$info_userVis['entity_id'].'</sup>';
+ $str .= ' <sub><i id="signedUser_'.$i.'" title="au moins un document a été signé par cet utilisateur" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#F99830;';
+ if (empty($info_userVis['signatory'])) {
+ $str .= 'visibility:hidden';
+ }
+ $str .= '"></i>'.$info_vised;
+ $str .= '</span>';
+ $str .= '<span class="visaUserAction">';
+ $str .= $del_vis;
+ $str .= '</span>';
+ $str .= '<span class="visaUserConsigne">';
+ $str .= '<input class="userId" type="hidden" value="'.$info_userVis['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userVis['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userVis['process_comment'].'"/>';
+ $str .= '</span>';
+
+ $str .= '<span id="dropZone">';
+ $str .= $dropZone;
$str .= '</span>';
- $str .= '<span class="visaUserAction">';
- $str .= $del_vis;
- $str .= '</span>';
- $str .= '<span class="visaUserConsigne">';
- $str .= '<input class="userId" type="hidden" value="'.$info_userSign['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userSign['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userSign['process_comment'].'"/>';
- $str .= '</span>';
- $str .= '<span id="dropZone">';
- $str .= $dropZone;
- $str .= '</span>';
$str .= '</div>';
- $i++;
+
+ ++$i;
}
-
}
-
- $str .= '</div>';
-
- if($bool_modif == true){
- //SAVE VISA CIRCUIT
- $str .= '<input type="button" name="send" id="send" value="'._SAVE_CHANGES.'" class="button" ';
- $str .= 'onclick="updateVisaWorkflow('.$res_id.');" /> ';
-
- //SAVE AS MODEL
- $str .= '<input type="button" name="save" id="save" value="Enregistrer comme modèle" class="button" onclick="$(\'modalSaveVisaModel\').style.display = \'block\';" />';
- $str .= '<div id="modalSaveVisaModel" >';
- $str .= '<h3>'._SAVE_POSITION.' '._VISA_WORKFLOW.'</h3><br/>';
- $str .= '<label for="titleModel">'._TITLE.'</label> ';
- $str .= '<input type="text" name="titleModel" id="titleModel"/><br/>';
- $str .= '<input type="button" name="saveModel" id="saveModel" value="'._VALIDATE.'" class="button" onclick="saveVisaWorkflowAsModel();" /> ';
- $str .= '<input type="button" name="cancelModel" id="cancelModel" value="'._CANCEL.'" class="button" onclick="$(\'modalSaveVisaModel\').style.display = \'none\';" />';
+
+ //FOR USER SIGN
+ foreach ($circuit['sign']['users'] as $info_userSign) {
+ if (empty($info_userSign['process_date'])) {
+ if (($lastUserVis == true && $isVisaStep == true)) {
+ $vised = ' currentVis';
+ $modif = 'false';
+ $disabled = '';
+ $del_vis = '';
+ $link_vis = 'arrow-right ';
+ if ($info_userSign['requested_signature'] && $info_userSign['user_id'] != $_SESSION['user']['UserId']) {
+ $dropZone = '';
+ $info_vised = '<p style="color:red;">'._SIGN_USER_COU_DESC.' '.$info_userSign['firstname'].' '.$info_userSign['lastname'].'</p>';
+ } elseif ($info_userSign['requested_signature'] && $info_userSign['user_id'] == $_SESSION['user']['UserId']) {
+ $dropZone = '';
+ $info_vised = '<p style="font-weight:normal;">'._SIGN_USER_COU.'</p>';
+ } elseif (!$info_userSign['requested_signature'] && $info_userSign['user_id'] != $_SESSION['user']['UserId']) {
+ $dropZone = '';
+ $info_vised = '<p style="color:red;">'._VISA_USER_COU_DESC.' '.$info_userSign['firstname'].' '.$info_userSign['lastname'].'</p>';
+ } else {
+ $dropZone = '';
+ $info_vised = '<p style="font-weight:normal;">'._VISA_USER_COU.'</p>';
+ }
+ if ($core->test_service('modify_visa_in_signatureBook', 'visa', false)) {
+ $modif = 'true';
+ $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
+ $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
+ } else {
+ $modif = 'false';
+ }
+ $info_vised .= '<select style="display:none;" id="signRequest_'.$i.'" '.$isAllAttachementSigned;
+ $info_vised .= ' disabled="disabled" ';
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true"';
+ if (!empty($info_userSign['requested_signature'])) {
+ $info_vised .= ' selected="selected" ';
+ }
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ } else {
+ $dropZone = '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true" title="'._DRAG_N_DROP_CHANGE_ORDER.'" style="cursor: pointer"></i>';
+ $vised = '';
+ if ($bool_modif == true) {
+ $modif = 'true';
+ $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
+ $disabled = '';
+ } else {
+ $dropZone = '';
+ $modif = 'false';
+ $del_vis = '';
+ $disabled = ' disabled="disabled"';
+ }
+
+ $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
+ if (!empty($info_userSign['signatory'])) {
+ $info_vised .= ' disabled="disabled" ';
+ }
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true"';
+ if (!empty($info_userSign['requested_signature'])) {
+ $info_vised .= ' selected="selected" ';
+ }
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ $link_vis = 'hourglass-half';
+ }
+ } else {
+ $modif = 'false';
+ if (preg_match("/\[DEL\]/", $info_userSign['process_comment'])) {
+ $info_vised = '<br/><select id="signRequest_'.$i.'" '.$isAllAttachementSigned;
+ if (!empty($info_userSign['signatory'])) {
+ $info_vised .= ' disabled="disabled" ';
+ }
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+
+ $info_vised .= '<option value="true"';
+ if (!empty($info_userSign['requested_signature'])) {
+ $info_vised .= ' selected="selected" ';
+ }
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+
+ $link_vis = 'hourglass-half';
+ $link_vis = 'times';
+ $vised = ' moved vised';
+ $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
+ } else {
+ $vised = ' vised';
+ $link_vis = 'check';
+ if (!empty($info_userVis['signatory'])) {
+ $info_vised = '<br/><sub>signé le : '.functions::format_date_db($info_userSign['process_date'], '', '', true).'</sub>';
+
+ $info_vised = '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" '.$isAllAttachementSigned;
+ $info_vised .= ' disabled="disabled" ';
+ $info_vised .= '>';
+ $info_vised .= '<option value="false">'._VISA_USER_SEARCH.'</option>';
+ $info_vised .= '<option value="true"';
+ $info_vised .= ' selected="selected" ';
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ } else {
+ $info_vised = '<br/><sub>visé le : '.functions::format_date_db($info_userSign['process_date'], '', '', true).'</sub>';
+
+ $info_vised = '<br/><select id="signRequest_'.$i.'" style="width:auto;display:none;" '.$isAllAttachementSigned;
+ $info_vised .= ' disabled="disabled" ';
+ $info_vised .= '>';
+ $info_vised .= '<option value="false" selected="selected">'._VISA_USER_SEARCH.'</option>';
+ $info_vised .= '<option value="true"';
+ $info_vised .= '>'._SIGNATORY.'</option>';
+ $info_vised .= '</select>';
+ }
+ }
+ }
+ //VISA USER LINE CIRCUIT
+ $str .= '<div class="droptarget'.$vised.'" id="visa_'.$i.'" draggable="'.$modif.'">';
+ $str .= '<span class="visaUserStatus">';
+ $str .= '<i class="fa fa-'.$link_vis.'" aria-hidden="true"></i>';
+ $str .= '</span>';
+ $str .= '<span class="visaUserInfo">';
+ $str .= '<sup class="visaUserPos nbResZero">'.$i.'</sup> ';
+ $str .= '<i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userSign['lastname'].' '.$info_userSign['firstname'].' <sup class="nbRes">'.$info_userSign['entity_id'].'</sup>';
+ $str .= ' <sub><i id="signedUser_'.$i.'" title="au moins un document a été signé par cet utilisateur" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#F99830;';
+ if (empty($info_userSign['signatory'])) {
+ $str .= 'visibility:hidden';
+ }
+ $str .= '"></i>'.$info_vised;
+ $str .= '</span>';
+ $str .= '<span class="visaUserAction">';
+ $str .= $del_vis;
+ $str .= '</span>';
+ $str .= '<span class="visaUserConsigne">';
+ $str .= '<input class="userId" type="hidden" value="'.$info_userSign['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userSign['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userSign['process_comment'].'"/>';
+ $str .= '</span>';
+ $str .= '<span id="dropZone">';
+ $str .= $dropZone;
+ $str .= '</span>';
$str .= '</div>';
+ ++$i;
}
- $str .= '<script>initDragNDropVisa();</script>';
- return $str;
}
- /* DOSSIER IMPRESSION */
- public function getJoinedFiles($coll_id, $table, $id, $from_res_attachment=false, $filter_attach_type='all') {
+ $str .= '</div>';
+
+ if ($bool_modif == true) {
+ //SAVE VISA CIRCUIT
+ $str .= '<input type="button" name="send" id="send" value="'._SAVE_CHANGES.'" class="button" ';
+ $str .= 'onclick="updateVisaWorkflow('.$res_id.');" /> ';
+
+ //SAVE AS MODEL
+ $str .= '<input type="button" name="save" id="save" value="Enregistrer comme modèle" class="button" onclick="$(\'modalSaveVisaModel\').style.display = \'block\';" />';
+ $str .= '<div id="modalSaveVisaModel" >';
+ $str .= '<h3>'._SAVE_POSITION.' '._VISA_WORKFLOW.'</h3><br/>';
+ $str .= '<label for="titleModel">'._TITLE.'</label> ';
+ $str .= '<input type="text" name="titleModel" id="titleModel"/><br/>';
+ $str .= '<input type="button" name="saveModel" id="saveModel" value="'._VALIDATE.'" class="button" onclick="saveVisaWorkflowAsModel();" /> ';
+ $str .= '<input type="button" name="cancelModel" id="cancelModel" value="'._CANCEL.'" class="button" onclick="$(\'modalSaveVisaModel\').style.display = \'none\';" />';
+ $str .= '</div>';
+ }
+ $str .= '<script>initDragNDropVisa();</script>';
+
+ return $str;
+ }
+
+ /* DOSSIER IMPRESSION */
+ public function getJoinedFiles($coll_id, $table, $id, $from_res_attachment = false, $filter_attach_type = 'all')
+ {
$joinedFiles = array();
$db = new Database();
if ($from_res_attachment === false) {
- require_once('core/class/class_security.php');
- $sec = new security();
- $versionTable = $sec->retrieve_version_table_from_coll_id(
- $coll_id
- );
-
- //Have version table
- if ($versionTable <> '') {
- $stmt = $db->query("select res_id from "
- . $versionTable
- . " where res_id_master = ? and status <> 'DEL' order by res_id desc",
- 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)
- );
- // $db->show();
- //Get infos
- while($res = $stmt->fetchObject()) {
- $label = '';
- //Tile, or subject or description
- if (strlen(trim($res->title)) > 0)
- $label = $res->title;
- elseif (strlen(trim($res->subject)) > 0)
- $label = $res->subject;
- elseif (strlen(trim($res->description)) > 0)
- $label = $res->description;
-
- if (isset($res->typist) && $res->typist != '')
- $typist = $res->typist;
- else $typist = '';
- array_push($joinedFiles,
- array('id' => $res->res_id, //ID
- 'label' => $label, //Label
- 'format' => $res->format, //Format
- 'filesize' => $res->filesize, //Filesize
- 'creation_date' => $res->creation_date, //creation_date
- 'typist' => $typist, //typist
- 'is_version' => true, //Have version bool
- 'version' => $res->relation //Version
- )
- );
- }
- }
- }
-
+ require_once 'core/class/class_security.php';
+ $sec = new security();
+ $versionTable = $sec->retrieve_version_table_from_coll_id(
+ $coll_id
+ );
+
+ //Have version table
+ if ($versionTable != '') {
+ $stmt = $db->query('select res_id from '
+ .$versionTable
+ ." where res_id_master = ? and status <> 'DEL' order by res_id desc",
+ 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)
+ );
+ // $db->show();
+ //Get infos
+ while ($res = $stmt->fetchObject()) {
+ $label = '';
+ //Tile, or subject or description
+ if (strlen(trim($res->title)) > 0) {
+ $label = $res->title;
+ } elseif (strlen(trim($res->subject)) > 0) {
+ $label = $res->subject;
+ } elseif (strlen(trim($res->description)) > 0) {
+ $label = $res->description;
+ }
+
+ if (isset($res->typist) && $res->typist != '') {
+ $typist = $res->typist;
+ } else {
+ $typist = '';
+ }
+ array_push($joinedFiles,
+ array('id' => $res->res_id, //ID
+ 'label' => $label, //Label
+ 'format' => $res->format, //Format
+ 'filesize' => $res->filesize, //Filesize
+ 'creation_date' => $res->creation_date, //creation_date
+ 'typist' => $typist, //typist
+ 'is_version' => true, //Have version bool
+ 'version' => $res->relation, //Version
+ )
+ );
+ }
+ }
+ }
+
$stmt = $db->query(
- "select res_id, description, subject, title, format, filesize, relation, creation_date from "
- . $table . " where res_id = ? and status <> 'DEL'", array($id )
+ 'select res_id, description, subject, title, format, filesize, relation, creation_date from '
+ .$table." where res_id = ? and status <> 'DEL'", array($id)
);
} else {
- require_once 'modules/attachments/attachments_tables.php';
- if ($filter_attach_type == 'all') {
- $stmt = $db->query(
- "select res_id, description, subject, title, format, filesize, res_id_master, attachment_type, creation_date, typist from "
- . RES_ATTACHMENTS_TABLE
- . " where res_id_master = ? and coll_id = ? and attachment_type <> 'converted_pdf' and attachment_type <> 'print_folder' and status <> 'DEL' order by attachment_type, creation_date",
- array($id, $coll_id)
- );
- } else {
- $stmt = $db->query(
- "select res_id, res_id_version, description, subject, title, format, filesize, res_id_master, attachment_type, creation_date, typist from "
- . " res_view_attachments "
- . " where res_id_master = ? and coll_id = ? and attachment_type = '"
- . $filter_attach_type . "' and status not in ('DEL', 'OBS') order by creation_date",
- array($id, $coll_id)
- );
- }
+ require_once 'modules/attachments/attachments_tables.php';
+ if ($filter_attach_type == 'all') {
+ $stmt = $db->query(
+ 'select res_id, description, subject, title, format, filesize, res_id_master, attachment_type, creation_date, typist from '
+ .RES_ATTACHMENTS_TABLE
+ ." where res_id_master = ? and coll_id = ? and attachment_type <> 'converted_pdf' and attachment_type <> 'print_folder' and status <> 'DEL' order by attachment_type, creation_date",
+ array($id, $coll_id)
+ );
+ } else {
+ $stmt = $db->query(
+ 'select res_id, res_id_version, description, subject, title, format, filesize, res_id_master, attachment_type, creation_date, typist from '
+ .' res_view_attachments '
+ ." where res_id_master = ? and coll_id = ? and attachment_type = '"
+ .$filter_attach_type."' and status not in ('DEL', 'OBS') order by creation_date",
+ array($id, $coll_id)
+ );
+ }
}
-
- while($res = $stmt->fetchObject()) {
- $pdf_exist = true;
- if ($from_res_attachment){
- require_once 'modules/attachments/class/attachments_controler.php';
- $ac = new attachments_controler();
- if ($res->res_id <> 0) {
- $idFile = $res->res_id;
- } else {
- $idFile = $res->res_id_version;
- }
- $infos_attach = $ac->getAttachmentInfos($idFile);
-
- $viewLink = $_SESSION['config']['businessappurl']
- . 'index.php?display=true&module=attachments&page=view_attachment&res_id_master='
- . $id . '&id=' . $res->res_id;
- if (!file_exists($infos_attach['pathfile_pdf'])) $pdf_exist = false;
- } else {
- $viewLink = $_SESSION['config']['businessappurl']
- . 'index.php?display=true&dir=indexing_searching&page=view_resource_controler&id='
- . $id;
- $idFile = $res->res_id;
- }
+
+ while ($res = $stmt->fetchObject()) {
+ $pdf_exist = true;
+ if ($from_res_attachment) {
+ require_once 'modules/attachments/class/attachments_controler.php';
+ $ac = new attachments_controler();
+ if ($res->res_id != 0) {
+ $idFile = $res->res_id;
+ } else {
+ $idFile = $res->res_id_version;
+ }
+ $infos_attach = $ac->getAttachmentInfos($idFile);
+
+ $viewLink = $_SESSION['config']['businessappurl']
+ .'index.php?display=true&module=attachments&page=view_attachment&res_id_master='
+ .$id.'&id='.$res->res_id;
+ if (!file_exists($infos_attach['pathfile_pdf'])) {
+ $pdf_exist = false;
+ }
+ } else {
+ $viewLink = $_SESSION['config']['businessappurl']
+ .'index.php?display=true&dir=indexing_searching&page=view_resource_controler&id='
+ .$id;
+ $idFile = $res->res_id;
+ }
$label = '';
//Tile, or subject or description
- if (strlen(trim($res->title)) > 0)
+ if (strlen(trim($res->title)) > 0) {
$label = $res->title;
- elseif (strlen(trim($res->subject)) > 0)
+ } elseif (strlen(trim($res->subject)) > 0) {
$label = $res->subject;
- elseif (strlen(trim($res->description)) > 0)
+ } elseif (strlen(trim($res->description)) > 0) {
$label = $res->description;
-
- if (isset($res->attachment_type) && $res->attachment_type != '')
- $attachment_type = $res->attachment_type;
- else $attachment_type = '';
-
- if (isset($res->typist) && $res->typist != '')
- $typist = $res->typist;
- else $typist = '';
-
- if (
- ($from_res_attachment && $pdf_exist)
- || strtoupper($res->format) == 'PDF'
- ) {
- //nothing
- } else {
- $viewLinkHtml = '<a title="' . _PRINT_DOCUMENT
- . '" target="_blank" '
- . 'href="' . $viewLink . '">'
- . '<i class="fa fa-print fa-2x" title="'
- . _PRINT_DOCUMENT . '"></i>'
- . '</a>';
- }
+ }
+
+ if (isset($res->attachment_type) && $res->attachment_type != '') {
+ $attachment_type = $res->attachment_type;
+ } else {
+ $attachment_type = '';
+ }
+
+ if (isset($res->typist) && $res->typist != '') {
+ $typist = $res->typist;
+ } else {
+ $typist = '';
+ }
+
+ if (
+ ($from_res_attachment && $pdf_exist)
+ || strtoupper($res->format) == 'PDF'
+ ) {
+ //nothing
+ } else {
+ $viewLinkHtml = '<a title="'._PRINT_DOCUMENT
+ .'" target="_blank" '
+ .'href="'.$viewLink.'">'
+ .'<i class="fa fa-print fa-2x" title="'
+ ._PRINT_DOCUMENT.'"></i>'
+ .'</a>';
+ }
array_push($joinedFiles,
array('id' => $idFile, //ID
'label' => $label, //Label
- 'format' => $res->format, //Format
+ 'format' => $res->format, //Format
'filesize' => $res->filesize, //Filesize
'creation_date' => $res->creation_date, //Filesize
'attachment_type' => $attachment_type, //attachment_type
'typist' => $typist, //attachment_type
- 'is_version' => false, //
- 'pdf_exist' => $pdf_exist,
+ 'is_version' => false,
+ 'pdf_exist' => $pdf_exist,
'version' => '',
- 'viewLink' => $viewLinkHtml
+ 'viewLink' => $viewLinkHtml,
)
);
}
+
return $joinedFiles;
}
-
-
- public function showPrintFolder($coll_id, $table, $id)
- {
- require_once 'apps' . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR
- . 'class_indexing_searching_app.php';
- $is = new indexing_searching_app();
-
- require_once 'apps' . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR
- . 'class_users.php';
-
- $users_tools = new class_users();
-
- require_once 'core/class/class_request.php';
-
- $request = new request();
-
- require_once('core/class/class_security.php');
- $sec = new security();
- $view = $sec->retrieve_view_from_coll_id($coll_id);
- $stmt = $this->query("select subject, contact_society, category_id from $view where res_id = ?",array($id));
- $res = $stmt->fetchObject();
- $str = '';
- $str .= '<div align="left" class="block">';
- $str .= '<div class="error" id="divErrorPrint" name="divErrorPrint" onclick="this.hide();"></div>';
-
- $str .= '<p><b>Requérant</b> : '.$res->contact_society.'</p>';
- $str .= '<p><b>Objet</b> : '.$res->subject.'</p>';
- $str .= '<hr/>';
- $str .= '<form style="width:99%;" name="print_folder_form" id="print_folder_form" action="#" method="post">';
- $str .= '<table style="width:99%;" name="print_folder" id="print_folder" >';
- $str .= '<thead><tr><th style="width:25%;text-align:left;"></th><th style="width:40%;text-align:left;">Titre</th><th style="width:20%;text-align:left;">Rédacteur</th><th style="width:10%;text-align:left;">Date</th><th style="width:5%;text-align:left;"><input title="'._SELECT_ALL.'" id="allPrintFolder" type="checkbox" onclick="selectAllPrintFolder();"></th></tr></thead>';
- $str .= '<tbody>';
-
- if ($res->category_id != "outgoing") {
- $str .= '<tr><td><h3>+ Courrier entrant</h3></td><td></td><td></td><td></td><td></td></tr>';
- $joined_files = $this->getJoinedFiles($coll_id, $table, $id, false);
- for($i=0; $i < count($joined_files); $i++) {
- //Get data
- $id_doc = $joined_files[$i]['id'];
- $description = $joined_files[$i]['label'];
- $format = $joined_files[$i]['format'];
-
- $contact = $users_tools->get_user($joined_files[$i]['typist']);
- $dateFormat = explode(" ",$joined_files[$i]['creation_date']);
- $creation_date = $request->dateformat($dateFormat[0]);
-
- if ($format == 'pdf'){
- $check = 'class="check checkPrintFolder" checked="checked"';
-
- }else{
- $check = ' disabled title="' . _NO_PDF_FILE . '"';
- }
- //Show data
- if($joined_files[$i]['is_version'] === true){
- //Version
- $version = ' - '._VERSION.' '.$joined_files[$i]['version'] ;
- $str .= '<tr><td>'
- . '</td><td>'.$description.$version.'</td><td>'.$contact['firstname']." "
- . $contact['lastname'].'</td><td>'.$creation_date
- . '</td><td><input id="join_file_'.$id_doc.'_V'.$joined_files[$i]['version']
- . '" type="checkbox" name="join_version[]" value="'.$id_doc
- . '"/>' . $joined_files[$i]['viewLink'] . '</td></tr>';
- } else {
- $str .= '<tr><td></td><td>'.$description.'</td><td>'.$res->contact_society
- . '</td><td>'.$creation_date.'</td><td><input id="join_file_'
- . $id_doc.'" type="checkbox" name="join_file[]" value="'.$id_doc.'" '.$check
- . '/>' . $joined_files[$i]['viewLink'] . '</td></tr>';
- }
+
+ public function showPrintFolder($coll_id, $table, $id)
+ {
+ require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+ .DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR
+ .'class_indexing_searching_app.php';
+ $is = new indexing_searching_app();
+
+ require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id']
+ .DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR
+ .'class_users.php';
+
+ $users_tools = new class_users();
+
+ require_once 'core/class/class_request.php';
+
+ $request = new request();
+
+ require_once 'core/class/class_security.php';
+ $sec = new security();
+ $view = $sec->retrieve_view_from_coll_id($coll_id);
+ $stmt = $this->query("select subject, contact_society, category_id from $view where res_id = ?", array($id));
+ $res = $stmt->fetchObject();
+ $str = '';
+ $str .= '<div align="left" class="block">';
+ $str .= '<div class="error" id="divErrorPrint" name="divErrorPrint" onclick="this.hide();"></div>';
+
+ $str .= '<p><b>Requérant</b> : '.$res->contact_society.'</p>';
+ $str .= '<p><b>Objet</b> : '.$res->subject.'</p>';
+ $str .= '<hr/>';
+ $str .= '<form style="width:99%;" name="print_folder_form" id="print_folder_form" action="#" method="post">';
+ $str .= '<table style="width:99%;" name="print_folder" id="print_folder" >';
+ $str .= '<thead><tr><th style="width:25%;text-align:left;"></th><th style="width:40%;text-align:left;">Titre</th><th style="width:20%;text-align:left;">Rédacteur</th><th style="width:10%;text-align:left;">Date</th><th style="width:5%;text-align:left;"><input title="'._SELECT_ALL.'" id="allPrintFolder" type="checkbox" onclick="selectAllPrintFolder();"></th></tr></thead>';
+ $str .= '<tbody>';
+
+ if ($res->category_id != 'outgoing') {
+ $str .= '<tr><td><h3>+ Courrier entrant</h3></td><td></td><td></td><td></td><td></td></tr>';
+ $joined_files = $this->getJoinedFiles($coll_id, $table, $id, false);
+ for ($i = 0; $i < count($joined_files); ++$i) {
+ //Get data
+ $id_doc = $joined_files[$i]['id'];
+ $description = $joined_files[$i]['label'];
+ $format = $joined_files[$i]['format'];
+
+ $contact = $users_tools->get_user($joined_files[$i]['typist']);
+ $dateFormat = explode(' ', $joined_files[$i]['creation_date']);
+ $creation_date = $request->dateformat($dateFormat[0]);
+
+ if ($format == 'pdf') {
+ $check = 'class="check checkPrintFolder" checked="checked"';
+ } else {
+ $check = ' disabled title="'._NO_PDF_FILE.'"';
+ }
+ //Show data
+ if ($joined_files[$i]['is_version'] === true) {
+ //Version
+ $version = ' - '._VERSION.' '.$joined_files[$i]['version'];
+ $str .= '<tr><td>'
+ .'</td><td>'.$description.$version.'</td><td>'.$contact['firstname'].' '
+ .$contact['lastname'].'</td><td>'.$creation_date
+ .'</td><td><input id="join_file_'.$id_doc.'_V'.$joined_files[$i]['version']
+ .'" type="checkbox" name="join_version[]" value="'.$id_doc
+ .'"/>'.$joined_files[$i]['viewLink'].'</td></tr>';
+ } else {
+ $str .= '<tr><td></td><td>'.$description.'</td><td>'.$res->contact_society
+ .'</td><td>'.$creation_date.'</td><td><input id="join_file_'
+ .$id_doc.'" type="checkbox" name="join_file[]" value="'.$id_doc.'" '.$check
+ .'/>'.$joined_files[$i]['viewLink'].'</td></tr>';
}
}
- //ATTACHMENTS TYPES LOOP
- foreach ($_SESSION['attachment_types'] as $attachmentTypeId => $attachmentTypeLabel) {
- if($attachmentTypeId <> 'print_folder' && $attachmentTypeId <> 'converted_pdf'){
- $joined_files = $this->getJoinedFiles($coll_id, $table, $id, true, $attachmentTypeId);
- if (count ($joined_files) > 0){
- $str .= '<tr><td><h3>+ '.$attachmentTypeLabel.'</h3></td><td></td><td></td><td></td><td></td></tr>';
- for($i=0; $i < count($joined_files); $i++) {
- $id_doc = $joined_files[$i]['id'];
- $description = $joined_files[$i]['label'];
- $format = $joined_files[$i]['format'];
- $contact = $users_tools->get_user($joined_files[$i]['typist']);
- $dateFormat = explode(" ",$joined_files[$i]['creation_date']);
- $creation_date = $request->dateformat($dateFormat[0]);
- if ($joined_files[$i]['pdf_exist']){
- $check = 'class="check checkPrintFolder" checked="checked"';
- }else{
- $check = ' disabled title="' . _NO_PDF_FILE . '"';
- }
- $str .= '<tr><td></td><td>'.$description.'</td><td>'.$contact['firstname']." "
- . $contact['lastname'].'</td><td>'.$creation_date.'</td><td><input id="join_file_'
- . $id_doc.'" type="checkbox" name="join_attachment[]" value="'.$id_doc.'" '.$check
- . '/>' . $joined_files[$i]['viewLink'] . '</td></tr>';
+ }
+ //ATTACHMENTS TYPES LOOP
+ foreach ($_SESSION['attachment_types'] as $attachmentTypeId => $attachmentTypeLabel) {
+ if ($attachmentTypeId != 'print_folder' && $attachmentTypeId != 'converted_pdf') {
+ $joined_files = $this->getJoinedFiles($coll_id, $table, $id, true, $attachmentTypeId);
+ if (count($joined_files) > 0) {
+ $str .= '<tr><td><h3>+ '.$attachmentTypeLabel.'</h3></td><td></td><td></td><td></td><td></td></tr>';
+ for ($i = 0; $i < count($joined_files); ++$i) {
+ $id_doc = $joined_files[$i]['id'];
+ $description = $joined_files[$i]['label'];
+ $format = $joined_files[$i]['format'];
+ $contact = $users_tools->get_user($joined_files[$i]['typist']);
+ $dateFormat = explode(' ', $joined_files[$i]['creation_date']);
+ $creation_date = $request->dateformat($dateFormat[0]);
+ if ($joined_files[$i]['pdf_exist']) {
+ $check = 'class="check checkPrintFolder" checked="checked"';
+ } else {
+ $check = ' disabled title="'._NO_PDF_FILE.'"';
}
+ $str .= '<tr><td></td><td>'.$description.'</td><td>'.$contact['firstname'].' '
+ .$contact['lastname'].'</td><td>'.$creation_date.'</td><td><input id="join_file_'
+ .$id_doc.'" type="checkbox" name="join_attachment[]" value="'.$id_doc.'" '.$check
+ .'/>'.$joined_files[$i]['viewLink'].'</td></tr>';
}
}
}
+ }
+
+ //NOTES
+ $core_tools = new core_tools();
+ if ($core_tools->is_module_loaded('notes')) {
+ require_once 'modules'.DIRECTORY_SEPARATOR.'notes'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
- //NOTES
- $core_tools = new core_tools();
- if ($core_tools->is_module_loaded('notes')) {
- require_once "modules" . DIRECTORY_SEPARATOR . "notes" . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR . "class_modules_tools.php";
-
- $notes_tools = new notes();
- $user_notes = $notes_tools->getUserNotes($id, $coll_id);
- if (count($user_notes) >0) {
- $str .= '<tr><td><h3>+ '._NOTES.'</h3></td><td></td><td></td><td></td><td></td></tr>';
- for($i=0; $i < count($user_notes); $i++) {
- //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("'", " ", " ", """),
+ $notes_tools = new notes();
+ $user_notes = $notes_tools->getUserNotes($id, $coll_id);
+ if (count($user_notes) > 0) {
+ $str .= '<tr><td><h3>+ '._NOTES.'</h3></td><td></td><td></td><td></td><td></td></tr>';
+ for ($i = 0; $i < count($user_notes); ++$i) {
+ //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 = functions::xssafe($noteShort);
- $note = $user_notes[$i]['label'];
- $userArray = $users_tools->get_user($user_notes[$i]['author']);
- $date = $request->dateformat($user_notes[$i]['date']);
+ $noteShort = functions::xssafe($noteShort);
+ $note = $user_notes[$i]['label'];
+ $userArray = $users_tools->get_user($user_notes[$i]['author']);
+ $date = $request->dateformat($user_notes[$i]['date']);
- $check = ' ';
+ $check = ' ';
- $str .= '<tr><td></td><td>'.$noteShort.'</td><td>'
- .$userArray['firstname']." ".$userArray['lastname']
+ $str .= '<tr><td></td><td>'.$noteShort.'</td><td>'
+ .$userArray['firstname'].' '.$userArray['lastname']
.'</td><td>'.$date.'</td><td><input id="note_'.$idNote.'" class="checkPrintFolder" type="checkbox" name="notes[]" value="'
.$idNote.'" '.$check.'/></td></tr>';
- }
}
}
-
- $str .= '</body>';
- $str .= '</table>';
-
- $path_to_script = $_SESSION['config']['businessappurl']
- ."index.php?display=true&module=visa&page=printFolder_ajax";
-
- $str .= '<hr/>';
- $str .= '<input style="margin-left:44%" type="button" name="send" id="send" value="Imprimer" class="button" onclick="printFolder(\''.$id.'\', \''.$coll_id.'\', \'print_folder_form\', \''.$path_to_script.'\');" /> ';
- $str .= '</form>';
- $str .= '</div>';
-
- return $str;
- }
-
- public function isAllAttachementSigned($res_id){
-
- $db = new Database();
- $stmt2 = $db->query("SELECT count(1) as nb from res_view_attachments WHERE in_signature_book = true AND signatory_user_serial_id IS NULL AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN ('converted_pdf','print_folder','signed_response') AND res_id_master = ?", array($res_id));
- $res2 = $stmt2->fetchObject();
- $stmt3 = $db->query("SELECT count(1) as nb from res_view_attachments WHERE in_signature_book = true AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN ('converted_pdf','print_folder','signed_response') AND res_id_master = ?", array($res_id));
- $res3 = $stmt3->fetchObject();
- if ($res3->nb == 0) {
- return 'noAttachment';
- } else if ($res2->nb == 0) {
- return 'yes';
- }else{
- return false;
- }
- }
-
- public function currentUserSignRequired($res_id){
- $user_id = $this->getCurrentUserStep($res_id);
- $db = new Database();
- $stmt = $db->query("SELECT count(listinstance_id) as nb from listinstance l where l.res_id=? AND l.item_id=? AND l.difflist_type='VISA_CIRCUIT' AND l.requested_signature='true'", array($res_id,$user_id));
- $res = $stmt->fetchObject();
- $stmt2 = $db->query("SELECT count(1) as nb from res_view_attachments r where r.res_id_master=? AND r.signatory_user_serial_id = (select id from users where user_id = ?) AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN ('converted_pdf','print_folder')", array($res_id,$user_id));
- $res2 = $stmt2->fetchObject();
-
- if ($res->nb > 0 && $res2->nb == 0) {
- return 'true';
- } else {
- return 'false';
- }
- }
-}
+ }
+
+ $str .= '</body>';
+ $str .= '</table>';
+
+ $path_to_script = $_SESSION['config']['businessappurl']
+ .'index.php?display=true&module=visa&page=printFolder_ajax';
+
+ $str .= '<hr/>';
+ $str .= '<input style="margin-left:44%" type="button" name="send" id="send" value="Imprimer" class="button" onclick="printFolder(\''.$id.'\', \''.$coll_id.'\', \'print_folder_form\', \''.$path_to_script.'\');" /> ';
+ $str .= '</form>';
+ $str .= '</div>';
+
+ return $str;
+ }
+
+ public function isAllAttachementSigned($res_id)
+ {
+ $db = new Database();
+ $stmt2 = $db->query("SELECT count(1) as nb from res_view_attachments WHERE in_signature_book = true AND signatory_user_serial_id IS NULL AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN ('converted_pdf','print_folder','signed_response') AND res_id_master = ?", array($res_id));
+ $res2 = $stmt2->fetchObject();
+ $stmt3 = $db->query("SELECT count(1) as nb from res_view_attachments WHERE in_signature_book = true AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN ('converted_pdf','print_folder','signed_response') AND res_id_master = ?", array($res_id));
+ $res3 = $stmt3->fetchObject();
+ if ($res3->nb == 0) {
+ return 'noAttachment';
+ } elseif ($res2->nb == 0) {
+ return 'yes';
+ } else {
+ return false;
+ }
+ }
+
+ public function currentUserSignRequired($res_id)
+ {
+ $user_id = $this->getCurrentUserStep($res_id);
+ $db = new Database();
+ $stmt = $db->query("SELECT count(listinstance_id) as nb from listinstance l where l.res_id=? AND l.item_id=? AND l.difflist_type='VISA_CIRCUIT' AND l.requested_signature='true'", array($res_id, $user_id));
+ $res = $stmt->fetchObject();
+ $stmt2 = $db->query("SELECT count(1) as nb from res_view_attachments r where r.res_id_master=? AND r.signatory_user_serial_id = (select id from users where user_id = ?) AND status NOT IN ('DEL','OBS','TMP') AND attachment_type NOT IN ('converted_pdf','print_folder')", array($res_id, $user_id));
+ $res2 = $stmt2->fetchObject();
+ if ($res->nb > 0 && $res2->nb == 0) {
+ return 'true';
+ } else {
+ return 'false';
+ }
+ }
+}
abstract class PdfNotes_Abstract extends FPDI
{
- function LoadData($tab, $collId)
- {
- require_once 'modules/notes/notes_tables.php';
- require_once 'core/class/class_request.php';
- $request = new request();
- // Lecture des lignes du fichier
- $data = array();
-
- $db2 = new Database();
- foreach($tab as $id){
+ public function LoadData($tab, $collId)
+ {
+ require_once 'modules/notes/notes_tables.php';
+ require_once 'core/class/class_request.php';
+ $request = new request();
+ // Lecture des lignes du fichier
+ $data = array();
+
+ $db2 = new Database();
+ foreach ($tab as $id) {
//Check if ID exists
$arrayPDO = array();
- if (! empty($collId)) {
- $where = " and coll_id = :collId";
- $arrayPDO = array_merge($arrayPDO, array(":collId" => $collId));
- }
- $arrayPDO = array_merge($arrayPDO, array(":Id" => $id));
+ if (!empty($collId)) {
+ $where = ' and coll_id = :collId';
+ $arrayPDO = array_merge($arrayPDO, array(':collId' => $collId));
+ }
+ $arrayPDO = array_merge($arrayPDO, array(':Id' => $id));
$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
+ '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
);
-
-
- if($stmt2->rowCount() > 0) {
-
+
+ if ($stmt2->rowCount() > 0) {
$line = $stmt2->fetchObject();
- $user = $request->show_string($line->lastname . " " . $line->firstname);
+ $user = $request->show_string($line->lastname.' '.$line->firstname);
$notes = str_replace('â†', '<=', $line->note_text);
$userId = $line->user_id;
- $date = explode("-",date("d-m-Y", strtotime($line->date_note)));
- $date = $date[0]."/".$date[1]."/".$date[2]." ".date("H:i", strtotime($line->date_note));
+ $date = explode('-', date('d-m-Y', strtotime($line->date_note)));
+ $date = $date[0].'/'.$date[1].'/'.$date[2].' '.date('H:i', strtotime($line->date_note));
$identifier = $line->identifier;
- }
- $data[] = array(utf8_decode($user),$date,utf8_decode($notes));
- }
-
- return $data;
- }
-
- var $widths;
- var $aligns;
-
- function SetWidths($w)
- {
- $this->widths=$w;
- }
-
- function SetAligns($a)
- {
- $this->aligns=$a;
- }
-
- function Row($data)
- {
- //Calcule la hauteur de la ligne
- $nb=0;
- for($i=0;$i<count($data);$i++)
- $nb=max($nb,$this->NbLines($this->widths[$i],$data[$i]));
- $h=5*$nb;
- $this->CheckPageBreak($h);
- for($i=0;$i<count($data);$i++)
- {
- $w=$this->widths[$i];
- $a=isset($this->aligns[$i]) ? $this->aligns[$i] : 'L';
- $x=$this->GetX();$y=$this->GetY();
- $this->Rect($x,$y,$w,$h);
- $this->MultiCell($w,5,$data[$i],0,$a);
- $this->SetXY($x+$w,$y);
- }
- $this->Ln($h);
- }
-
- function CheckPageBreak($h)
- {
- if($this->GetY()+$h>$this->PageBreakTrigger)$this->AddPage($this->CurOrientation);
- }
-
- function NbLines($w,$txt)
- {
- $cw=&$this->CurrentFont['cw'];
- if($w==0)
- $w=$this->w-$this->rMargin-$this->x;
- $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
- $s=str_replace("\r",'',$txt);
- $nb=strlen($s);
- if($nb>0 and $s[$nb-1]=="\n") $nb--;
- $sep=-1;$i=0;$j=0;$l=0;$nl=1;
- while($i<$nb)
- {
- $c=$s[$i];
- if($c=="\n")
- {
- $i++;$sep=-1;$j=$i;$l=0;$nl++;
- continue;
- }
- if($c==' ') $sep=$i;
- $l+=$cw[$c];
- if($l>$wmax)
- {
- if($sep==-1)
- {
- if($i==$j) $i++;
- }
- else
- $i=$sep+1;$sep=-1;$j=$i;$l=0;$nl++;
- }
- else
- $i++;
- }
- return $nl;
- }
+ }
+ $data[] = array(utf8_decode($user), $date, utf8_decode($notes));
+ }
+
+ return $data;
+ }
+
+ public $widths;
+ public $aligns;
+
+ public function SetWidths($w)
+ {
+ $this->widths = $w;
+ }
+
+ public function SetAligns($a)
+ {
+ $this->aligns = $a;
+ }
+
+ public function Row($data)
+ {
+ //Calcule la hauteur de la ligne
+ $nb = 0;
+ for ($i = 0; $i < count($data); ++$i) {
+ $nb = max($nb, $this->NbLines($this->widths[$i], $data[$i]));
+ }
+ $h = 5 * $nb;
+ $this->CheckPageBreak($h);
+ for ($i = 0; $i < count($data); ++$i) {
+ $w = $this->widths[$i];
+ $a = isset($this->aligns[$i]) ? $this->aligns[$i] : 'L';
+ $x = $this->GetX();
+ $y = $this->GetY();
+ $this->Rect($x, $y, $w, $h);
+ $this->MultiCell($w, 5, $data[$i], 0, $a);
+ $this->SetXY($x + $w, $y);
+ }
+ $this->Ln($h);
+ }
+
+ public function CheckPageBreak($h)
+ {
+ if ($this->GetY() + $h > $this->PageBreakTrigger) {
+ $this->AddPage($this->CurOrientation);
+ }
+ }
+
+ public function NbLines($w, $txt)
+ {
+ $cw = &$this->CurrentFont['cw'];
+ if ($w == 0) {
+ $w = $this->w - $this->rMargin - $this->x;
+ }
+ $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+ $s = str_replace("\r", '', $txt);
+ $nb = strlen($s);
+ if ($nb > 0 and $s[$nb - 1] == "\n") {
+ $nb--;
+ }
+ $sep = -1;
+ $i = 0;
+ $j = 0;
+ $l = 0;
+ $nl = 1;
+ while ($i < $nb) {
+ $c = $s[$i];
+ if ($c == "\n") {
+ ++$i;
+ $sep = -1;
+ $j = $i;
+ $l = 0;
+ ++$nl;
+ continue;
+ }
+ if ($c == ' ') {
+ $sep = $i;
+ }
+ $l += $cw[$c];
+ if ($l > $wmax) {
+ if ($sep == -1) {
+ if ($i == $j) {
+ $i++;
+ }
+ } else {
+ $i = $sep + 1;
+ }
+ $sep = -1;
+ $j = $i;
+ $l = 0;
+ ++$nl;
+ } else {
+ $i++;
+ }
+ }
+
+ return $nl;
+ }
}
abstract class ConcatPdf_Abstract extends FPDI
@@ -1376,13 +1429,13 @@ abstract class ConcatPdf_Abstract extends FPDI
public function concat()
{
- foreach($this->files AS $file) {
+ foreach ($this->files as $file) {
$pageCount = $this->setSourceFile($file);
- for ($pageNo = 1; $pageNo <= $pageCount; $pageNo++) {
- $tplIdx = $this->ImportPage($pageNo);
- $s = $this->getTemplatesize($tplIdx);
- $this->AddPage($s['w'] > $s['h'] ? 'L' : 'P', array($s['w'], $s['h']));
- $this->useTemplate($tplIdx);
+ for ($pageNo = 1; $pageNo <= $pageCount; ++$pageNo) {
+ $tplIdx = $this->ImportPage($pageNo);
+ $s = $this->getTemplatesize($tplIdx);
+ $this->AddPage($s['w'] > $s['h'] ? 'L' : 'P', array($s['w'], $s['h']));
+ $this->useTemplate($tplIdx);
}
}
}
@@ -1409,8 +1462,8 @@ Array
[visible] => Y
[viewed] => 0
[difflist_type] => VISA_CIRCUIT
- [process_date] =>
- [process_comment] =>
+ [process_date] =>
+ [process_comment] =>
)
)
@@ -1431,8 +1484,8 @@ Array
[visible] => Y
[viewed] => 0
[difflist_type] => VISA_CIRCUIT
- [process_date] =>
- [process_comment] =>
+ [process_date] =>
+ [process_comment] =>
)
[1] => Array
@@ -1445,8 +1498,8 @@ Array
[visible] => Y
[viewed] => 0
[difflist_type] => VISA_CIRCUIT
- [process_date] =>
- [process_comment] =>
+ [process_date] =>
+ [process_comment] =>
)
[2] => Array
@@ -1459,8 +1512,8 @@ Array
[visible] => Y
[viewed] => 0
[difflist_type] => VISA_CIRCUIT
- [process_date] =>
- [process_comment] =>
+ [process_date] =>
+ [process_comment] =>
)
)
@@ -1481,9 +1534,9 @@ Array
[label] => 123456
[format] => pdf
[filesize] => 46468
- [attachment_type] =>
- [is_version] =>
- [version] =>
+ [attachment_type] =>
+ [is_version] =>
+ [version] =>
)
)
@@ -1496,8 +1549,8 @@ Array
[format] => docx
[filesize] => 36219
[attachment_type] => response_project
- [is_version] =>
- [version] =>
+ [is_version] =>
+ [version] =>
)
[1] => Array
@@ -1507,8 +1560,8 @@ Array
[format] => pdf
[filesize] => 1204460
[attachment_type] => simple_attachment
- [is_version] =>
- [version] =>
+ [is_version] =>
+ [version] =>
)
[2] => Array
@@ -1518,8 +1571,8 @@ Array
[format] => pdf
[filesize] => 361365
[attachment_type] => simple_attachment
- [is_version] =>
- [version] =>
+ [is_version] =>
+ [version] =>
)
)
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index 69362567d064013e21651fac2571029e8fb17245..07aac2689892fe8f68cbde30b55ac0ad6e83c586 100755
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -58,7 +58,7 @@
border: 2px solid #000;
display: none;
position: absolute;
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
left: 40%;
top: 40%;
text-align: center;
@@ -72,7 +72,7 @@
border: 2px solid #000;
display: none;
position: absolute;
- background-color: #DEEDF3;
+ background-color: #F2F2F2;
left: 40%;
top: 10%;
text-align: center;
@@ -92,11 +92,11 @@
}
.unselectedId{
- background-color:#DEEDF3;
+ background-color:#F2F2F2;
}
.selectedId{
- background-color:#FDD16C;
+ background-color:#F99830;
}
@@ -161,8 +161,8 @@
}
.droptarget.currentVis{
- color : #009DC5;
- border: solid 2px #009DC5;
+ color : #135F7F;
+ border: solid 2px #135F7F;
}
.visaUserInfo,.visaUserStatus,.visaUserConsigne,.visaUserAction{
@@ -294,7 +294,7 @@
}
.resListContentFrame:hover{
- background-color: #FDD16C;
+ background-color: #F99830;
}
.resListContentFrame{
@@ -316,7 +316,7 @@
top: 45%;
padding: 5px;
cursor: pointer;
- background: #CEE9F1;
+ background: #F2F2F2;
border-radius:40px;
}
.hideRightContent{
@@ -326,7 +326,7 @@
top: 45%;
padding: 5px;
cursor: pointer;
- background: #CEE9F1;
+ background: #F2F2F2;
border-radius:40px;
}
@@ -337,7 +337,7 @@
top: 45%;
padding: 5px;
cursor: pointer;
- background: #CEE9F1;
+ background: #F2F2F2;
border-radius:40px;
}
@@ -451,7 +451,7 @@
margin-top: 2px;
text-align: center;
cursor: pointer;
- background: #009DC5;
+ background: #135F7F;
color: white;
padding:10px;
/*border-radius: 25px;*/
@@ -510,7 +510,7 @@
}
img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
- border: solid 2px #009DC5;
+ border: solid 2px #135F7F;
cursor:pointer;
}
@@ -543,7 +543,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
border: solid 1px black;
vertical-align: middle;
font-weight: bold;
- background: #009DC5;
+ background: #135F7F;
color: white;
text-transform : uppercase;
white-space: nowrap;
@@ -590,7 +590,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
padding-right: 10px;
padding-bottom: 7px;
color:#666;
- background-color: #deedf3;
+ background-color: #F2F2F2;
}
/*.titleSignatureBook span{
display: inline-block;
@@ -626,7 +626,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
height:91vh;
white-space: nowrap;
overflow: hidden;
- background-color: #CEE9F1;
+ background-color: #F2F2F2;
margin-top: 5px;
}
@@ -637,7 +637,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
cursor: pointer;
width: 5%;
vertical-align: middle;
- background-color: #deedf3;
+ background-color: #F2F2F2;
}
.headerSignatureBook .activeTabSignatureBook i{
@@ -646,7 +646,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
}
#tabSignatureBook .item.activeTabSignatureBook{
- /*background: #009DC5;
+ /*background: #135F7F;
color:white;*/
-moz-box-shadow: inset 0px 0px 5px 0px #656565;
-webkit-box-shadow: inset 0px 0px 5px 0px #656565;
@@ -657,7 +657,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
}
.resListContentFrameSelected{
- background-color: #FDD16C;
+ background-color: #F99830;
}
@@ -666,14 +666,14 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
-webkit-box-shadow: inset 0px 0px 5px 0px #656565;
-o-box-shadow: inset 0px 0px 5px 0px #656565;
box-shadow: inset 0px 0px 5px 0px #656565;
- background-color: #FDD16C;
+ background-color: #F99830;
}
.panelSelectedThumbnail{
-moz-box-shadow: inset 0px 0px 5px 0px #656565;
-webkit-box-shadow: inset 0px 0px 5px 0px #656565;
-o-box-shadow: inset 0px 0px 5px 0px #656565;
box-shadow: inset 0px 0px 5px 0px #656565;
- background-color: #FDD16C;
+ background-color: #F99830;
color: #666 !important;
}
@@ -785,7 +785,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
background-color: transparent;
border-collapse: collapse;
border-spacing: 0;
- border-bottom: solid 1px #009DC5;
+ border-bottom: solid 1px #135F7F;
}
.ng-table td{
@@ -794,7 +794,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
}
.ng-table th{
- border-bottom: solid 1px #009DC5;
+ border-bottom: solid 1px #135F7F;
}
.ng-table-counts{
@@ -803,14 +803,14 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
.ng-table-pagination li{
display: inline-block;
- border: solid 1px #009DC5;
+ border: solid 1px #135F7F;
padding: 5px;
margin:5px;
border-radius: 10px;
}
.ng-table-pagination li.active{
- background : #009DC5;
+ background : #135F7F;
color: white;
}
@@ -819,7 +819,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
}
.ng-table-pagination li:hover{
- background : #009DC5;
+ background : #135F7F;
color: white;
}
@@ -878,7 +878,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
transition: height 0.5s;
}
.pjSign:hover img:hover{
- border: solid 2px #009DC5;
+ border: solid 2px #135F7F;
}
.pjSign:hover {
width : 95%;
@@ -895,7 +895,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
cursor: pointer;
}
.panelRightListPj:hover{
- color: #009DC5;
+ color: #135F7F;
}
.panelRightAddPj{
diff --git a/modules/visa/documents_list_with_signatory.php b/modules/visa/documents_list_with_signatory.php
index 0cd67199633d184fd29fd595e406dd74d7479f74..17928a4af75477aa9bb6273f8da8fc70a8e6d7bd 100755
--- a/modules/visa/documents_list_with_signatory.php
+++ b/modules/visa/documents_list_with_signatory.php
@@ -4,26 +4,27 @@
* See LICENCE.txt file at the root folder for more details.
* This file is part of Maarch software.
+*
* @brief documents_list_with_signatory
+*
* @author dev <dev@maarch.org>
* @ingroup visa
*/
-
require_once 'core/class/class_request.php';
require_once 'core/class/class_security.php';
-require_once 'apps/' . $_SESSION['config']['app_id'] . '/class/class_contacts_v2.php';
+require_once 'apps/'.$_SESSION['config']['app_id'].'/class/class_contacts_v2.php';
require_once 'core/class/class_manage_status.php';
-require_once 'apps/' . $_SESSION['config']['app_id'] . '/class/class_lists.php';
-
+require_once 'apps/'.$_SESSION['config']['app_id'].'/class/class_lists.php';
+
$status_obj = new manage_status();
-$security = new security();
+$security = new security();
$core_tools = new core_tools();
-$request = new request();
-$contact = new contacts_v2();
-$list = new lists();
+$request = new request();
+$contact = new contacts_v2();
+$list = new lists();
//Include definition fields
-require_once 'apps/' . $_SESSION['config']['app_id'] . '/definition_mail_categories.php';
+require_once 'apps/'.$_SESSION['config']['app_id'].'/definition_mail_categories.php';
//Order
$order = $order_field = '';
@@ -31,28 +32,33 @@ require_once 'apps/' . $_SESSION['config']['app_id'] . '/definition_mail_categor
$order_field = $list->getOrderField();
$_SESSION['save_list']['order'] = $order;
$_SESSION['save_list']['order_field'] = $order_field;
- //URL extra Parameters
+ //URL extra Parameters
$parameters = '';
$start = $list->getStart();
- if (!empty($order_field) && !empty($order)) $parameters .= '&order='.$order.'&order_field='.$order_field;
- if (!empty($what)) $parameters .= '&what='.$what;
- if (!empty($selectedTemplate)) $parameters .= '&template='.$selectedTemplate;
- if (!empty($start)) $parameters .= '&start='.$start;
- $_SESSION['save_list']['start'] = $start;
-
-
+ if (!empty($order_field) && !empty($order)) {
+ $parameters .= '&order='.$order.'&order_field='.$order_field;
+ }
+ if (!empty($what)) {
+ $parameters .= '&what='.$what;
+ }
+ if (!empty($selectedTemplate)) {
+ $parameters .= '&template='.$selectedTemplate;
+ }
+ if (!empty($start)) {
+ $parameters .= '&start='.$start;
+ }
+ $_SESSION['save_list']['start'] = $start;
//Keep some parameters
$parameters = '';
if (isset($_REQUEST['order']) && !empty($_REQUEST['order'])) {
-
$parameters .= '&order='.$_REQUEST['order'];
$_SESSION['save_list']['order'] = $_REQUEST['order'];
if (isset($_REQUEST['order_field']) && !empty($_REQUEST['order_field'])) {
$parameters .= '&order_field='.$_REQUEST['order_field'];
$_SESSION['save_list']['order_field'] = $_REQUEST['order_field'];
- }
+ }
}
if (isset($_REQUEST['what']) && !empty($_REQUEST['what'])) {
$parameters .= '&what='.$_REQUEST['what'];
@@ -69,7 +75,9 @@ if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
$urlParameters = '';
//origin
-if ($_REQUEST['origin'] == 'searching') $urlParameters .= '&origin=searching';
+if ($_REQUEST['origin'] == 'searching') {
+ $urlParameters .= '&origin=searching';
+}
//Basket information
if (!empty($_SESSION['current_basket']['view'])) {
@@ -78,37 +86,41 @@ if (!empty($_SESSION['current_basket']['view'])) {
$table = $_SESSION['current_basket']['table'];
}
$_SESSION['origin'] = 'basket';
-$_SESSION['collection_id_choice'] = $_SESSION['current_basket']['coll_id'];//Collection
+$_SESSION['collection_id_choice'] = $_SESSION['current_basket']['coll_id']; //Collection
//Table
-$select[$table]= array();
+$select[$table] = array();
//Fields
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", 'modification_date', "admission_date", "subject",
- "process_limit_date", 'recommendation_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", "address_id", "res_id as signatory_user"
+ $select[$table], 'res_id', 'status', 'category_id as category_img',
+ 'contact_firstname', 'contact_lastname', 'contact_society', 'user_lastname',
+ 'user_firstname', 'priority', 'creation_date', 'modification_date', 'admission_date', 'subject',
+ 'process_limit_date', 'recommendation_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', 'address_id', 'res_id as signatory_user'
);
-
-if ($core_tools->is_module_loaded("cases") == true) {
- array_push($select[$table], "case_id", "case_label", "case_description");
+
+if ($core_tools->is_module_loaded('cases') == true) {
+ array_push($select[$table], 'case_id', 'case_label', 'case_description');
}
$arrayPDO = array();
//Where clause
$where_tab = array();
//From basket
-if (!empty($_SESSION['current_basket']['clause'])) $where_tab[] = '('.stripslashes($_SESSION['current_basket']['clause']).')'; //Basket clause
+if (!empty($_SESSION['current_basket']['clause'])) {
+ $where_tab[] = '('.stripslashes($_SESSION['current_basket']['clause']).')';
+} //Basket clause
//From filters
- $filterClause = $list->getFilters();
-if (!empty($filterClause)) $where_tab[] = $filterClause;//Filter clause
+ $filterClause = $list->getFilters();
+if (!empty($filterClause)) {
+ $where_tab[] = $filterClause;
+} //Filter clause
//From search
-if ((isset($_REQUEST['origin']) && $_REQUEST['origin'] == 'searching')
+if ((isset($_REQUEST['origin']) && $_REQUEST['origin'] == 'searching')
&& !empty($_SESSION['searching']['where_request'])
) {
- $where_tab[] = $_SESSION['searching']['where_request']. '(1=1)';
+ $where_tab[] = $_SESSION['searching']['where_request'].'(1=1)';
$arrayPDO = array_merge($arrayPDO, $_SESSION['searching']['where_request_parameters']);
}
//Build where
@@ -116,28 +128,28 @@ $where = implode(' and ', $where_tab);
//Order
$order = $order_field = '';
-$arr_order = explode(',',$_SESSION['current_basket']['basket_res_order']);
-if (count($arr_order) == 1 ) {
+$arr_order = explode(',', $_SESSION['current_basket']['basket_res_order']);
+if (count($arr_order) == 1) {
$order = $list->getOrder();
$order_field = $list->getOrderField();
}
if (!empty($order_field) && !empty($order)) {
if ($_REQUEST['order_field'] == 'alt_identifier') {
- $orderstr = "order by order_alphanum(alt_identifier)"." ".$order;
+ $orderstr = 'order by order_alphanum(alt_identifier)'.' '.$order;
} else {
- $orderstr = "order by ".$order_field." ".$order;
+ $orderstr = 'order by '.$order_field.' '.$order;
}
$_SESSION['last_order_basket'] = $orderstr;
-} else if (!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])) {
+} elseif (!empty($_SESSION['save_list']['order']) && !empty($_SESSION['save_list']['order_field'])) {
if ($_SESSION['save_list']['order_field'] == 'alt_identifier') {
- $orderstr = "order by order_alphanum(alt_identifier)"." ".$_SESSION['save_list']['order'];
+ $orderstr = 'order by order_alphanum(alt_identifier)'.' '.$_SESSION['save_list']['order'];
} else {
- $orderstr = "order by ".$_SESSION['save_list']['order_field']." ".$_SESSION['save_list']['order'];
+ $orderstr = 'order by '.$_SESSION['save_list']['order_field'].' '.$_SESSION['save_list']['order'];
}
$_SESSION['last_order_basket'] = $orderstr;
} else {
- if(!empty($_SESSION['current_basket']['basket_res_order'])) {
- if (count($arr_order) == 1 ) {
+ if (!empty($_SESSION['current_basket']['basket_res_order'])) {
+ if (count($arr_order) == 1) {
$list->setOrder();
$list->setOrderField($arr_order[0]);
}
@@ -146,13 +158,13 @@ if (!empty($order_field) && !empty($order)) {
} else {
$list->setOrder();
$list->setOrderField('res_id');
- $orderstr = "order by res_id desc";
+ $orderstr = 'order by res_id desc';
$_SESSION['last_order_basket'] = $orderstr;
}
}
//Request
-$tab=$request->PDOselect($select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], $_SESSION['config']['databasesearchlimit'], false, "", "", "", false, false, 'distinct');
+$tab = $request->PDOselect($select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], $_SESSION['config']['databasesearchlimit'], false, '', '', '', false, false, 'distinct');
// $request->show(); exit;
//Templates
$defaultTemplate = 'documents_list_with_signatory';
@@ -165,217 +177,198 @@ if (empty($selectedTemplate)) {
}
$template_list = array();
array_push($template_list, 'documents_list_with_signatory');
-if($core_tools->is_module_loaded('cases'))
+if ($core_tools->is_module_loaded('cases')) {
array_push($template_list, 'cases_list');
+}
//For status icon
$extension_icon = '';
-if($selectedTemplate <> 'none') $extension_icon = "_big";
+if ($selectedTemplate != 'none') {
+ $extension_icon = '_big';
+}
$db = new Database();
//Result Array
$tabI = count($tab);
-for ($i=0;$i<$tabI;$i++) {
-
+for ($i = 0; $i < $tabI; ++$i) {
$tabJ = count($tab[$i]);
- for ($j=0;$j<$tabJ;$j++) {
-
+ for ($j = 0; $j < $tabJ; ++$j) {
foreach (array_keys($tab[$i][$j]) as $value) {
-
- if ($tab[$i][$j][$value]=="res_id") {
-
- $tab[$i][$j]["res_id"]=$tab[$i][$j]['value'];
- $tab[$i][$j]["label"]=_GED_NUM;
- $tab[$i][$j]["size"]="4";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='res_id';
+ if ($tab[$i][$j][$value] == 'res_id') {
+ $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label'] = _GED_NUM;
+ $tab[$i][$j]['size'] = '4';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'res_id';
$_SESSION['mlb_search_current_res_id'] = $tab[$i][$j]['value'];
// notes
- $query = "SELECT ";
- $query .= "notes.id ";
- $query .= "FROM ";
- $query .= "notes ";
- $query .= "left join ";
- $query .= "note_entities ";
- $query .= "on ";
- $query .= "notes.id = note_entities.note_id ";
- $query .= "WHERE ";
+ $query = 'SELECT ';
+ $query .= 'notes.id ';
+ $query .= 'FROM ';
+ $query .= 'notes ';
+ $query .= 'left join ';
+ $query .= 'note_entities ';
+ $query .= 'on ';
+ $query .= 'notes.id = note_entities.note_id ';
+ $query .= 'WHERE ';
$query .= "tablename = 'res_letterbox' ";
- $query .= "AND ";
+ $query .= 'AND ';
$query .= "coll_id = 'letterbox_coll' ";
- $query .= "AND ";
- $query .= "identifier = ? ";
+ $query .= 'AND ';
+ $query .= 'identifier = ? ';
$arrayPDOnotes = array($tab[$i][$j]['value']);
- $query .= "AND ";
- $query .= "( ";
- $query .= "( ";
- $query .= "item_id IN (";
+ $query .= 'AND ';
+ $query .= '( ';
+ $query .= '( ';
+ $query .= 'item_id IN (';
foreach ($_SESSION['user']['entities'] as $entitiestmpnote) {
- $query .= "?, ";
+ $query .= '?, ';
$arrayPDOnotes = array_merge($arrayPDOnotes, array($entitiestmpnote['ENTITY_ID']));
}
$query = substr($query, 0, -2);
- $query .= ") ";
- $query .= "OR ";
- $query .= "item_id IS NULL ";
- $query .= ") ";
- $query .= "OR ";
- $query .= "user_id = ? ";
+ $query .= ') ';
+ $query .= 'OR ';
+ $query .= 'item_id IS NULL ';
+ $query .= ') ';
+ $query .= 'OR ';
+ $query .= 'user_id = ? ';
$arrayPDOnotes = array_merge($arrayPDOnotes, array($_SESSION['user']['UserId']));
- $query .= ") ";
+ $query .= ') ';
$stmt = $db->query($query, $arrayPDOnotes);
$tab[$i][$j]['hasNotes'] = $stmt->fetchObject();
$tab[$i][$j]['res_multi_contacts'] = $_SESSION['mlb_search_current_res_id'];
}
- if ($tab[$i][$j][$value]=="creation_date") {
-
- $tab[$i][$j]["value"]=$core_tools->format_date_db($tab[$i][$j]["value"], false, '', true);
- $tab[$i][$j]["label"]=_CREATION_DATE;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='creation_date';
+ if ($tab[$i][$j][$value] == 'creation_date') {
+ $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false, '', true);
+ $tab[$i][$j]['label'] = _CREATION_DATE;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'creation_date';
}
- if ($tab[$i][$j][$value]=="modification_date") {
-
- $tab[$i][$j]["value"] = $core_tools->format_date_db($tab[$i][$j]["value"], false, '', true);
- $tab[$i][$j]["label"] = _MODIFICATION_DATE;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='modification_date';
+ if ($tab[$i][$j][$value] == 'modification_date') {
+ $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false, '', true);
+ $tab[$i][$j]['label'] = _MODIFICATION_DATE;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'modification_date';
}
- if ($tab[$i][$j][$value]=="admission_date") {
-
- $tab[$i][$j]["value"]=$core_tools->format_date_db($tab[$i][$j]["value"], false);
- $tab[$i][$j]["label"]=_ADMISSION_DATE;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["order"]='admission_date';
+ if ($tab[$i][$j][$value] == 'admission_date') {
+ $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
+ $tab[$i][$j]['label'] = _ADMISSION_DATE;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'admission_date';
}
- if ($tab[$i][$j][$value]=="process_limit_date") {
-
- $tab[$i][$j]["value"]=$core_tools->format_date_db($tab[$i][$j]["value"], false);
- $compareDate = "";
- if ($tab[$i][$j]["value"] <> "" && ($statusCmp == "NEW" || $statusCmp == "COU" || $statusCmp == "VAL" || $statusCmp == "RET")) {
-
- $compareDate = $core_tools->compare_date($tab[$i][$j]["value"], date("d-m-Y"));
- if ($compareDate == "date2") {
-
- $tab[$i][$j]["value"] = "<span style='color:red;'><b>".$tab[$i][$j]["value"]."<br><small>(".$core_tools->nbDaysBetween2Dates($tab[$i][$j]["value"], date("d-m-Y"))." "._DAYS.")<small></b></span>";
-
- } elseif ($compareDate == "date1") {
-
- $tab[$i][$j]["value"] = $tab[$i][$j]["value"]."<br><small>(".$core_tools->nbDaysBetween2Dates(date("d-m-Y"), $tab[$i][$j]["value"])." "._DAYS.")<small>";
-
- } elseif ($compareDate == "equal") {
-
- $tab[$i][$j]["value"] = "<span style='color:blue;'><b>".$tab[$i][$j]["value"]."<br><small>("._LAST_DAY.")<small></b></span>";
+ if ($tab[$i][$j][$value] == 'process_limit_date') {
+ $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
+ $compareDate = '';
+ if ($tab[$i][$j]['value'] != '' && ($statusCmp == 'NEW' || $statusCmp == 'COU' || $statusCmp == 'VAL' || $statusCmp == 'RET')) {
+ $compareDate = $core_tools->compare_date($tab[$i][$j]['value'], date('d-m-Y'));
+ if ($compareDate == 'date2') {
+ $tab[$i][$j]['value'] = "<span style='color:red;'><b>".$tab[$i][$j]['value'].'<br><small>('.$core_tools->nbDaysBetween2Dates($tab[$i][$j]['value'], date('d-m-Y')).' '._DAYS.')<small></b></span>';
+ } elseif ($compareDate == 'date1') {
+ $tab[$i][$j]['value'] = $tab[$i][$j]['value'].'<br><small>('.$core_tools->nbDaysBetween2Dates(date('d-m-Y'), $tab[$i][$j]['value']).' '._DAYS.')<small>';
+ } elseif ($compareDate == 'equal') {
+ $tab[$i][$j]['value'] = "<span style='color:blue;'><b>".$tab[$i][$j]['value'].'<br><small>('._LAST_DAY.')<small></b></span>';
}
}
- $tab[$i][$j]["label"]=_PROCESS_LIMIT_DATE;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='process_limit_date';
+ $tab[$i][$j]['label'] = _PROCESS_LIMIT_DATE;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'process_limit_date';
}
- if ($tab[$i][$j][$value]=="recommendation_limit_date") {
-
- $tab[$i][$j]["value"]=$core_tools->format_date_db($tab[$i][$j]["value"], false);
- $tab[$i][$j]["label"]=_RECOMMENDATION_LIMIT_DATE;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["order"]='recommendation_limit_date';
+ if ($tab[$i][$j][$value] == 'recommendation_limit_date') {
+ $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
+ $tab[$i][$j]['label'] = _RECOMMENDATION_LIMIT_DATE;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'recommendation_limit_date';
}
- if ($tab[$i][$j][$value]=="category_id") {
-
- $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]["value"];
- $tab[$i][$j]["value"] = $_SESSION['coll_categories'][$_SESSION['collection_id_choice']][$tab[$i][$j]["value"]];
- $tab[$i][$j]["label"]=_CATEGORY;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='category_id';
+ if ($tab[$i][$j][$value] == 'category_id') {
+ $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = $_SESSION['coll_categories'][$_SESSION['collection_id_choice']][$tab[$i][$j]['value']];
+ $tab[$i][$j]['label'] = _CATEGORY;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'category_id';
}
- if ($tab[$i][$j][$value]=="priority") {
-
+ if ($tab[$i][$j][$value] == 'priority') {
$fakeId = null;
foreach ($_SESSION['mail_priorities_id'] as $key => $prioValue) {
- if ($prioValue == $tab[$i][$j]["value"]) {
+ if ($prioValue == $tab[$i][$j]['value']) {
$fakeId = $key;
}
}
- $tab[$i][$j]["value"] = $_SESSION['mail_priorities'][$fakeId];
- $tab[$i][$j]["label"]=_PRIORITY;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["order"]='priority';
+ $tab[$i][$j]['value'] = $_SESSION['mail_priorities'][$fakeId];
+ $tab[$i][$j]['label'] = _PRIORITY;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = 'priority';
}
- if ($tab[$i][$j][$value]=="subject") {
- $tab[$i][$j]["value"] = $request->cut_string($request->show_string($tab[$i][$j]["value"], '', '', '', false), 250);
- $tab[$i][$j]["label"]=_SUBJECT;
- $tab[$i][$j]["size"]="12";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='subject';
+ if ($tab[$i][$j][$value] == 'subject') {
+ $tab[$i][$j]['value'] = $request->cut_string($request->show_string($tab[$i][$j]['value'], '', '', '', false), 250);
+ $tab[$i][$j]['label'] = _SUBJECT;
+ $tab[$i][$j]['size'] = '12';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'subject';
}
- if ($tab[$i][$j][$value]=="contact_firstname") {
- $contact_firstname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'contact_firstname') {
+ $contact_firstname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if ($tab[$i][$j][$value]=="contact_lastname") {
-
- $contact_lastname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'contact_lastname') {
+ $contact_lastname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if ($tab[$i][$j][$value]=="contact_society") {
-
- $contact_society = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'contact_society') {
+ $contact_society = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if ($tab[$i][$j][$value]=="user_firstname") {
-
- $user_firstname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'user_firstname') {
+ $user_firstname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if ($tab[$i][$j][$value]=="user_lastname") {
-
- $user_lastname = $tab[$i][$j]["value"];
- $tab[$i][$j]["show"]=false;
+ if ($tab[$i][$j][$value] == 'user_lastname') {
+ $user_lastname = $tab[$i][$j]['value'];
+ $tab[$i][$j]['show'] = false;
}
- if ($tab[$i][$j][$value]=="exp_user_id") {
-
+ if ($tab[$i][$j][$value] == 'exp_user_id') {
if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname)) {
- $query = "SELECT ca.firstname, ca.lastname FROM contact_addresses ca, res_view_letterbox rvl
+ $query = 'SELECT ca.firstname, ca.lastname FROM contact_addresses ca, res_view_letterbox rvl
WHERE rvl.res_id = ?
- AND rvl.address_id = ca.id AND rvl.exp_contact_id = ca.contact_id";
+ AND rvl.address_id = ca.id AND rvl.exp_contact_id = ca.contact_id';
$arrayPDO = array($tab[$i][0]['res_id']);
$stmt2 = $db->query($query, $arrayPDO);
$return_contact = $stmt2->fetchObject();
@@ -385,98 +378,94 @@ for ($i=0;$i<$tabI;$i++) {
}
}
- $tab[$i][$j]["label"]=_CONTACT;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
- $tab[$i][$j]["order"]=false;
+ $tab[$i][$j]['label'] = _CONTACT;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
+ $tab[$i][$j]['order'] = false;
}
- if ($tab[$i][$j][$value]=="dest_user") {
-
- $tab[$i][$j]["label"]="dest_user";
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- if ($tab[$i][15]["value"]=='outgoing') {
- $tab[$i][$j]["value"] = "<b>"._TO_CONTACT_C."</b>".$tab[$i][$j]['value'];
+ if ($tab[$i][$j][$value] == 'dest_user') {
+ $tab[$i][$j]['label'] = 'dest_user';
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ if ($tab[$i][15]['value'] == 'outgoing') {
+ $tab[$i][$j]['value'] = '<b>'._TO_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
} else {
- $tab[$i][$j]["value"] = "<b>"._FOR_CONTACT_C."</b>".$tab[$i][$j]['value'];
-
+ $tab[$i][$j]['value'] = '<b>'._FOR_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
}
- $tab[$i][$j]["order"]=false;
+ $tab[$i][$j]['order'] = false;
}
- if ($tab[$i][$j][$value]=="is_multicontacts") {
+ if ($tab[$i][$j][$value] == 'is_multicontacts') {
if ($tab[$i][$j]['value'] == 'Y') {
- $tab[$i][$j]["label"]=_CONTACT;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = _MULTI_CONTACT;
- $tab[$i][$j]["order"]=false;
- $tab[$i][$j]["is_multi_contacts"] = 'Y';
+ $tab[$i][$j]['label'] = _CONTACT;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = _MULTI_CONTACT;
+ $tab[$i][$j]['order'] = false;
+ $tab[$i][$j]['is_multi_contacts'] = 'Y';
}
}
- if ($tab[$i][$j][$value]=="type_label") {
- $tab[$i][$j]["value"] = $request->show_string($tab[$i][$j]["value"]);
- $tab[$i][$j]["label"]=_TYPE;
- $tab[$i][$j]["size"]="12";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='type_label';
+ if ($tab[$i][$j][$value] == 'type_label') {
+ $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+ $tab[$i][$j]['label'] = _TYPE;
+ $tab[$i][$j]['size'] = '12';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'type_label';
}
- if ($tab[$i][$j][$value]=="status") {
+ if ($tab[$i][$j][$value] == 'status') {
//couleurs des priorités
$fakeId = null;
foreach ($_SESSION['mail_priorities_id'] as $key => $prioValue) {
- if ($prioValue == $tab[$i][8]["value"]) {
+ if ($prioValue == $tab[$i][8]['value']) {
$fakeId = $key;
}
}
- $style="style='color:".$_SESSION['mail_priorities_color'][$fakeId].";'";
+ $style = "style='color:".$_SESSION['mail_priorities_color'][$fakeId].";'";
$res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
$statusCmp = $tab[$i][$j]['value'];
$img_class = substr($res_status['IMG_SRC'], 0, 2);
- if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])) {
- $tab[$i][$j]['value'] = "<i ".$style." class = 'fm fm-letter-status-new fm-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+ if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])) {
+ $tab[$i][$j]['value'] = '<i '.$style." class = 'fm fm-letter-status-new fm-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
} else {
- $tab[$i][$j]['value'] = "<i ".$style." class = '".$img_class." ".$res_status['IMG_SRC']." ".$img_class."-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+ $tab[$i][$j]['value'] = '<i '.$style." class = '".$img_class.' '.$res_status['IMG_SRC'].' '.$img_class."-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
}
- $tab[$i][$j]["label"]=_STATUS;
- $tab[$i][$j]["size"]="4";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["order"]='status';
+ $tab[$i][$j]['label'] = _STATUS;
+ $tab[$i][$j]['size'] = '4';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = true;
+ $tab[$i][$j]['order'] = 'status';
}
- if ($tab[$i][$j][$value]=="category_img") {
-
- $tab[$i][$j]["label"]=_CATEGORY;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="right";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
+ if ($tab[$i][$j][$value] == 'category_img') {
+ $tab[$i][$j]['label'] = _CATEGORY;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'right';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
$my_imgcat = get_img_cat($tab[$i][$j]['value'], $extension_icon);
$tab[$i][$j]['value'] = $my_imgcat;
- $tab[$i][$j]["value"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]="category_id";
+ $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'category_id';
}
- if ($tab[$i][$j][$value]=="count_attachment") {
-
+ if ($tab[$i][$j][$value] == 'count_attachment') {
$query = "SELECT count(*) as total FROM res_view_attachments
WHERE res_id_master = ?
AND status NOT IN ('DEL', 'OBS') AND attachment_type NOT IN ('converted_pdf', 'print_folder') AND coll_id = ? AND (status <> 'TMP' or (typist = ? and status = 'TMP'))";
@@ -484,40 +473,37 @@ for ($i=0;$i<$tabI;$i++) {
$stmt2 = $db->query($query, $arrayPDO);
$return_count = $stmt2->fetchObject();
- $tab[$i][$j]["label"]=_ATTACHMENTS;
- $tab[$i][$j]["size"]="12";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
+ $tab[$i][$j]['label'] = _ATTACHMENTS;
+ $tab[$i][$j]['size'] = '12';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
$tab[$i][$j]['value'] = "$return_count->total";
- $tab[$i][$j]["order"]='count_attachment';
+ $tab[$i][$j]['order'] = 'count_attachment';
}
- if ($tab[$i][$j][$value]=="case_id" && $core_tools->is_module_loaded("cases") == true) {
-
- $tab[$i][$j]["label"]=_CASE_NUM;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["value"] = "<a href='".$_SESSION['config']['businessappurl']."index.php?page=details_cases&module=cases&id=".$tab[$i][$j]['value']."'>".$tab[$i][$j]['value']."</a>";
- $tab[$i][$j]["order"]="case_id";
+ if ($tab[$i][$j][$value] == 'case_id' && $core_tools->is_module_loaded('cases') == true) {
+ $tab[$i][$j]['label'] = _CASE_NUM;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['value'] = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&id='.$tab[$i][$j]['value']."'>".$tab[$i][$j]['value'].'</a>';
+ $tab[$i][$j]['order'] = 'case_id';
}
- if ($tab[$i][$j][$value]=="case_label" && $core_tools->is_module_loaded("cases") == true) {
-
- $tab[$i][$j]["label"]=_CASE_LABEL;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]="case_label";
+ if ($tab[$i][$j][$value] == 'case_label' && $core_tools->is_module_loaded('cases') == true) {
+ $tab[$i][$j]['label'] = _CASE_LABEL;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['order'] = 'case_label';
}
- if ($tab[$i][$j][$value]=="signatory_user") {
-
+ if ($tab[$i][$j][$value] == 'signatory_user') {
$query = "SELECT u.firstname || ' ' || u.lastname || ' (' || ue.user_role || ')' as signatory_user, process_date
FROM users u INNER JOIN listinstance l ON u.user_id = l.item_id
INNER JOIN users_entities ue ON ue.user_id=u.user_id WHERE ue.primary_entity = 'Y' AND l.difflist_type = 'VISA_CIRCUIT' AND item_mode = 'sign' AND l.res_id = ?";
@@ -528,20 +514,20 @@ for ($i=0;$i<$tabI;$i++) {
if (!empty($res->signatory_user)) {
$res->signatory_user = str_replace('()', '', $res->signatory_user);
if (empty($res->process_date) || $res->process_date == null) {
- $tab[$i][$j]["value"]='<i class="fa fa-hourglass-half" title="'._SIGN_IN_PROGRESS.'"></i> <span style="color:#16ADEB">'.$res->signatory_user.'</span>';
+ $tab[$i][$j]['value'] = '<i class="fa fa-hourglass-half" title="'._SIGN_IN_PROGRESS.'"></i> <span style="color:#135F7F">'.$res->signatory_user.'</span>';
} else {
- $tab[$i][$j]["value"]='<i class="fa fa-check" style="color:green;" title="'._SIGNED_TO.' '.$core_tools->format_date_db($res->process_date, false, '', true).'"></i> <span style="color:#16ADEB">'.$res->signatory_user.'</span>';
+ $tab[$i][$j]['value'] = '<i class="fa fa-check" style="color:green;" title="'._SIGNED_TO.' '.$core_tools->format_date_db($res->process_date, false, '', true).'"></i> <span style="color:#135F7F">'.$res->signatory_user.'</span>';
}
} else {
- $tab[$i][$j]["value"]='<i style="opacity:0.5;">'._NO_SIGNATORY.'</i>';
+ $tab[$i][$j]['value'] = '<i style="opacity:0.5;">'._NO_SIGNATORY.'</i>';
}
- $tab[$i][$j]["label"]=_SIGNATORY;
- $tab[$i][$j]["size"]="10";
- $tab[$i][$j]["label_align"]="left";
- $tab[$i][$j]["align"]="left";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["order"]='';
+ $tab[$i][$j]['label'] = _SIGNATORY;
+ $tab[$i][$j]['size'] = '10';
+ $tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]['align'] = 'left';
+ $tab[$i][$j]['valign'] = 'bottom';
+ $tab[$i][$j]['show'] = false;
+ $tab[$i][$j]['order'] = '';
}
}
}
@@ -551,7 +537,7 @@ $listKey = 'res_id';
//Initialiser le tableau de param�tres
$paramsTab = array();
-$paramsTab['pageTitle'] = _RESULTS." : ".count($tab).' '._FOUND_DOCS; //Titre de la page
+$paramsTab['pageTitle'] = _RESULTS.' : '.count($tab).' '._FOUND_DOCS; //Titre de la page
$paramsTab['listCss'] = 'listing largerList spec'; //css
$paramsTab['bool_sortColumn'] = true; //Affichage Tri
$paramsTab['bool_bigPageTitle'] = false; //Affichage du titre en grand
@@ -559,8 +545,8 @@ $paramsTab['bool_showIconDocument'] = true;
$paramsTab['bool_showIconDetails'] = true; //Affichage de l'icone de la page de details
$paramsTab['urlParameters'] = 'baskets='.$_SESSION['current_basket']['id']
.$urlParameters; //Parametres d'url supplementaires
-$paramsTab['filters'] = array('entity', 'entity_subentities', 'category', 'priority', 'identifier'); //Filtres
-if (count($template_list) > 0 ) { //Templates
+$paramsTab['filters'] = array('entity', 'entity_subentities', 'category', 'priority', 'identifier'); //Filtres
+if (count($template_list) > 0) { //Templates
$paramsTab['templates'] = array();
$paramsTab['templates'] = $template_list;
}
@@ -569,56 +555,56 @@ $paramsTab['defaultTemplate'] = $defaultTemplate;
$paramsTab['tools'] = array(); //Icones dans la barre d'outils
//Fileplan
if ($core_tools->test_service('fileplan', 'fileplan', false)) {
- include_once "modules" . DIRECTORY_SEPARATOR . "fileplan" . DIRECTORY_SEPARATOR
- . "class" . DIRECTORY_SEPARATOR . "class_modules_tools.php";
+ include_once 'modules'.DIRECTORY_SEPARATOR.'fileplan'.DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php';
$fileplan = new fileplan();
if (count($fileplan->getUserFileplan()) > 0 || (count($fileplan->getEntitiesFileplan()) > 0 && $core_tools->test_service('put_doc_in_fileplan', 'fileplan', false))) {
$paramsTab['bool_checkBox'] = true;
$paramsTab['bool_standaloneForm'] = true;
$positions = array(
- "script" => "showFileplanList('".$_SESSION['config']['businessappurl']
- . "index.php?display=true&module=fileplan&page=fileplan_ajax_script"
- . "&mode=setPosition&origin=basket&coll_id=".$_SESSION['current_basket']['coll_id']
- . $parameters."', 'formList', '600px', '510px', '"
- . _CHOOSE_ONE_DOC."')",
- "icon" => 'bookmark',
- "tooltip" => _FILEPLAN,
- "disabledRules" => count($tab)." == 0 || ".$selectedTemplate." == 'cases_list_search_adv'"
- );
+ 'script' => "showFileplanList('".$_SESSION['config']['businessappurl']
+ .'index.php?display=true&module=fileplan&page=fileplan_ajax_script'
+ .'&mode=setPosition&origin=basket&coll_id='.$_SESSION['current_basket']['coll_id']
+ .$parameters."', 'formList', '600px', '510px', '"
+ ._CHOOSE_ONE_DOC."')",
+ 'icon' => 'bookmark',
+ 'tooltip' => _FILEPLAN,
+ 'disabledRules' => count($tab).' == 0 || '.$selectedTemplate." == 'cases_list_search_adv'",
+ );
array_push($paramsTab['tools'], $positions);
}
}
if (isset($_REQUEST['origin']) && $_REQUEST['origin'] == 'searching') {
$save = array(
- "script" => "createModal(form_txt, 'save_search', '100px', '500px');window.location.href='#top';",
- "icon" => 'save',
- "tooltip" => _SAVE_QUERY,
- "disabledRules" => count($tab)." == 0"
- );
- array_push($paramsTab['tools'], $save);
+ 'script' => "createModal(form_txt, 'save_search', '100px', '500px');window.location.href='#top';",
+ 'icon' => 'save',
+ 'tooltip' => _SAVE_QUERY,
+ 'disabledRules' => count($tab).' == 0',
+ );
+ array_push($paramsTab['tools'], $save);
}
$export = array(
- "script" => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=export', '_blank');",
- "icon" => 'file-excel-o',
- "tooltip" => _EXPORT_LIST,
- "disabledRules" => count($tab)." == 0"
+ 'script' => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=export', '_blank');",
+ 'icon' => 'file-excel-o',
+ 'tooltip' => _EXPORT_LIST,
+ 'disabledRules' => count($tab).' == 0',
);
array_push($paramsTab['tools'], $export);
$export2 = array(
-"script" => "print_current_result_list('".$_SESSION['config']['businessappurl']."');",
-"icon" => 'print',
-"tooltip" => _PRINT_LIST,
-"disabledRules" => count($tab)." == 0"
+'script' => "print_current_result_list('".$_SESSION['config']['businessappurl']."');",
+'icon' => 'print',
+'tooltip' => _PRINT_LIST,
+'disabledRules' => count($tab).' == 0',
);
-array_push($paramsTab['tools'],$export2);
+array_push($paramsTab['tools'], $export2);
if ($core_tools->test_service('print_doc_details_from_list', 'apps', false)) {
-$print = array(
- "script" => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=print', '_blank');",
- "icon" => 'link',
- "tooltip" => _PRINT_DOC_FROM_LIST,
- "disabledRules" => count($tab)." == 0"
+ $print = array(
+ 'script' => "window.open('".$_SESSION['config']['businessappurl']."index.php?display=true&page=print', '_blank');",
+ 'icon' => 'link',
+ 'tooltip' => _PRINT_DOC_FROM_LIST,
+ 'disabledRules' => count($tab).' == 0',
);
-array_push($paramsTab['tools'], $print);
+ array_push($paramsTab['tools'], $print);
}
//Afficher la liste
@@ -629,4 +615,4 @@ $content = $list->showList($tab, $paramsTab, $listKey, $_SESSION['current_basket
$content .= '<script>$j(\'#container\').attr(\'style\', \'width: 90%; min-width: 1000px;\');$j(\'#content\').attr(\'style\', \'width: auto; min-width: 1000px;\');';
$content .= '$j(\'#inner_content\').attr(\'style\', \'width: auto; min-width: 1000px;\');</script>';
-echo "{'status' : " . $status . ", 'content' : '" . addslashes($debug.$content) . "', 'error' : '" . addslashes(functions::xssafe($error)) . "'}";
+echo "{'status' : ".$status.", 'content' : '".addslashes($debug.$content)."', 'error' : '".addslashes(functions::xssafe($error))."'}";
diff --git a/modules/visa/js/functions.js b/modules/visa/js/functions.js
index 69b96be825f5443cdc39ceca9d1ad7f65f3ff380..75a5bfa0ad57a2461ada9d9a37e8ab544621d3a4 100755
--- a/modules/visa/js/functions.js
+++ b/modules/visa/js/functions.js
@@ -22,7 +22,7 @@ function addVisaUser(users) {
+'<sup class="visaUserPos nbResZero">'+next_visa+'</sup> '
+'<i class="fa fa-user fa-2x" aria-hidden="true"></i> '+ $j("select#visaUserList option:selected").text() +' <sup class="nbRes">'+$j("select#visaUserList option:selected").parent().get( 0 ).label+'</sup>'
+'<input class="userId" type="hidden" value="' + $j("select#visaUserList option:selected").val() + '"/><input class="visaDate" type="hidden" value=""/>'
- +' <i id="signedUser_'+next_visa+'" title="Personne signataire" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#FDD16C;visibility:hidden;"></i>'
+ +' <i id="signedUser_'+next_visa+'" title="Personne signataire" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#F99830;visibility:hidden;"></i>'
+ signRequest
+'</span>'
+'<span class="visaUserAction">'
@@ -61,7 +61,7 @@ function addVisaUser(users) {
+'<sup class="visaUserPos nbResZero">'+next_visa+'</sup> '
+'<i class="fa fa-user fa-2x" aria-hidden="true"></i> ' + users.lastname + ' ' + users.firstname + ' <sup class="nbRes">'+users.entity_id+'</sup>'
+'<input class="userId" type="hidden" value="' + users.user_id + '"/><input class="visaDate" type="hidden" value=""/>'
- +' <i id="signedUser_'+next_visa+'" title="Personne signataire" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#FDD16C;visibility:hidden;"></i>'
+ +' <i id="signedUser_'+next_visa+'" title="Personne signataire" class="visaUserSign fa fa-certificate" aria-hidden="true" style="color:#F99830;visibility:hidden;"></i>'
+ signRequest
+'</span>'
+'<span class="visaUserAction">'
diff --git a/modules/visa/load_listmodel_visa.php b/modules/visa/load_listmodel_visa.php
index 2053152aba69ea7be309bf124bcfb63da93f60d5..13f09a56adcc451d6795179ea8914f60ccde80d9 100755
--- a/modules/visa/load_listmodel_visa.php
+++ b/modules/visa/load_listmodel_visa.php
@@ -1,201 +1,202 @@
-<?php
-/**
-* File : change_doctype.php
-*
-* Script called by an ajax object to process the document type change during
-* indexing (index_mlb.php)
-*
-* @package maarch
-* @version 1
-* @since 10/2005
-* @license GPL v3
-* @author Cyril Vazquez <dev@maarch.org>
-*/
-require_once 'modules/entities/class/class_manage_listdiff.php';
-require_once "modules" . DIRECTORY_SEPARATOR . "visa" . DIRECTORY_SEPARATOR
- . "class" . DIRECTORY_SEPARATOR
- . "class_modules_tools.php";
-
-
- $db = new Database();
- $core = new core_tools();
- $core->load_lang();
- $diffList = new diffusion_list();
-
- $objectType = $_REQUEST['objectType'];
- $objectId = $_REQUEST['objectId'];
- $origin = 'visa';
-
- // Get listmodel_parameters
- $_SESSION[$origin]['difflist_type'] = $diffList->get_difflist_type($objectType);
-
- if ($objectId <> '') {
- $_SESSION[$origin]['difflist_object']['object_id'] = $objectId;
- if ($objectType == 'entity_id') {
- $stmt = $db->query("select entity_label from entities where entity_id = ?",array($objectId));
- $res = $stmt->fetchObject();
- if ($res->entity_label <> '') {
- $_SESSION[$origin]['difflist_object']['object_label'] = $res->entity_label;
- }
- }
- }
-
- // Fill session with listmodel
- $_SESSION[$origin]['diff_list'] = $diffList->get_listmodel($objectType, $objectId);
- $_SESSION[$origin]['diff_list']['difflist_type'] = $_SESSION[$origin]['diff_list']['object_type'];
- $roles = $diffList->list_difflist_roles();
- $circuit = $_SESSION[$origin]['diff_list'];
- if (!isset($circuit['visa']['users']) && !isset($circuit['sign']['users'])){
- echo "{status : 1, error_txt : 'Modèle inexistant'}";
- exit();
- }
- if ( $circuit['object_type'] == 'VISA_CIRCUIT'){
- $id_tab="tab_visaSetWorkflow";
- $id_form="form_visaSetWorkflow";
- }
- else{
- $id_tab="tab_avisSetWorkflow";
- $id_form="form_avisSetWorkflow";
- }
-
- $content = "";
-
- $content .= '<thead><tr>';
- $content .= '<th style="width:40%;" align="left" valign="bottom"><span>Visa</span></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:5%;"></th>';
- $content .= '<th style="width:45%;" align="left" valign="bottom"><span>Consigne</span></th>';
- $content .= '<th style="width:0;display:none" align="left" valign="bottom"></th>';
- $content .= '<th style="width:0;display:none" align="center" valign="bottom"></th>';
-
- $content .= '</tr></thead>';
- $content .= '<tbody>';
- $color = "";
- $visa = new visa();
- if (isset($circuit['visa']['users'])){
- foreach($circuit['visa']['users'] as $seq=>$step){
- if($color == ' class="col"') {
- $color = '';
- } else {
- $color = ' class="col"';
- }
-
- $content .= '<tr ' . $color . '>';
- $content .= '<td>';
-
- $content .= '<span id="rank_' . $seq . '"> <span class="nbResZero" style="font-weight:bold;opacity:0.5;">'. ($seq + 1) .'</span> </span>';
- $content .= '<select id="conseiller_'.$seq.'" name="conseiller_'.$seq.'" >';
- $content .= '<option value="" >Sélectionnez un utilisateur</option>';
-
- $tab_userentities = $visa->getEntityVis();
- $tab_users = $visa->getUsersVis();
-
- /** Order by parent entity **/
- foreach ($tab_userentities as $key => $value) {
- $content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
- foreach($tab_users as $user){
- if($tab_userentities[$key]['entity_id'] == $user['entity_id']){
- $selected = " ";
- if ($user['id'] == $step['user_id'])
- $selected = " selected";
- $content .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].', '.$user['firstname'].'</option>';
- }
-
- }
- $content .= '</optgroup>';
- }
- $content .= '</select>';
-
- $content .= "</select>";
- $content .= "<span id=\"signatory_" . $seq . "\">";
- if (empty($circuit['sign']['users']) && $seq == count ($circuit['visa']['users'])-1)
- $content .= " <i title=\"Signataire\" style=\"color : #fdd16c\" class=\"fa fa-certificate fa-lg fa-fw\"></i>";
- $content .= "</span></td>";
-
- $up = ' style="visibility:visible"';
- $down = ' style="visibility:visible"';
- if (empty($circuit['sign']['users']) && $seq == count ($circuit['visa']['users'])-1){
- $add = ' style="visibility:visible"';
- $down = ' style="visibility:hidden"';
- } else {
- $add = ' style="visibility:hidden"';
- }
- if ($seq == 0)
- $up = ' style="visibility:hidden"';
-
- $content .= '<td><a href="javascript://" '.$down.' id="down_'.$seq.'" name="down_'.$seq.'" onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex+2,\''.$id_tab.'\')" ><i class="fa fa-arrow-down fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" '.$up.' id="up_'.$seq.'" name="up_'.$seq.'" onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex-1,\''.$id_tab.'\')" ><i class="fa fa-arrow-up fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" onclick="delRow(this.parentNode.parentNode.rowIndex,\''.$id_tab.'\')" id="suppr_'.$j.'" name="suppr_'.$j.'" style="visibility:visible;" ><i class="fa fa-user-times fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" '.$add.' id="add_'.$seq.'" name="add_'.$seq.'" onclick="addRow(\''.$id_tab.'\')" ><i class="fa fa-user-plus fa-2x"></i></a></td>';
- $content .= '<td><input type="text" id="consigne_'.$seq.'" name="consigne_'.$seq.'" value="'.$step['process_comment'].'" onmouseover="setTitle(this);" style="width:95%;"/></td>';
- $content .= '<td style="display:none"><input type="hidden" value="'.$step['process_date'].'" id="date_'.$seq.'" name="date_'.$seq.'"/></td>';
- $content .= '<td style="display:none"><input type="checkbox" style="visibility:hidden" id="isSign_'.$seq.'" name="isSign_'.$seq.'" /></td>';
- $content .= '<td><i class="fa fa-plus fa-lg" title="Nouvel utilisateur ajouté"></i></td>';
- $content .= "</tr>";
- }
- }
-
-//ajout signataire
- if (!empty($circuit['sign']['users'])){
- $seq = count ($circuit['visa']['users']);
-
- if($color == ' class="col"') {
- $color = '';
- } else {
- $color = ' class="col"';
- }
-
- $content .= '<tr ' . $color . '>';
-
- $content .= '<td>';
- $content .= '<span id="rank_' . $seq . '"> <span class="nbResZero" style="font-weight:bold;opacity:0.5;">'. ($seq + 1) .'</span> </span>';
- $content .= '<select id="conseiller_'.$seq.'" name="conseiller_'.$seq.'" >';
- $content .= '<option value="" >Sélectionnez un utilisateur</option>';
-
- $tab_users = $visa->getUsersVis();
- $tab_userentities = $visa->getEntityVis();
-
- /** Order by parent entity **/
- foreach ($tab_userentities as $key => $value) {
- $content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
- foreach($tab_users as $user){
- if($tab_userentities[$key]['entity_id'] == $user['entity_id']){
- $selected = " ";
- if ($user['id'] == $circuit['sign']['users'][0]['user_id'])
- $selected = " selected";
- $content .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].', '.$user['firstname'].'</option>';
- }
-
- }
- $content .= '</optgroup>';
- }
- $content .= '</select>';
- $content .= "<span id=\"signatory_' . $j . '\"> <i title=\"Signataire\" style=\"color : #fdd16c\" class=\"fa fa-certificate fa-lg fa-fw\"></i></span>";
- $content .= "</td>";
-
- $up = 'style="visibility:visible"';
- $down = 'style="visibility:hidden"';
- $add = 'style="visibility:visible"';
- $del = 'style="visibility:visible"';
- if (count ($circuit['visa']['users']) == 0){
- $up = 'style="visibility:hidden"';
- $del = 'style="visibility:hidden"';
- }
-
- $content .= '<td><a href="javascript://" ' . $down ." id=\"down_$seq\" name=\"down_$seq\"" .' onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex+2,\''.$id_tab.'\')" ><i class="fa fa-arrow-down fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" ' . $up ." id=\"up_$seq\" name=\"up_$seq\"" .' onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex-1,\''.$id_tab.'\')" ><i class="fa fa-arrow-up fa-2x"></i></a></td>';
- $content .= '<td><a href="javascript://" ' . $del ." id=\"suppr_$seq\" name=\"suppr_$seq\"" .' onclick="delRow(this.parentNode.parentNode.rowIndex,\''.$id_tab. "')\" ><i class='fa fa-user-times fa-2x'></i></a></td>";
- $content .= '<td><a href="javascript://" ' . $add ." id=\"add_$seq\" name=\"add_$seq\"" .' onclick="addRow(\''.$id_tab.'\')" ><i class="fa fa-user-plus fa-2x"></i></a></td>';
- $content .= '<td><input type="text" id="consigne_'.$seq.'" name="consigne_'.$seq.'" value="'.$circuit['sign']['users'][0]['process_comment'].'" onmouseover="setTitle(this);" style="width:95%;"/></td>';
- $content .= '<td style="display:none"><input type="hidden" id="date_'.$seq.'" name="date_'.$seq.'" value="'.$circuit['sign']['users'][0]['process_date'].'" /></td>';
- $content .= '<td style="display:none"><input type="checkbox" style="visibility:hidden" id="isSign_'.$seq.'" name="isSign_'.$seq.'" checked/></td>';
- $content .= '<td><i class="fa fa-plus fa-lg" title="Nouvel utilisateur ajouté"></i></td>';
- $content .= "</tr>";
- }
-
- $content .= '</tbody>';
-
- echo "{status : 0, div_content : '" . addslashes($content.'<br>') . "'}";
- exit();
+<?php
+/**
+* File : change_doctype.php.
+*
+* Script called by an ajax object to process the document type change during
+* indexing (index_mlb.php)
+*
+* @version 1
+*
+* @since 10/2005
+*
+* @license GPL v3
+* @author Cyril Vazquez <dev@maarch.org>
+*/
+require_once 'modules/entities/class/class_manage_listdiff.php';
+require_once 'modules'.DIRECTORY_SEPARATOR.'visa'.DIRECTORY_SEPARATOR
+ .'class'.DIRECTORY_SEPARATOR
+ .'class_modules_tools.php';
+
+ $db = new Database();
+ $core = new core_tools();
+ $core->load_lang();
+ $diffList = new diffusion_list();
+
+ $objectType = $_REQUEST['objectType'];
+ $objectId = $_REQUEST['objectId'];
+ $origin = 'visa';
+
+ // Get listmodel_parameters
+ $_SESSION[$origin]['difflist_type'] = $diffList->get_difflist_type($objectType);
+
+ if ($objectId != '') {
+ $_SESSION[$origin]['difflist_object']['object_id'] = $objectId;
+ if ($objectType == 'entity_id') {
+ $stmt = $db->query('select entity_label from entities where entity_id = ?', array($objectId));
+ $res = $stmt->fetchObject();
+ if ($res->entity_label != '') {
+ $_SESSION[$origin]['difflist_object']['object_label'] = $res->entity_label;
+ }
+ }
+ }
+
+ // Fill session with listmodel
+ $_SESSION[$origin]['diff_list'] = $diffList->get_listmodel($objectType, $objectId);
+ $_SESSION[$origin]['diff_list']['difflist_type'] = $_SESSION[$origin]['diff_list']['object_type'];
+ $roles = $diffList->list_difflist_roles();
+ $circuit = $_SESSION[$origin]['diff_list'];
+ if (!isset($circuit['visa']['users']) && !isset($circuit['sign']['users'])) {
+ echo "{status : 1, error_txt : 'Modèle inexistant'}";
+ exit();
+ }
+ if ($circuit['object_type'] == 'VISA_CIRCUIT') {
+ $id_tab = 'tab_visaSetWorkflow';
+ $id_form = 'form_visaSetWorkflow';
+ } else {
+ $id_tab = 'tab_avisSetWorkflow';
+ $id_form = 'form_avisSetWorkflow';
+ }
+
+ $content = '';
+
+ $content .= '<thead><tr>';
+ $content .= '<th style="width:40%;" align="left" valign="bottom"><span>Visa</span></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:5%;"></th>';
+ $content .= '<th style="width:45%;" align="left" valign="bottom"><span>Consigne</span></th>';
+ $content .= '<th style="width:0;display:none" align="left" valign="bottom"></th>';
+ $content .= '<th style="width:0;display:none" align="center" valign="bottom"></th>';
+
+ $content .= '</tr></thead>';
+ $content .= '<tbody>';
+ $color = '';
+ $visa = new visa();
+ if (isset($circuit['visa']['users'])) {
+ foreach ($circuit['visa']['users'] as $seq => $step) {
+ if ($color == ' class="col"') {
+ $color = '';
+ } else {
+ $color = ' class="col"';
+ }
+
+ $content .= '<tr '.$color.'>';
+ $content .= '<td>';
+
+ $content .= '<span id="rank_'.$seq.'"> <span class="nbResZero" style="font-weight:bold;opacity:0.5;">'.($seq + 1).'</span> </span>';
+ $content .= '<select id="conseiller_'.$seq.'" name="conseiller_'.$seq.'" >';
+ $content .= '<option value="" >Sélectionnez un utilisateur</option>';
+
+ $tab_userentities = $visa->getEntityVis();
+ $tab_users = $visa->getUsersVis();
+
+ /* Order by parent entity **/
+ foreach ($tab_userentities as $key => $value) {
+ $content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
+ foreach ($tab_users as $user) {
+ if ($tab_userentities[$key]['entity_id'] == $user['entity_id']) {
+ $selected = ' ';
+ if ($user['id'] == $step['user_id']) {
+ $selected = ' selected';
+ }
+ $content .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].', '.$user['firstname'].'</option>';
+ }
+ }
+ $content .= '</optgroup>';
+ }
+ $content .= '</select>';
+
+ $content .= '</select>';
+ $content .= '<span id="signatory_'.$seq.'">';
+ if (empty($circuit['sign']['users']) && $seq == count($circuit['visa']['users']) - 1) {
+ $content .= ' <i title="Signataire" style="color : #F99830" class="fa fa-certificate fa-lg fa-fw"></i>';
+ }
+ $content .= '</span></td>';
+
+ $up = ' style="visibility:visible"';
+ $down = ' style="visibility:visible"';
+ if (empty($circuit['sign']['users']) && $seq == count($circuit['visa']['users']) - 1) {
+ $add = ' style="visibility:visible"';
+ $down = ' style="visibility:hidden"';
+ } else {
+ $add = ' style="visibility:hidden"';
+ }
+ if ($seq == 0) {
+ $up = ' style="visibility:hidden"';
+ }
+
+ $content .= '<td><a href="javascript://" '.$down.' id="down_'.$seq.'" name="down_'.$seq.'" onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex+2,\''.$id_tab.'\')" ><i class="fa fa-arrow-down fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" '.$up.' id="up_'.$seq.'" name="up_'.$seq.'" onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex-1,\''.$id_tab.'\')" ><i class="fa fa-arrow-up fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" onclick="delRow(this.parentNode.parentNode.rowIndex,\''.$id_tab.'\')" id="suppr_'.$j.'" name="suppr_'.$j.'" style="visibility:visible;" ><i class="fa fa-user-times fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" '.$add.' id="add_'.$seq.'" name="add_'.$seq.'" onclick="addRow(\''.$id_tab.'\')" ><i class="fa fa-user-plus fa-2x"></i></a></td>';
+ $content .= '<td><input type="text" id="consigne_'.$seq.'" name="consigne_'.$seq.'" value="'.$step['process_comment'].'" onmouseover="setTitle(this);" style="width:95%;"/></td>';
+ $content .= '<td style="display:none"><input type="hidden" value="'.$step['process_date'].'" id="date_'.$seq.'" name="date_'.$seq.'"/></td>';
+ $content .= '<td style="display:none"><input type="checkbox" style="visibility:hidden" id="isSign_'.$seq.'" name="isSign_'.$seq.'" /></td>';
+ $content .= '<td><i class="fa fa-plus fa-lg" title="Nouvel utilisateur ajouté"></i></td>';
+ $content .= '</tr>';
+ }
+ }
+
+//ajout signataire
+ if (!empty($circuit['sign']['users'])) {
+ $seq = count($circuit['visa']['users']);
+
+ if ($color == ' class="col"') {
+ $color = '';
+ } else {
+ $color = ' class="col"';
+ }
+
+ $content .= '<tr '.$color.'>';
+
+ $content .= '<td>';
+ $content .= '<span id="rank_'.$seq.'"> <span class="nbResZero" style="font-weight:bold;opacity:0.5;">'.($seq + 1).'</span> </span>';
+ $content .= '<select id="conseiller_'.$seq.'" name="conseiller_'.$seq.'" >';
+ $content .= '<option value="" >Sélectionnez un utilisateur</option>';
+
+ $tab_users = $visa->getUsersVis();
+ $tab_userentities = $visa->getEntityVis();
+
+ /* Order by parent entity **/
+ foreach ($tab_userentities as $key => $value) {
+ $content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
+ foreach ($tab_users as $user) {
+ if ($tab_userentities[$key]['entity_id'] == $user['entity_id']) {
+ $selected = ' ';
+ if ($user['id'] == $circuit['sign']['users'][0]['user_id']) {
+ $selected = ' selected';
+ }
+ $content .= '<option value="'.$user['id'].'" '.$selected.'>'.$user['lastname'].', '.$user['firstname'].'</option>';
+ }
+ }
+ $content .= '</optgroup>';
+ }
+ $content .= '</select>';
+ $content .= "<span id=\"signatory_' . $j . '\"> <i title=\"Signataire\" style=\"color : #F99830\" class=\"fa fa-certificate fa-lg fa-fw\"></i></span>";
+ $content .= '</td>';
+
+ $up = 'style="visibility:visible"';
+ $down = 'style="visibility:hidden"';
+ $add = 'style="visibility:visible"';
+ $del = 'style="visibility:visible"';
+ if (count($circuit['visa']['users']) == 0) {
+ $up = 'style="visibility:hidden"';
+ $del = 'style="visibility:hidden"';
+ }
+
+ $content .= '<td><a href="javascript://" '.$down." id=\"down_$seq\" name=\"down_$seq\"".' onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex+2,\''.$id_tab.'\')" ><i class="fa fa-arrow-down fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" '.$up." id=\"up_$seq\" name=\"up_$seq\"".' onclick="deplacerLigne(this.parentNode.parentNode.rowIndex, this.parentNode.parentNode.rowIndex-1,\''.$id_tab.'\')" ><i class="fa fa-arrow-up fa-2x"></i></a></td>';
+ $content .= '<td><a href="javascript://" '.$del." id=\"suppr_$seq\" name=\"suppr_$seq\"".' onclick="delRow(this.parentNode.parentNode.rowIndex,\''.$id_tab."')\" ><i class='fa fa-user-times fa-2x'></i></a></td>";
+ $content .= '<td><a href="javascript://" '.$add." id=\"add_$seq\" name=\"add_$seq\"".' onclick="addRow(\''.$id_tab.'\')" ><i class="fa fa-user-plus fa-2x"></i></a></td>';
+ $content .= '<td><input type="text" id="consigne_'.$seq.'" name="consigne_'.$seq.'" value="'.$circuit['sign']['users'][0]['process_comment'].'" onmouseover="setTitle(this);" style="width:95%;"/></td>';
+ $content .= '<td style="display:none"><input type="hidden" id="date_'.$seq.'" name="date_'.$seq.'" value="'.$circuit['sign']['users'][0]['process_date'].'" /></td>';
+ $content .= '<td style="display:none"><input type="checkbox" style="visibility:hidden" id="isSign_'.$seq.'" name="isSign_'.$seq.'" checked/></td>';
+ $content .= '<td><i class="fa fa-plus fa-lg" title="Nouvel utilisateur ajouté"></i></td>';
+ $content .= '</tr>';
+ }
+
+ $content .= '</tbody>';
+
+ echo "{status : 0, div_content : '".addslashes($content.'<br>')."'}";
+ exit();
diff --git a/modules/visa/template/documents_list_with_signatory.html b/modules/visa/template/documents_list_with_signatory.html
index 99e9e4ced9b79b3095f85842fbced3b15f99312f..cf1f55aa2fd72a4f2218b602ae1fc29fc217b3fe 100755
--- a/modules/visa/template/documents_list_with_signatory.html
+++ b/modules/visa/template/documents_list_with_signatory.html
@@ -103,7 +103,7 @@ Mods
<td width="10%" ##clickOnLine##>
<!--<div align="center"><img src="##load_img|contact_maarch.gif##" alt="##loadValue|status##" title="##loadValue|status##"> </div>-->
- <div align="center" style ="color:#009DC5;">##loadValue|status####func_isConfidential##</div>
+ <div align="center" style ="color:#135F7F;">##loadValue|status####func_isConfidential##</div>
</td>
<td width="90%" align="center" style="padding : 0px; vertical-align:top" ##clickOnLine##>
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
@@ -152,7 +152,7 @@ Mods
</tr>
<tr id="noteList_##loadValue|res_id##" name="noteList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divNoteList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -160,7 +160,7 @@ Mods
</tr>
<tr id="contactsList_##loadValue|res_id##" name="contactsList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: white;" width="100%">
<td colspan="6" style="background-color: #f2f2f2;">
- <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divContactsList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##define_lang|_LOADING_INFORMATIONS##
</div>
@@ -168,7 +168,7 @@ Mods
</tr>
<tr id="repList_##loadValue|res_id##" name="repList_##loadValue|res_id##" style="display: none; border-bottom: solid 1px black; background-color: #FFF;" width="100%">
<td colspan="2" style="background-color: #f2f2f2;">
- <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #009DC5;">
+ <div id="divRepList_##loadValue|res_id##" align="center" style="color: grey;margin:10px;padding:10px;border: 1px dashed #135F7F;">
<i class="fa fa-spinner fa-2x"></i><br />
##defineLang|_LOADING_INFORMATIONS##
</div>
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 27546472626d3dbf46ac19cd9e0d1e89621ca5f5..7cc010eef9ba36054a10f626fe382847c5350a4b 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1707,7 +1707,7 @@ Select setval('templates_seq', (select max(template_id)+1 from templates), false
/* PRIORITIES */
TRUNCATE TABLE priorities;
-INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1357nbvc', 'Normal', '#009dc5', TRUE, null, TRUE, 1);
+INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1357nbvc', 'Normal', '#135F7F', TRUE, null, TRUE, 1);
INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1379nbvc', 'Urgent', '#ffa500', TRUE, 8, FALSE, 2);
INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1391nbvc', 'Très urgent', '#ff0000', TRUE, 4, FALSE, 3);
INSERT INTO priorities (id, label, color, working_days, delays, default_priority, "order") VALUES ('poiuytre1313nbvc', 'SVA/SVR', '#ffa500', TRUE, null, FALSE, 4);