From ddf737daed9e5ea7d5ab6223570be68e089044c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 Nov 2014 01:07:07 +0100
Subject: [PATCH] Removed deprecated page and option.
---
htdocs/comm/action/card.php | 8 +-
htdocs/comm/action/contact.php | 258 --------------------------------
htdocs/comm/action/document.php | 163 +++++++++++++-------
htdocs/core/lib/agenda.lib.php | 8 -
4 files changed, 114 insertions(+), 323 deletions(-)
delete mode 100644 htdocs/comm/action/contact.php
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 607f8e14c4e..a1e6f89f663 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -790,11 +790,11 @@ if ($id > 0)
{
$result1=$object->fetch($id);
$result2=$object->fetch_thirdparty();
- $result2=$object->fetch_contact();
- $result3=$object->fetch_userassigned();
- $result4=$object->fetch_optionals($id,$extralabels);
+ $result3=$object->fetch_contact();
+ $result4=$object->fetch_userassigned();
+ $result5=$object->fetch_optionals($id,$extralabels);
- if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0)
+ if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
{
dol_print_error($db,$object->error);
exit;
diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php
deleted file mode 100644
index 334da53a2f4..00000000000
--- a/htdocs/comm/action/contact.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2012 Philippe Grand <philippe.grand@atoo-net.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/comm/action/contact.php
- * \ingroup agenda
- * \brief Page for multi-users event
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-
-$langs->load("companies");
-$langs->load("commercial");
-$langs->load("other");
-$langs->load("bills");
-
-$id = GETPOST('id','int');
-$action = GETPOST('action','alpha');
-$ref = GETPOST('ref');
-$confirm = GETPOST('confirm');
-$lineid = GETPOST('lineid','int');
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if ($user->societe_id > 0)
-{
- unset($_GET["action"]);
- $action='';
-}
-$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
-
-
-$object = new ActionComm($db);
-
-
-/*
- * Actions
- */
-
-// Add new contact
-if ($action == 'addcontact' && $user->rights->action->creer)
-{
- $result = $object->fetch($id);
-
- if ($object->id > 0)
- {
- $contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
- $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
- }
-
- if ($result >= 0)
- {
- header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
- {
- $langs->load("errors");
- setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
- }
- else
- {
- setEventMessage($object->error, 'errors');
- }
- }
-}
-
-// modification d'un contact. On enregistre le type
-if ($action == 'updateline')
-{
- if ($object->fetch($id))
- {
- $contact = $object->detail_contact($_POST["line"]);
- $type = $_POST["type"];
- $statut = $contact->statut;
-
- $result = $object->update_contact($_POST["line"], $statut, $type);
- if ($result >= 0)
- {
- $db->commit();
- } else
- {
- dol_print_error($db, "result=$result");
- $db->rollback();
- }
- }
- else
- {
- setEventMessage($object->error, 'errors');
- }
-}
-
-// Bascule du statut d'un contact
-else if ($action == 'swapstatut')
-{
- if ($object->id > 0)
- {
- $result=$object->swapContactStatus(GETPOST('ligne'));
- }
-}
-
-// Efface un contact
-else if ($action == 'deletecontact')
-{
- $result = $object->delete_contact($lineid);
-
- if ($result >= 0)
- {
- header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- dol_print_error($db);
- }
-}
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formcompany= new FormCompany($db);
-
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
-
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
-
-
-if ($id > 0 || ! empty($ref))
-{
- if ($object->fetch($id,$ref) > 0)
- {
-
- $head=actions_prepare_head($object);
- dol_fiche_head($head, 'contact', $langs->trans("Action"),0,'action');
-
- // Affichage fiche action en mode visu
- print '<table class="border" width="100%">';
-
- $linkback = '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
-
- // Ref
- print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
- print '</td></tr>';
-
- // Type
- if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
- {
- print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
- }
-
- // Title
- print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
- // Full day event
- print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
-
- // Date start
- print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
- if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
- else print dol_print_date($object->datep,'day');
- if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
- print '</td>';
- print '<td rowspan="4" align="center" valign="middle" width="180">'."\n";
- print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="show_month">';
- print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
- print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
- print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" style="width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
- print '</form>'."\n";
- print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="show_week">';
- print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
- print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
- print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarweek').' <input type="submit" style="width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
- print '</form>'."\n";
- print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="show_day">';
- print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
- print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
- print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarday').' <input type="submit" style="width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
- print '</form>'."\n";
- print '</td>';
- print '</tr>';
-
- // Date end
- print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
- if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
- else print dol_print_date($object->datef,'day');
- if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
- print '</td></tr>';
-
- // Location
- print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
-
- print '</table>';
-
- dol_fiche_end();
-
- print '<br>';
-
- // Contacts lines (modules that overwrite templates must declare this into descriptor)
- $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
- foreach($dirtpls as $reldir)
- {
- $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
- if ($res) break;
- }
-
- }
- else
- {
- print "ErrorRecordNotFound";
- }
-}
-
-llxFooter();
-
-$db->close();
-
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 5e180f66abb..9bb3af6dcbd 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -41,7 +41,7 @@ $langs->load("commercial");
$langs->load("other");
$langs->load("bills");
-$objectid = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
$action=GETPOST('action', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
@@ -53,13 +53,13 @@ if ($user->societe_id > 0)
unset($_GET["action"]);
$action='';
}
-$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
+$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
$object = new ActionComm($db);
-if ($objectid > 0)
+if ($id > 0)
{
- $ret = $object->fetch($objectid);
+ $ret = $object->fetch($id);
$object->fetch_thirdparty();
}
@@ -96,11 +96,25 @@ llxHeader('',$langs->trans("Agenda"),$help_url);
if ($object->id > 0)
{
+ $result1=$object->fetch($id);
+ $result2=$object->fetch_thirdparty();
+ $result3=$object->fetch_contact();
+ $result4=$object->fetch_userassigned();
+ $result5=$object->fetch_optionals($id,$extralabels);
+
+ if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
+ {
+ dol_print_error($db,$object->error);
+ exit;
+ }
+
+ if ($object->authorid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; }
+ if ($object->usermodid > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; }
+
$author=new User($db);
$author->fetch($object->author->id);
$object->author=$author;
- $object->fetch_contact();
$head=actions_prepare_head($object);
@@ -132,53 +146,15 @@ if ($object->id > 0)
print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
// Date start
- print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
+ print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="3">';
if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
else print dol_print_date($object->datep,'day');
if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
print '</td>';
- print '<td rowspan="5" align="center" valign="middle" width="180">'."\n";
- print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="show_month">';
- print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
- print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
- print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
- print '</form>'."\n";
- print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="show_week">';
- print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
- print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
- print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
- print '</form>'."\n";
- print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="show_day">';
- print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
- print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
- print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
- print '</form>'."\n";
- print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="show_peruser">';
- print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
- print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
- print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
- print '</form>'."\n";
- print '</td>';
print '</tr>';
// Date end
- print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
+ print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
else print dol_print_date($object->datef,'day');
if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
@@ -190,16 +166,38 @@ if ($object->id > 0)
print '</td></tr>';
// Location
- print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
+ if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+ {
+ print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
+ }
// Assigned to
- print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
- if ($object->userownerid > 0)
+ print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+ $listofuserid=array();
+ if (empty($donotclearsession))
{
- $tmpuser=new User($object->userownerid);
- print $tmpuser->getNomUrl(1);
+ if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency); // Owner first
+ if (! empty($object->userassigned)) // Now concat assigned users
+ {
+ // Restore array with key with same value than param 'id'
+ $tmplist1=$object->userassigned; $tmplist2=array();
+ foreach($tmplist1 as $key => $val)
+ {
+ if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+ }
+ }
+ $_SESSION['assignedtouser']=dol_json_encode($listofuserid);
}
- print '</td></tr>';
+ else
+ {
+ if (!empty($_SESSION['assignedtouser']))
+ {
+ $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+ }
+ }
+ print $form->select_dolusers_forevent('view','assignedtouser',1);
+ if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody
+ print ' </td></tr>';
print '</table><br><br><table class="border" width="100%">';
@@ -252,8 +250,20 @@ if ($object->id > 0)
print ($object->priority?$object->priority:'');
print '</td></tr>';
+ // Other attributes
+ $parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
+ $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook) && ! empty($extrafields->attribute_label))
+ {
+ print $object->showOptionals($extrafields,'edit');
+ }
- print '</table><br><br><table class="border" width="100%">';
+
+ print '</table>';
+
+ print '<br><br>';
+
+ print '<table class="border" width="100%">';
// Construit liste des fichiers
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
@@ -266,7 +276,8 @@ if ($object->id > 0)
print '<tr><td width="30%" nowrap>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
- print '</table>';
+
+ print '</table>';
print '</div>';
@@ -274,6 +285,52 @@ if ($object->id > 0)
$permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+
+
+ if ($action != 'edit')
+ {
+ print "<br>";
+
+ // Link to agenda views
+ print '<div id="agendaviewbutton">';
+ print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="show_month">';
+ print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+ print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+ print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
+ print '</form>'."\n";
+ print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="show_week">';
+ print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+ print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+ print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+ print '</form>'."\n";
+ print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="show_day">';
+ print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+ print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+ print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
+ print '</form>'."\n";
+ print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="show_peruser">';
+ print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+ print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+ print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+ print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
+ print '</form>'."\n";
+ print '</div>';
+ }
}
else
{
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 3d9a5e8299c..d2270cb5584 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -440,14 +440,6 @@ function actions_prepare_head($object)
$head[$h][2] = 'card';
$h++;
- if (! empty($conf->global->AGENDA_USE_SEVERAL_CONTACTS))
- {
- $head[$h][0] = DOL_URL_ROOT.'/comm/action/contact.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Contacts");
- $head[$h][2] = 'contact';
- $h++;
- }
-
// Attached files
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$upload_dir = $conf->agenda->dir_output . "/" . $object->id;
--
GitLab