diff --git a/htdocs/adherents/card.php.bak b/htdocs/adherents/card.php.bak
deleted file mode 100644
index 48461c64b02301bb9784bba3ca6381bea57a1577..0000000000000000000000000000000000000000
--- a/htdocs/adherents/card.php.bak
+++ /dev/null
@@ -1,1787 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2012-2016 Philippe Grand <philippe.grand@atoo-net.com>
- * Copyright (C) 2015-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.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/adherents/card.php
- * \ingroup member
- * \brief Page of member
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("members");
-$langs->load("users");
-$langs->load('other');
-
-$action=GETPOST('action','alpha');
-$cancel=GETPOST('cancel','alpha');
-$backtopage=GETPOST('backtopage','alpha');
-$confirm=GETPOST('confirm','alpha');
-$rowid=GETPOST('rowid','int');
-$id=GETPOST('id')?GETPOST('id','int'):$rowid;
-$typeid=GETPOST('typeid','int');
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
-
-if (! empty($conf->mailmanspip->enabled))
-{
- include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-
- $langs->load('mailmanspip');
-
- $mailmanspip = new MailmanSpip($db);
-}
-
-$object = new Adherent($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$object->getCanvas($id);
-$canvas = $object->canvas?$object->canvas:GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
-{
- require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
- $objcanvas = new Canvas($db, $action);
- $objcanvas->getCanvas('adherent', 'membercard', $canvas);
-}
-
-// Security check
-$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid', $objcanvas);
-
-if ($id > 0)
-{
- // Load member
- $result = $object->fetch($id);
-
- // Define variables to know what current user can do on users
- $canadduser=($user->admin || $user->rights->user->user->creer);
- // Define variables to know what current user can do on properties of user linked to edited member
- if ($object->user_id)
- {
- // $ User is the user who edits, $ object->user_id is the id of the related user in the edited member
- $caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
- || (($user->id != $object->user_id) && $user->rights->user->user->creer));
- $caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
- || (($user->id != $object->user_id) && $user->rights->user->user->password));
- }
-}
-
-// Define variables to determine what the current user can do on the members
-$canaddmember=$user->rights->adherent->creer;
-// Define variables to determine what the current user can do on the properties of a member
-if ($id)
-{
- $caneditfieldmember=$user->rights->adherent->creer;
-}
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('membercard','globalcard'));
-
-
-
-/*
- * Actions
- */
-
-if ($cancel) $action='';
-
-$parameters=array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-if (empty($reshook))
-{
- if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
- {
- $error=0;
- if (empty($user->rights->user->user->creer)) // If can edit only itself user, we can link to itself only
- {
- if ($userid != $user->id && $userid != $object->user_id)
- {
- $error++;
- setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
- }
- }
-
- if (! $error)
- {
- if ($userid != $object->user_id) // If link differs from currently in database
- {
- $result=$object->setUserId($userid);
- if ($result < 0) dol_print_error($object->db,$object->error);
- $action='';
- }
- }
- }
-
- if ($action == 'setsocid')
- {
- $error=0;
- if (! $error)
- {
- if ($socid != $object->fk_soc) // If link differs from currently in database
- {
- $sql ="SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
- $sql.=" WHERE fk_soc = '".$socid."'";
- $sql.=" AND entity = ".$conf->entity;
- $resql = $db->query($sql);
- if ($resql)
- {
- $obj = $db->fetch_object($resql);
- if ($obj && $obj->rowid > 0)
- {
- $othermember=new Adherent($db);
- $othermember->fetch($obj->rowid);
- $thirdparty=new Societe($db);
- $thirdparty->fetch($socid);
- $error++;
- setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors');
- }
- }
-
- if (! $error)
- {
- $result=$object->setThirdPartyId($socid);
- if ($result < 0) dol_print_error($object->db,$object->error);
- $action='';
- }
- }
- }
- }
-
- // Create user from a member
- if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
- {
- if ($result > 0)
- {
- // Creation user
- $nuser = new User($db);
- $result=$nuser->create_from_member($object,GETPOST('login'));
-
- if ($result < 0)
- {
- $langs->load("errors");
- setEventMessages($langs->trans($nuser->error), null, 'errors');
- }
- }
- else
- {
- setEventMessages($object->errors, $object->error, 'errors');
- }
- }
-
- // Create third party from a member
- if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
- {
- if ($result > 0)
- {
- // User creation
- $company = new Societe($db);
- $result=$company->create_from_member($object,GETPOST('companyname'));
-
- if ($result < 0)
- {
- $langs->load("errors");
- setEventMessages($langs->trans($company->error), null, 'errors');
- setEventMessages($company->error, $company->errors, 'errors');
- }
- }
- else
- {
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
-
- if ($action == 'confirm_sendinfo' && $confirm == 'yes')
- {
- if ($object->email)
- {
- $from=$conf->email_from;
- if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
-
- $result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
-
- $langs->load("mails");
- setEventMessages($langs->trans("MailSuccessfulySent", $from, $object->email), null, 'mesgs');
- }
- }
-
- if ($action == 'update' && ! $cancel && $user->rights->adherent->creer)
- {
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
- $birthdate='';
- if (isset($_POST["birthday"]) && $_POST["birthday"]
- && isset($_POST["birthmonth"]) && $_POST["birthmonth"]
- && isset($_POST["birthyear"]) && $_POST["birthyear"])
- {
- $birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
- }
- $lastname=$_POST["lastname"];
- $firstname=$_POST["firstname"];
- $societe=$_POST["societe"];
- $morphy=$_POST["morphy"];
- $login=$_POST["login"];
- if ($morphy != 'mor' && empty($lastname)) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
- }
- if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
- }
- if ($morphy == 'mor' && empty($societe)) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
- }
- // Test si le login existe deja
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- if (empty($login)) {
- $error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
- }
- }
- // Create new object
- if ($result > 0 && ! $error)
- {
- $object->oldcopy = clone $object;
-
- // Change values
- $object->civility_id = trim($_POST["civility_id"]);
- $object->firstname = trim($_POST["firstname"]);
- $object->lastname = trim($_POST["lastname"]);
- $object->login = trim($_POST["login"]);
- $object->pass = trim($_POST["pass"]);
-
- $object->societe = trim($_POST["societe"]);
- $object->company = trim($_POST["societe"]);
-
- $object->address = trim($_POST["address"]);
- $object->zip = trim($_POST["zipcode"]);
- $object->town = trim($_POST["town"]);
- $object->state_id = $_POST["state_id"];
- $object->country_id = $_POST["country_id"];
-
- $object->phone = trim($_POST["phone"]);
- $object->phone_perso = trim($_POST["phone_perso"]);
- $object->phone_mobile= trim($_POST["phone_mobile"]);
- $object->email = trim($_POST["email"]);
- $object->skype = trim($_POST["skype"]);
- $object->birth = $birthdate;
-
- $object->typeid = $_POST["typeid"];
- //$object->note = trim($_POST["comment"]);
- $object->morphy = $_POST["morphy"];
-
- if (GETPOST('deletephoto')) $object->photo='';
- elseif (! empty($_FILES['photo']['name'])) $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
-
- // Get status and public property
- $object->statut = $_POST["statut"];
- $object->public = $_POST["public"];
-
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
- if ($ret < 0) $error++;
-
- // Check if we need to also synchronize user information
- $nosyncuser=0;
- if ($object->user_id) // If linked to a user
- {
- if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser=1; // Disable synchronizing
- }
-
- // Check if we need to also synchronize password information
- $nosyncuserpass=0;
- if ($object->user_id) // If linked to a user
- {
- if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass=1; // Disable synchronizing
- }
-
- $result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
-
- if ($result >= 0 && ! count($object->errors))
- {
- $categories = GETPOST('memcats', 'array');
- $object->setCategories($categories);
-
- // Logo/Photo save
- $dir= $conf->adherent->dir_output . '/' . get_exdir(0,0,0,1,$object,'member').'/photos';
- $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
- if ($file_OK)
- {
- if (GETPOST('deletephoto'))
- {
- require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
- $fileimg=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/'.$object->photo;
- $dirthumbs=$conf->adherent->dir_output.'/'.get_exdir(0,0,0,1,$object,'member').'/photos/thumbs';
- dol_delete_file($fileimg);
- dol_delete_dir_recursive($dirthumbs);
- }
-
- if (image_format_supported($_FILES['photo']['name']) > 0)
- {
- dol_mkdir($dir);
-
- if (@is_dir($dir))
- {
- $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
- if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
- {
- setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
- }
- else
- {
- // Create thumbs
- $object->addThumbs($newfile);
- }
- }
- }
- else
- {
- setEventMessages("ErrorBadImageFormat", null, 'errors');
- }
- }
- else
- {
- switch($_FILES['photo']['error'])
- {
- case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
- case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
- $errors[] = "ErrorFileSizeTooLarge";
- break;
- case 3: //uploaded file was only partially uploaded
- $errors[] = "ErrorFilePartiallyUploaded";
- break;
- }
- }
-
- $rowid=$object->id;
- $id=$object->id;
- $action='';
-
- if (! empty($backtopage))
- {
- header("Location: ".$backtopage);
- exit;
- }
- }
- else
- {
- setEventMessages($object->error, $object->errors, 'errors');
- $action='';
- }
- }
- else
- {
- $action='edit';
- }
- }
-
- if ($action == 'add' && $user->rights->adherent->creer)
- {
- if ($canvas) $object->canvas=$canvas;
- $birthdate='';
- if (isset($_POST["birthday"]) && $_POST["birthday"]
- && isset($_POST["birthmonth"]) && $_POST["birthmonth"]
- && isset($_POST["birthyear"]) && $_POST["birthyear"])
- {
- $birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
- }
- $datesubscription='';
- if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
- {
- $datesubscription=dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
- }
-
- $typeid=$_POST["typeid"];
- $civility_id=$_POST["civility_id"];
- $lastname=$_POST["lastname"];
- $firstname=$_POST["firstname"];
- $societe=$_POST["societe"];
- $address=$_POST["address"];
- $zip=$_POST["zipcode"];
- $town=$_POST["town"];
- $state_id=$_POST["state_id"];
- $country_id=$_POST["country_id"];
-
- $phone=$_POST["phone"];
- $phone_perso=$_POST["phone_perso"];
- $phone_mobile=$_POST["phone_mobile"];
- $skype=$_POST["member_skype"];
- $email=$_POST["member_email"];
- $login=$_POST["member_login"];
- $pass=$_POST["password"];
- $photo=$_POST["photo"];
- //$comment=$_POST["comment"];
- $morphy=$_POST["morphy"];
- $subscription=$_POST["subscription"];
- $public=$_POST["public"];
-
- $userid=$_POST["userid"];
- $socid=$_POST["socid"];
-
- $object->civility_id = $civility_id;
- $object->firstname = $firstname;
- $object->lastname = $lastname;
- $object->societe = $societe;
- $object->address = $address;
- $object->zip = $zip;
- $object->town = $town;
- $object->state_id = $state_id;
- $object->country_id = $country_id;
- $object->phone = $phone;
- $object->phone_perso = $phone_perso;
- $object->phone_mobile= $phone_mobile;
- $object->skype = $skype;
- $object->email = $email;
- $object->login = $login;
- $object->pass = $pass;
- $object->birth = $birthdate;
- $object->photo = $photo;
- $object->typeid = $typeid;
- //$object->note = $comment;
- $object->morphy = $morphy;
- $object->user_id = $userid;
- $object->fk_soc = $socid;
- $object->public = $public;
-
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
- if ($ret < 0) $error++;
-
- // Check parameters
- if (empty($morphy) || $morphy == "-1") {
- $error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Nature")), null, 'errors');
- }
- // Tests if the login already exists
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- if (empty($login)) {
- $error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
- }
- else {
- $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
- $result = $db->query($sql);
- if ($result) {
- $num = $db->num_rows($result);
- }
- if ($num) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorLoginAlreadyExists",$login), null, 'errors');
- }
- }
- if (empty($pass)) {
- $error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Password")), null, 'errors');
- }
- }
- if ($morphy == 'mor' && empty($societe)) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
- }
- if ($morphy != 'mor' && empty($lastname)) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname")), null, 'errors');
- }
- if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Firstname")), null, 'errors');
- }
- if (! ($typeid > 0)) { // Keep () before !
- $error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
- }
- if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
- $error++;
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors');
- }
- $public=0;
- if (isset($public)) $public=1;
-
- if (! $error)
- {
- $db->begin();
-
- // Email about right and login does not exist
- $result=$object->create($user);
- if ($result > 0)
- {
- // Foundation categories
- $memcats = GETPOST('memcats', 'array');
- $object->setCategories($memcats);
-
- $db->commit();
- $rowid=$object->id;
- $id=$object->id;
- $action='';
- }
- else
- {
- $db->rollback();
-
- if ($object->error) {
- setEventMessages($object->error, $object->errors, 'errors');
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
- }
-
- $action = 'create';
- }
- }
- else {
- $action = 'create';
- }
- }
-
- if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
- {
- $result=$object->delete($id);
- if ($result > 0)
- {
- if (! empty($backtopage))
- {
- header("Location: ".$backtopage);
- exit;
- }
- else
- {
- header("Location: list.php");
- exit;
- }
- }
- else
- {
- $errmesg=$object->error;
- }
- }
-
- if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
- {
- $error=0;
-
- $db->begin();
-
- $adht = new AdherentType($db);
- $adht->fetch($object->typeid);
-
- $result=$object->validate($user);
-
- if ($result >= 0 && ! count($object->errors))
- {
- // Send confirmation email (according to parameters of member type. Otherwise generic)
- if ($object->email && GETPOST("send_mail"))
- {
- $result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
- if ($result < 0)
- {
- $error++;
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
- }
- else
- {
- $error++;
- if ($object->error) {
- setEventMessages($object->error, $object->errors, 'errors');
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
-
- if (! $error)
- {
- $db->commit();
- }
- else
- {
- $db->rollback();
- }
- $action='';
- }
-
- if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
- {
- $error = 0;
-
- if ($confirm == 'yes')
- {
- $adht = new AdherentType($db);
- $adht->fetch($object->typeid);
-
- $result=$object->resiliate($user);
-
- if ($result >= 0 && ! count($object->errors))
- {
- if ($object->email && GETPOST("send_mail"))
- {
- $result=$object->send_an_email($adht->getMailOnResiliate(),$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
- }
- if ($result < 0)
- {
- $error++;
- setEventMessages($object->error, $object->errors, 'errors');
- }
- }
- else
- {
- $error++;
-
- if ($object->error) {
- setEventMessages($object->error, $object->errors, 'errors');
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
- }
- $action='';
- }
- }
- if (! empty($backtopage) && ! $error)
- {
- header("Location: ".$backtopage);
- exit;
- }
- }
-
- // SPIP Management
- if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
- {
- if (! count($object->errors))
- {
- if (!$mailmanspip->del_to_spip($object))
- {
- setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
- }
- }
- }
-
- if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
- {
- if (! count($object->errors))
- {
- if (!$mailmanspip->add_to_spip($object))
- {
- setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
- }
- }
- }
-
- // Actions to build doc
- $upload_dir = $conf->adherent->dir_output;
- $permissioncreate=$user->rights->adherent->creer;
- include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$formcompany = new FormCompany($db);
-
-$title=$langs->trans("Member") . " - " . $langs->trans("Card");
-$help_url='EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
-llxHeader('',$title,$help_url);
-
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
- // -----------------------------------------
- // When used with CANVAS
- // -----------------------------------------
- if (empty($object->error) && $id)
- {
- $object = new Adherent($db);
- $result=$object->fetch($id);
- if ($result <= 0) dol_print_error('',$object->error);
- }
- $objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
- $objcanvas->display_canvas($action); // Show template
-}
-else
-{
- // -----------------------------------------
- // When used in standard mode
- // -----------------------------------------
-
- if ($action == 'create')
- {
- /* ************************************************************************** */
- /* */
- /* Creation mode */
- /* */
- /* ************************************************************************** */
- $object->canvas=$canvas;
- $object->state_id = GETPOST('state_id', 'int');
-
- // We set country_id, country_code and country for the selected country
- $object->country_id=GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
- if ($object->country_id)
- {
- $tmparray=getCountry($object->country_id,'all');
- $object->country_code=$tmparray['code'];
- $object->country=$tmparray['label'];
- }
-
- $adht = new AdherentType($db);
-
- print load_fiche_titre($langs->trans("NewMember"));
-
- if ($conf->use_javascript_ajax)
- {
- print "\n".'<script type="text/javascript" language="javascript">';
- print 'jQuery(document).ready(function () {
- jQuery("#selectcountry_id").change(function() {
- document.formsoc.action.value="create";
- document.formsoc.submit();
- });
- function initfieldrequired()
- {
- jQuery("#tdcompany").removeClass("fieldrequired");
- jQuery("#tdlastname").removeClass("fieldrequired");
- jQuery("#tdfirstname").removeClass("fieldrequired");
- if (jQuery("#morphy").val() == \'mor\')
- {
- jQuery("#tdcompany").addClass("fieldrequired");
- }
- if (jQuery("#morphy").val() == \'phy\')
- {
- jQuery("#tdlastname").addClass("fieldrequired");
- jQuery("#tdfirstname").addClass("fieldrequired");
- }
- }
- jQuery("#morphy").change(function() {
- initfieldrequired();
- });
- initfieldrequired();
- })';
- print '</script>'."\n";
- }
-
- print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="add">';
-
- dol_fiche_head('');
-
- print '<table class="border" width="100%">';
- print '<tbody>';
-
- // Login
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="maxwidth200" value="'.(isset($_POST["member_login"])?GETPOST("member_login", 'alpha', 2):$object->login).'"></td></tr>';
- }
-
- // Type
- print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
- $listetype=$adht->liste_array();
- if (count($listetype))
- {
- print $form->selectarray("typeid", $listetype, GETPOST('typeid','int')?GETPOST('typeid','int'):$typeid, count($listetype)>1?1:0);
- } else {
- print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
- }
- print "</td>\n";
-
- // Morphy
- $morphys["phy"] = $langs->trans("Physical");
- $morphys["mor"] = $langs->trans("Moral");
- print '<tr><td class="fieldrequired">'.$langs->trans("Nature")."</td><td>\n";
- print $form->selectarray("morphy", $morphys, GETPOST('morphy','alpha')?GETPOST('morphy','alpha'):$object->morphy, 1);
- print "</td>\n";
-
- // Company
- print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(GETPOST('societe','alpha')?GETPOST('societe','alpha'):$object->societe).'"></td></tr>';
-
- // Civility
- print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
- print $formcompany->select_civility(GETPOST('civility_id','int')?GETPOST('civility_id','int'):$object->civility_id,'civility_id').'</td>';
- print '</tr>';
-
- // Lastname
- print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.(GETPOST('lastname','alpha')?GETPOST('lastname','alpha'):$object->lastname).'" size="40"></td>';
- print '</tr>';
-
- // Firstname
- print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
- print '</tr>';
-
- // EMail
- print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
-
- // Password
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
- $generated_password=getRandomPassword(false);
- print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
- print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
- print '</td></tr>';
- }
-
- // Address
- print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
- print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
- print '</td></tr>';
-
- // Zip / Town
- print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
- print $formcompany->select_ziptown((GETPOST('zipcode','alpha')?GETPOST('zipcode','alpha'):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
- print ' ';
- print $formcompany->select_ziptown((GETPOST('town','alpha')?GETPOST('town','alpha'):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
- print '</td></tr>';
-
- // Country
- $object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
- print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
- print $form->select_country(GETPOST('country_id','alpha')?GETPOST('country_id','alpha'):$object->country_id,'country_id');
- if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
- print '</td></tr>';
-
- // State
- if (empty($conf->global->MEMBER_DISABLE_STATE))
- {
- print '<tr><td>'.$langs->trans('State').'</td><td>';
- if ($object->country_id)
- {
- print $formcompany->select_state(GETPOST('state_id','int')?GETPOST('state_id','int'):$object->state_id,$object->country_code);
- }
- else
- {
- print $countrynotdefined;
- }
- print '</td></tr>';
- }
-
- // Pro phone
- print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(GETPOST('phone','alpha')?GETPOST('phone','alpha'):$object->phone).'"></td></tr>';
-
- // Personal phone
- print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(GETPOST('phone_perso','alpha')?GETPOST('phone_perso','alpha'):$object->phone_perso).'"></td></tr>';
-
- // Mobile phone
- print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
-
- // Skype
- if (! empty($conf->skype->enabled))
- {
- print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
- }
-
- // Birthday
- print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
- $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
- print "</td></tr>\n";
-
- // Public profil
- print "<tr><td>".$langs->trans("Public")."</td><td>\n";
- print $form->selectyesno("public",$object->public,1);
- print "</td></tr>\n";
-
- // Categories
- if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
- {
- print '<tr><td>' . fieldLabel('Categories', 'memcars') . '</td><td>';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
- print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
- print "</td></tr>";
- }
-
- // Other attributes
- $parameters=array();
- $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');
- }
-
- /*
- // Third party Dolibarr
- if (! empty($conf->societe->enabled))
- {
- print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
- print $form->select_company($object->fk_soc,'socid','',1);
- print '</td></tr>';
- }
-
- // Login Dolibarr
- print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
- print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
- print '</td></tr>';
- */
- print '<tbody>';
- print "</table>\n";
-
- dol_fiche_end();
-
- print '<div class="center">';
- print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
- print ' ';
- print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
- print '</div>';
-
- print "</form>\n";
- }
-
- if ($action == 'edit')
- {
- /********************************************
- *
- * Edition mode
- *
- ********************************************/
-
- $res=$object->fetch($id);
- if ($res < 0) {
- dol_print_error($db,$object->error); exit;
- }
- $res=$object->fetch_optionals($object->id,$extralabels);
- if ($res < 0) {
- dol_print_error($db); exit;
- }
-
- $adht = new AdherentType($db);
- $adht->fetch($object->typeid);
-
- // We set country_id, and country_code, country of the chosen country
- $country=GETPOST('country','int');
- if (!empty($country) || $object->country_id)
- {
- $sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country)?$country:$object->country_id);
- $resql=$db->query($sql);
- if ($resql)
- {
- $obj = $db->fetch_object($resql);
- }
- else
- {
- dol_print_error($db);
- }
- $object->country_id=$obj->rowid;
- $object->country_code=$obj->code;
- $object->country=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
- }
-
- $head = member_prepare_head($object);
-
-
- if ($conf->use_javascript_ajax)
- {
- print "\n".'<script type="text/javascript" language="javascript">';
- print 'jQuery(document).ready(function () {
- jQuery("#selectcountry_id").change(function() {
- document.formsoc.action.value="edit";
- document.formsoc.submit();
- });
- function initfieldrequired()
- {
- jQuery("#tdcompany").removeClass("fieldrequired");
- jQuery("#tdlastname").removeClass("fieldrequired");
- jQuery("#tdfirstname").removeClass("fieldrequired");
- if (jQuery("#morphy").val() == \'mor\')
- {
- jQuery("#tdcompany").addClass("fieldrequired");
- }
- if (jQuery("#morphy").val() == \'phy\')
- {
- jQuery("#tdlastname").addClass("fieldrequired");
- jQuery("#tdfirstname").addClass("fieldrequired");
- }
- }
- jQuery("#morphy").change(function() {
- initfieldrequired();
- });
- initfieldrequired();
- })';
- print '</script>'."\n";
- }
-
- print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
- print '<input type="hidden" name="action" value="update" />';
- print '<input type="hidden" name="rowid" value="'.$id.'" />';
- print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
- if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
-
- dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
- print '<table class="border" width="100%">';
-
- // Ref
- print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
-
- // Login
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
- }
-
- // Morphy
- $morphys["phy"] = $langs->trans("Physical");
- $morphys["mor"] = $langs->trans("Morale");
- print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
- print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
- print "</td></tr>";
-
- // Type
- print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
- if ($user->rights->adherent->creer)
- {
- print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
- }
- else
- {
- print $adht->getNomUrl(1);
- print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
- }
- print "</td></tr>";
-
- // Company
- print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
-
- // Civility
- print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
- print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id)."\n";
- print '</td>';
- print '</tr>';
-
- // Lastname
- print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
- print '</tr>';
-
- // Firstname
- print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
- print '</tr>';
-
- // Photo
- print '<tr><td>'.$langs->trans("Photo").'</td>';
- print '<td class="hideonsmartphone" valign="middle">';
- print $form->showphoto('memberphoto',$object)."\n";
- if ($caneditfieldmember)
- {
- if ($object->photo) print "<br>\n";
- print '<table class="nobordernopadding">';
- if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
- print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
- print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
- print '</table>';
- }
- print '</td></tr>';
-
- // EMail
- print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?GETPOST("email",'',2):$object->email).'"></td></tr>';
-
- // Password
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
- }
-
- // Address
- print '<tr><td>'.$langs->trans("Address").'</td><td>';
- print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
- print '</td></tr>';
-
- // Zip / Town
- print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
- print $formcompany->select_ziptown((isset($_POST["zipcode"])?GETPOST("zipcode",'',2):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
- print ' ';
- print $formcompany->select_ziptown((isset($_POST["town"])?GETPOST("town",'',2):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
- print '</td></tr>';
-
- // Country
- //$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id; // In edit mode we don't force to company country if not defined
- print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
- print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
- if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
- print '</td></tr>';
-
- // State
- if (empty($conf->global->MEMBER_DISABLE_STATE))
- {
- print '<tr><td>'.$langs->trans('State').'</td><td>';
- print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?GETPOST("country_id"):$object->country_id);
- print '</td></tr>';
- }
-
- // Pro phone
- print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?GETPOST("phone"):$object->phone).'"></td></tr>';
-
- // Personal phone
- print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?GETPOST("phone_perso"):$object->phone_perso).'"></td></tr>';
-
- // Mobile phone
- print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?GETPOST("phone_mobile"):$object->phone_mobile).'"></td></tr>';
-
- // Skype
- if (! empty($conf->skype->enabled))
- {
- print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
- }
-
- // Birthday
- print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
- $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
- print "</td></tr>\n";
-
- // Public profil
- print "<tr><td>".$langs->trans("Public")."</td><td>\n";
- print $form->selectyesno("public",(isset($_POST["public"])?GETPOST("public",'',2):$object->public),1);
- print "</td></tr>\n";
-
- // Categories
- if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
- {
- print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
- print '<td colspan="2">';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
- $c = new Categorie($db);
- $cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
- foreach ($cats as $cat) {
- $arrayselected[] = $cat->id;
- }
- print $form->multiselectarray('memcats', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
- print "</td></tr>";
- }
-
- // Other attributes
- $parameters=array("colspan"=>2);
- $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',$parameters);
- }
-
- // Third party Dolibarr
- if (! empty($conf->societe->enabled))
- {
- print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
- if ($object->fk_soc)
- {
- $company=new Societe($db);
- $result=$company->fetch($object->fk_soc);
- print $company->getNomUrl(1);
- }
- else
- {
- print $langs->trans("NoThirdPartyAssociatedToMember");
- }
- print '</td></tr>';
- }
-
- // Login Dolibarr
- print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
- if ($object->user_id)
- {
- $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
- }
- else print $langs->trans("NoDolibarrAccess");
- print '</td></tr>';
-
- print '</table>';
-
- dol_fiche_end();
-
- print '<div class="center">';
- print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
- print ' ';
- print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
- print '</div>';
-
- print '</form>';
-
- }
-
- if ($id > 0 && $action != 'edit')
- {
- /* ************************************************************************** */
- /* */
- /* View mode */
- /* */
- /* ************************************************************************** */
-
- $res=$object->fetch($id);
- if ($res < 0) {
- dol_print_error($db,$object->error); exit;
- }
- $res=$object->fetch_optionals($object->id,$extralabels);
- if ($res < 0) {
- dol_print_error($db); exit;
- }
-
- $adht = new AdherentType($db);
- $res=$adht->fetch($object->typeid);
- if ($res < 0) {
- dol_print_error($db); exit;
- }
-
-
- /*
- * Show tabs
- */
- $head = member_prepare_head($object);
-
- dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
- // Confirm create user
- if ($action == 'create_user')
- {
- $login=$object->login;
- if (empty($login))
- {
- // Full firstname and name separated with a dot : firstname.name
- include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- $login=dol_buildlogin($object->lastname,$object->firstname);
- }
- if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4));
-
- // Create a form array
- $formquestion=array(
- array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
- );
- $text=$langs->trans("ConfirmCreateLogin").'<br>';
- if (! empty($conf->societe->enabled))
- {
- if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
- else $text.=$langs->trans("UserWillBeInternalUser");
- }
- print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
- }
-
- // Confirm create third party
- if ($action == 'create_thirdparty')
- {
- $name = $object->getFullName($langs);
- if (! empty($name))
- {
- if ($object->societe) $name.=' ('.$object->societe.')';
- }
- else
- {
- $name=$object->societe;
- }
-
- // Create a form array
- $formquestion=array( array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
-
- print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
- }
-
- // Confirm validate member
- if ($action == 'valid')
- {
- $langs->load("mails");
-
- $adht = new AdherentType($db);
- $adht->fetch($object->typeid);
-
- $subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_VALID_SUBJECT);
- $texttosend=$object->makeSubstitution($adht->getMailOnValid());
-
- $tmp=$langs->trans("SendAnEMailToMember");
- $tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
- $tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
- $helpcontent='';
- $helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
- $helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
- $helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
- $helpcontent.=$subjecttosend."\n";
- $helpcontent.="<br>";
- $helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
- $helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
- $label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
- // Create form popup
- $formquestion=array();
- if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
- if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_MAILMAN)) {
- $formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>'');
- }
- if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP)) {
- $formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>'');
- }
- print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1,1);
- }
-
- // Confirm send card by mail
- if ($action == 'sendinfo')
- {
- print $form->formconfirm("card.php?rowid=".$id,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
- }
-
- // Confirm terminate
- if ($action == 'resign')
- {
- $langs->load("mails");
-
- $adht = new AdherentType($db);
- $adht->fetch($object->typeid);
-
- $subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_RESIL_SUBJECT);
- $texttosend=$object->makeSubstitution($adht->getMailOnResiliate());
-
- $tmp=$langs->trans("SendAnEMailToMember");
- $tmp.='<br>('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
- $tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
- $helpcontent='';
- $helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
- $helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
- $helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
- $helpcontent.=$subjecttosend."\n";
- $helpcontent.="<br>";
- $helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
- $helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
- $label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
- // Create an array
- $formquestion=array();
- if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
- if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
- print $form->formconfirm("card.php?rowid=".$id,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion,'no',1);
- }
-
- // Confirm remove member
- if ($action == 'delete')
- {
- $formquestion=array();
- if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
- print $form->formconfirm("card.php?rowid=".$id,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
- }
-
- // Confirm add in spip
- if ($action == 'add_spip')
- {
- print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
- }
- // Confirm removed from spip
- if ($action == 'del_spip')
- {
- print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
- }
-
- $rowspan=17;
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
- if (! empty($conf->societe->enabled)) $rowspan++;
-
- $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-
- dol_banner_tab($object, 'rowid', $linkback);
-
- print '<div class="fichecenter">';
- print '<div class="fichehalfleft">';
-
- print '<div class="underbanner clearboth"></div>';
- print '<table class="border centpercent">';
-
- // Login
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.' </td></tr>';
- }
-
- // Type
- print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
-
- // Morphy
- print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
- print '</tr>';
-
- // Company
- print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
-
- // Civility
- print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().' </td>';
- print '</tr>';
-
- // Password
- if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
- {
- print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i','*',$object->pass);
- if ($object->pass) print preg_replace('/./i','*',$object->pass);
- else
- {
- if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
- else print $langs->trans("Hidden");
- }
- if ((! empty($object->pass) || ! empty($object->pass_crypted)) && empty($object->user_id))
- {
- $langs->load("errors");
- $htmltext=$langs->trans("WarningPasswordSetWithNoAccount");
- print ' '.$form->textwithpicto('', $htmltext,1,'warning');
- }
- print '</td></tr>';
- }
-
- print '</table>';
-
- print '</div>';
- print '<div class="fichehalfright"><div class="ficheaddleft">';
-
- print '<div class="underbanner clearboth"></div>';
- print '<table class="border tableforfield" width="100%">';
-
- // Birthday
- print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
-
- // Public
- print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
-
- // Categories
- if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
- {
- print '<tr><td>' . $langs->trans("Categories") . '</td>';
- print '<td colspan="2">';
- print $form->showCategories($object->id, 'member', 1);
- print '</td></tr>';
- }
-
- // Other attributes
- $parameters=array('colspan'=>2);
- $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, 'view', $parameters);
- }
-
- // Date end subscription
- print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
- if ($object->datefin)
- {
- print dol_print_date($object->datefin,'day');
- if ($object->hasDelay()) {
- print " ".img_warning($langs->trans("Late"));
- }
- }
- else
- {
- if (! $adht->subscription)
- {
- print $langs->trans("SubscriptionNotRecorded");
- if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
- }
- else
- {
- print $langs->trans("SubscriptionNotReceived");
- if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
- }
- }
- print '</td></tr>';
-
- // Third party Dolibarr
- if (! empty($conf->societe->enabled))
- {
- print '<tr><td>';
- print '<table class="nobordernopadding" width="100%"><tr><td>';
- print $langs->trans("LinkedToDolibarrThirdParty");
- print '</td>';
- if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>';
- print '</tr></table>';
- print '</td><td colspan="2" class="valeur">';
- if ($action == 'editthirdparty')
- {
- $htmlname='socid';
- print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
- print '<input type="hidden" name="rowid" value="'.$object->id.'">';
- print '<input type="hidden" name="action" value="set'.$htmlname.'">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
- print '<tr><td>';
- print $form->select_company($object->fk_soc,'socid','',1);
- print '</td>';
- print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
- print '</tr></table></form>';
- }
- else
- {
- if ($object->fk_soc)
- {
- $company=new Societe($db);
- $result=$company->fetch($object->fk_soc);
- print $company->getNomUrl(1);
- }
- else
- {
- print $langs->trans("NoThirdPartyAssociatedToMember");
- }
- }
- print '</td></tr>';
- }
-
- // Login Dolibarr
- print '<tr><td>';
- print '<table class="nobordernopadding" width="100%"><tr><td>';
- print $langs->trans("LinkedToDolibarrUser");
- print '</td>';
- if ($action != 'editlogin' && $user->rights->adherent->creer)
- {
- print '<td align="right">';
- if ($user->rights->user->user->creer)
- {
- print '<a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a>';
- }
- print '</td>';
- }
- print '</tr></table>';
- print '</td><td colspan="2" class="valeur">';
- if ($action == 'editlogin')
- {
- $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
- }
- else
- {
- if ($object->user_id)
- {
- $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
- }
- else print $langs->trans("NoDolibarrAccess");
- }
- print '</td></tr>';
-
- print "</table>\n";
-
- print "</div></div></div>\n";
- print '<div style="clear:both"></div>';
-
- dol_fiche_end();
-
-
- /*
- * Hotbar
- */
-
- print '<div class="tabsAction">';
- $parameters = array();
- $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
- if (empty($reshook)) {
- if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
- {
- // Modify
- if ($user->rights->adherent->creer)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
- }
-
- // Validate
- if ($object->statut == -1)
- {
- if ($user->rights->adherent->creer)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
- }
- }
-
- // Reactivate
- if ($object->statut == 0)
- {
- if ($user->rights->adherent->creer)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
- }
- }
-
- // Send card by email
- if ($user->rights->adherent->creer)
- {
- if ($object->statut >= 1)
- {
- if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
- else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
- }
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
- }
-
- // Terminate
- if ($object->statut >= 1)
- {
- if ($user->rights->adherent->supprimer)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
- }
- }
-
- // Create third party
- if (! empty($conf->societe->enabled) && ! $object->fk_soc)
- {
- if ($user->rights->societe->creer)
- {
- if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
- else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
- }
- }
-
- // Create user
- if (! $user->societe_id && ! $object->user_id)
- {
- if ($user->rights->user->user->creer)
- {
- if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
- else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
- }
- }
-
- // Delete
- if ($user->rights->adherent->supprimer)
- {
- print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
- }
- else
- {
- print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
- }
-
- // Action SPIP
- if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
- {
- $isinspip = $mailmanspip->is_in_spip($object);
-
- if ($isinspip == 1)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
- }
- if ($isinspip == 0)
- {
- print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
- }
- }
-
- }
- }
- print '</div>';
-
- if ($isinspip == -1)
- {
- print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
- }
-
-
-
- print '<div class="fichecenter"><div class="fichehalfleft">';
- print '<a name="builddoc"></a>'; // ancre
-
- // Documents generes
- $filename = dol_sanitizeFileName($object->ref);
- //$filename = 'tmp_cards.php';
- //$filedir = $conf->adherent->dir_output . '/' . get_exdir($object->id, 2, 0, 0, $object, 'member') . dol_sanitizeFileName($object->ref);
- $filedir = $conf->adherent->dir_output . '/' . get_exdir(0, 0, 0, 0, $object, 'member');
- $urlsource = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
- $genallowed = $user->rights->adherent->creer;
- $delallowed = $user->rights->adherent->supprimer;
-
- print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
- $somethingshown = $formfile->numoffiles;
-
- // Show links to link elements
- //$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
- //$somethingshown = $form->showLinkedObjectBlock($object, '');
-
- // Show links to link elements
- /*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
- if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-
- // Link for paypal payment
- /*
- if (! empty($conf->paypal->enabled) && $object->statut != 0) {
- include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
- print showPaypalPaymentUrl('invoice', $object->ref);
- }
- */
- print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
- // List of actions on element
- /* Already in tab Agenda/Events
- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
- $formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'member', $socid);
- */
- print '</div></div></div>';
-
- }
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2a615ad4b6952070fbcc972fe271698b1bcfc5f4..b77ed4db1a5aefdd93839d62652dbf6dfd11c16d 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -569,7 +569,7 @@ class Account extends CommonObject
$sql.= ", '".$this->db->escape($this->label)."'";
$sql.= ", ".$conf->entity;
$sql.= ", '".$this->db->escape($this->account_number)."'";
- $sql.= ", '".$this->db->escape($this->fk_accountancy_journal)."'";
+ $sql.= ", ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
$sql.= ", '".$this->db->escape($this->bank)."'";
$sql.= ", '".$this->code_banque."'";
$sql.= ", '".$this->code_guichet."'";
@@ -702,8 +702,7 @@ class Account extends CommonObject
$sql.= ",rappro = ".$this->rappro;
$sql.= ",url = ".($this->url?"'".$this->url."'":"null");
$sql.= ",account_number = '".$this->db->escape($this->account_number)."'";
- $sql.= ",fk_accountancy_journal = '".$this->db->escape($this->fk_accountancy_journal)."'";
-
+ $sql.= ",fk_accountancy_journal = ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
$sql.= ",bank = '".$this->db->escape($this->bank)."'";
$sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
$sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 008f4c15e3cd0bcbbad0da3d312fe94cf521957c..c60464ed0fd216f64d475b01d9a8d8b3a6b49c9a 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -657,6 +657,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists)
* @param string $destfile Destination file (can't be a directory. use native php @rename() to move a directory)
* @param integer $newmask Mask in octal string for new file (0 by default means $conf->global->MAIN_UMASK)
* @param int $overwriteifexists Overwrite file if exists (1 by default)
+ * @param int $testvirus Do an antivirus test. Move is canceled if a virus is found.
* @return boolean True if OK, false if KO
* @see dol_move_uploaded_file
*/
@@ -1624,12 +1625,12 @@ function dol_compress_file($inputfile, $outputfile, $mode="gz")
*/
function dol_uncompress($inputfile,$outputdir)
{
- global $conf, $langs;
+ global $langs;
- if (! empty($conf->global->ODTPHP_PATHTOPCLZIP))
+ if (defined('ODTPHP_PATHTOPCLZIP'))
{
- dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".$conf->global->ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
- include_once $conf->global->ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
+ dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
+ include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
$archive = new PclZip($inputfile);
$result=$archive->extract(PCLZIP_OPT_PATH, $outputdir);
//var_dump($result);
@@ -1698,7 +1699,7 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta
* @param string $entity Restrict onto entity (0=no restriction)
* @param User $fuser User object (forced)
* @param string $refname Ref of object to check permission for external users (autodetect if not provided)
- * @param string $more Check permission for 'read' or 'write'
+ * @param string $mode Check permission for 'read' or 'write'
* @return mixed Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
* @see restrictedArea
*/
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 14f61d99590ccebbb8b173bbef86209cc72a4a76..30e1579c33e6b769c83c96be5ff559fc5cb0fbdd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -281,7 +281,7 @@ function GETPOST($paramname, $check='', $method=0, $filter=NULL, $options=NULL)
$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
// Retrieve values if restore_lastsearch_values is set and there is saved values
- if ($_GET['restore_lastsearch_values'] && ! empty($_SESSION['lastsearch_values_'.$relativepathstring])) // Keep $_GET here
+ if (! empty($_GET['restore_lastsearch_values']) && ! empty($_SESSION['lastsearch_values_'.$relativepathstring])) // Keep $_GET here
{
$tmp=json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
if (is_array($tmp))
@@ -615,19 +615,20 @@ function dol_buildpath($path, $type=0)
}
/**
- * Create a clone of instance of object (new instance with same properties)
- * This function works for both PHP4 and PHP5
+ * Create a clone of instance of object (new instance with same value for properties)
+ * Property that are reference are also new object (true clone)
*
* @param object $object Object to clone
* @return object Object clone
- * @deprecated Dolibarr no longer supports PHP4, use PHP5 native clone construct
* @see https://php.net/manual/language.oop5.cloning.php
*/
function dol_clone($object)
{
- dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
+ //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
- $myclone = clone $object;
+ //$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable
+ $myclone=unserialize(serialize($object));
+
return $myclone;
}
@@ -2469,7 +2470,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
if ($trunc == 'right')
{
$newstring=dol_textishtml($string)?dol_string_nohtmltag($string,1):$string;
- if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:1)))
+ if (dol_strlen($newstring,$stringencoding) > ($size+($nodot?0:1)))
return dol_substr($newstring,0,$size,$stringencoding).($nodot?'':'...');
else
return $string;
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index c8d617ec99d2486a840be337a0cf5a4dda8f15fb..8934447fdfe7fbc8f7987c5f13e0525484be2d4a 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -781,7 +781,7 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
}
// Personalized field {XXX-1} à {XXX-9}
- $maskperso=array();
+ /*$maskperso=array();
$maskpersonew=array();
$tmpmask=$mask;
while (preg_match('/\{([A-Z]+)\-([1-9])\}/i',$tmpmask,$regKey))
@@ -789,17 +789,17 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
$maskperso[$regKey[1]]='\{'.$regKey[1]+'\-'.$regKey[2].'\}';
$maskpersonew[$regKey[1]]=str_pad('', '_', $regKey[2], STR_PAD_RIGHT);
$tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew, $tmpmask);
- }
+ }*/
$maskwithonlyymcode=$mask;
$maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
$maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
$maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
$maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);
- foreach($maskperso as $key => $val)
+ /*foreach($maskperso as $key => $val)
{
$maskwithonlyymcode=preg_replace('/'.$val.'/i', $maskpersonew[$key], $maskwithonlyymcode);
- }
+ }*/
$maskwithnocode=$maskwithonlyymcode;
$maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
$maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index cdb4ea33f736c0208059bad7f65ce7cc8ade3195..71de341a76996c9b59193395a4d02feea3096d35 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -848,8 +848,8 @@ class DolibarrModules // Can not be abstract, because we need to insta
$resql=$this->db->query($sql);
if (! $resql) $err++;
- $note=json_encode(array('authorid'=>$user->id, 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
-
+ $note=json_encode(array('authorid'=>(is_object($user)?$user->id:0), 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
+
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
$sql.= " (".$this->db->encrypt($this->const_name,1);
$sql.= ", ".$this->db->encrypt('1',1);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6aebf0e8786b560a42adaf35ade5d10b963edd66..995c16719cbfa8b73825abf3c99fb2e77827dd89 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -841,7 +841,7 @@ class Societe extends CommonObject
$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
if (isset($this->stcomm_id))
{
- $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "null");
+ $sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
}
$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 42b4ff7cf7fd5ebc4ef7ce56899f7421ef251d65..5db9808c9ab9213b08a8d1f007d5224747cb3f02 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -83,7 +83,9 @@ class AdherentTest extends PHPUnit_Framework_TestCase
print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
die();
}
-
+ if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+ if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
+
print __METHOD__."\n";
}
@@ -320,6 +322,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
'%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%,%EMAIL%,%BIRTH%,%PHOTO%,%LOGIN%,%PASSWORD%,%PRENOM%,'.
'%NOM%,%SOCIETE%,%ADDRESS%,%ZIP%,%TOWN%,%COUNTRY%';
+ // If option to store clear password has been set, we get 'dolibspec' into PASSWORD field.
$expected = DOL_MAIN_URL_ROOT.','.$localobject->id.',,New firstname,New name,New firstname New name,'.
'New company,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth,'day').',,'.
'newlogin,dolibspec,New firstname,New name,New company,New address,New zip,New town,Belgium';
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index de8cc397cf409b47f5ec8d18b3e843400288d05b..a417824867b3c3f8b526594f648ff35f15f9ac83 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -121,7 +121,7 @@ class AllTests
$suite->addTestSuite('BuildDocTest');
require_once dirname(__FILE__).'/CMailFileTest.php';
$suite->addTestSuite('CMailFileTest');
-
+
require_once dirname(__FILE__).'/CommonObjectTest.php';
$suite->addTestSuite('CommonObjectTest');
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index d1a5f48ae8d54e5cce9891847a1d85e08e27c6de..c0a4ce845a9c35a2b9f7600020a4fd03302812ea 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -431,10 +431,17 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;
-
+
+
//$dummyuser=new User($db);
//$result=restrictedArea($dummyuser,'societe');
+ // We save user properties
+ $savpermlire = $user->rights->facture->lire;
+ $savpermcreer = $user->rights->facture->creer;
+
+
+ // Check access to SPECIMEN
$user->rights->facture->lire = 0;
$user->rights->facture->creer = 0;
$filename='SPECIMEN.pdf'; // Filename relative to module part
@@ -473,6 +480,11 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
$filename='FA010101/FA010101.pdf'; // Filename relative to module part
$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
$this->assertEquals(0,$result['accessallowed']);
+
+
+ // We restore user properties
+ $user->rights->facture->lire = $savpermlire;
+ $user->rights->facture->creer = $savpermcreer;
}
}
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 28e55fd793b50f04b9379d72fab866999745d3aa..8c57e8a178ac8cb3acc59b7cf74ceaeafd6d3240 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -81,6 +81,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
global $conf,$user,$langs,$db;
//$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+ if (! function_exists('mb_substr')) { print "\n".__METHOD__." function mb_substr must be enabled.\n"; die(); }
+
print __METHOD__."\n";
}
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index e769ce9dd5116aa40e7adda921587ddc1ddace0e..a4ff51333e04701493e6d9eb4501629b41d4c244 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -143,6 +143,11 @@ class ModulesTest extends PHPUnit_Framework_TestCase
$result=$mod->init();
$this->assertLessThan($result, 0, $modlabel);
print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
+
+ if (in_array($modlabel, array('Ldap', 'MailmanSpip')))
+ {
+ $result=$mod->remove();
+ }
}
return 0;
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index b29cd03b2c9fc692661c066e12179fe5927e424e..401b7ce005811f2aad59910eb6534eda999c5f69 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -128,7 +128,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$user=$this->savuser;
$langs=$this->savlangs;
$db=$this->savdb;
-
+
require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
@@ -138,20 +138,22 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
-
- $localobject=new Facture($this->savdb);
+
+ $localobject=new Facture($this->savdb);
$localobject->initAsSpecimen();
$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year
$numbering=new mod_facture_mercure();
$result=$numbering->getNextValue($mysoc, $localobject);
- $result2=$localobject->create($user,1);
- $result3=$localobject->validate($user, $result); // create invoice by forcing ref
print __METHOD__." result=".$result."\n";
$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice'); // counter must start to 1
+ $result2=$localobject->create($user,1);
+ print __METHOD__." result2=".$result."\n";
+ $result3=$localobject->validate($user, $result); // create invoice by forcing ref
+ print __METHOD__." result3=".$result."\n";
+ $this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok'); // counter must start to 1
$result=$localobject->is_erasable();
print __METHOD__." is_erasable=".$result."\n";
- $this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice'); // Can be deleted
-
+ $this->assertEquals(1, $result, 'Test for is_erasable, 1st invoice'); // Can be deleted
$localobject2=new Facture($this->savdb);
$localobject2->initAsSpecimen();
$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916); // we use following year for second invoice (there is no reset into mask)
@@ -160,10 +162,13 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
$result=$numbering->getNextValue($mysoc, $localobject2);
- $result2=$localobject2->create($user,1);
- $result3=$localobject2->validate($user, $result); // create invoice by forcing ref
print __METHOD__." result=".$result."\n";
$this->assertEquals('1916-0002', $result); // counter must be now 2 (not reseted)
+ $result2=$localobject2->create($user,1);
+ print __METHOD__." result2=".$result."\n";
+ $result3=$localobject2->validate($user, $result); // create invoice by forcing ref
+ print __METHOD__." result3=".$result."\n";
+ $this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok'); // counter must start to 1
$result=$localobject2->is_erasable();
print __METHOD__." is_erasable=".$result."\n";
$this->assertEquals(1, $result); // Can be deleted
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 24b868b743e51a076b835e7d6823ca389e3ef0ed..31aa98fd08237d20fc7cb42ba5b589356f855390 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -79,7 +79,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase
if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(); }
- if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULE must be empty (if a module set it, disable module).\n"; die(); }
+ if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(); }
$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 4e0c0ba58cafddb12d83a04b8c1585ccd333950e..b932d2e2221f2023de6cc0922d1b5e5ca5e17ba6 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -75,6 +75,9 @@ class UserTest extends PHPUnit_Framework_TestCase
public static function setUpBeforeClass()
{
global $conf,$user,$langs,$db;
+
+ if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+
$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
print __METHOD__."\n";
@@ -187,7 +190,7 @@ class UserTest extends PHPUnit_Framework_TestCase
$newlocalobject=new User($this->savdb);
$newlocalobject->initAsSpecimen();
$this->changeProperties($newlocalobject);
- $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected
+ $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected
return $localobject;
}
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 470bcbf4900b520c47c2cc207c24890f982e7c33..07bd95e01f2ef99d8a5897399d55f4c5288403a0 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -39,6 +39,8 @@ if (empty($user->id))
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_UMASK='0666';
+
/**
* Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 06ead4f4873073cacfa020f8bec7f8fc32d37a2a..e81ee2d3604d463f2c55c419e2b4b17e9519e691 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_UMASK='0666';
+
/**
* Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index d04fc6b9b9cffd80c27be0ea08b4bb60d1386ae5..e3725c8609ce627a16507ab76a692242e39bcffe 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_UMASK='0666';
+
/**
* Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index fecc58a65e10b9deecbf9588f1485162ea3d06f2..e3500a68f5b9a4572b4d36c6f26cbbd57926620d 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -40,6 +40,8 @@ if (empty($user->id)) {
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_UMASK='0666';
+
if (empty($conf->service->enabled))
{
print "Error: Module service must be enabled.\n";
@@ -167,7 +169,9 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
'ref'=>'NewProductFromWS'.$datestring,
'label'=>'New Product From WS '.$datestring,
'type'=>1,
- 'description'=>'This is a new product created from WS PHPUnit test case'
+ 'description'=>'This is a new product created from WS PHPUnit test case',
+ 'barcode'=>'123456789012',
+ 'barcode_type'=>2
)
);
print __METHOD__." call method ".$WS_METHOD."\n";
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 2888c432e7325603052f816b97515eeb302167e6..59907b36194878963015b5898f13653eb76e49ae 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_UMASK='0666';
+
/**
* Class for PHPUnit tests
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index 78d3d311fe0bc190e9b0d327befb961e9f44225c..5098da22e6ecaaba106503dea6d356068e5af80a 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -38,6 +38,8 @@ if (empty($user->id)) {
}
$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_UMASK='0666';
+
/**
* Class for PHPUnit tests