';
print "\n";
}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 39e2f0a98f7..985a50df9ec 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -36,8 +36,17 @@ class ActionComm extends CommonObject
public $element='action';
public $table_element = 'actioncomm';
public $table_rowid = 'id';
- public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto='action';
+ /**
+ * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ * @var int
+ */
+ public $ismultientitymanaged = 1;
+ /**
+ * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user, 2=Same than 1 but accept record if fksoc is empty
+ * @var integer
+ */
+ public $restrictiononfksoc = 2;
/**
* Id of the event
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 1b6a98dbdb9..84ad5707fe2 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -48,8 +48,17 @@ class Propal extends CommonObject
public $table_element='propal';
public $table_element_line='propaldet';
public $fk_element='fk_propal';
- public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto='propal';
+ /**
+ * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ * @var int
+ */
+ public $ismultientitymanaged = 1;
+ /**
+ * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+ * @var integer
+ */
+ public $restrictiononfksoc = 1;
/**
* {@inheritdoc}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 9474d54b925..63ca86191d3 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1288,7 +1288,6 @@ if (empty($reshook))
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-
if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer)
{
if ($action == 'addcontact')
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 6ebe94c327b..35ead22c32f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -46,8 +46,17 @@ class Commande extends CommonOrder
public $table_element_line = 'commandedet';
public $class_element_line = 'OrderLine';
public $fk_element = 'fk_commande';
- public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'order';
+ /**
+ * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ * @var int
+ */
+ public $ismultientitymanaged = 1;
+ /**
+ * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+ * @var integer
+ */
+ public $restrictiononfksoc = 1;
/**
* {@inheritdoc}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6def698a916..3cccffa2518 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3730,7 +3730,7 @@ else if ($id > 0 || ! empty($ref))
else
{
var revenue_type = parseFloat(valselected);
- var amount_net = ".round($object->total_ht , 2).";
+ var amount_net = ".round($object->total_ht, 2).";
revenue = revenue_type * amount_net / 100;
revenue = revenue.toFixed(2);
}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ac068fb5f6e..0d96236a6ab 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -52,8 +52,17 @@ class Facture extends CommonInvoice
public $table_element='facture';
public $table_element_line = 'facturedet';
public $fk_element = 'fk_facture';
- public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto='bill';
+ /**
+ * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ * @var int
+ */
+ public $ismultientitymanaged = 1;
+ /**
+ * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+ * @var integer
+ */
+ public $restrictiononfksoc = 1;
/**
* {@inheritdoc}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 48768af5a7a..1b52ac278ec 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -44,8 +44,17 @@ class Contrat extends CommonObject
public $table_element='contrat';
public $table_element_line='contratdet';
public $fk_element='fk_contrat';
- public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto='contract';
+ /**
+ * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+ * @var int
+ */
+ public $ismultientitymanaged = 1;
+ /**
+ * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+ * @var integer
+ */
+ public $restrictiononfksoc = 1;
/**
* {@inheritdoc}
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index b9cefe45306..e42c2e9a83b 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -30,16 +30,19 @@
if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
{
- $ret = $object->fetch($id, $ref);
- if ($ret > 0)
- {
- $object->fetch_thirdparty();
- $id = $object->id;
- }
- else
- {
- if (empty($object->error) && ! count($object->errors)) setEventMessages('Fetch on object return an error without filling $object->error nor $object->errors', null, 'errors');
- else setEventMessages($object->error, $object->errors, 'errors');
- $action='';
- }
+ if (($id > 0 && is_numeric($id)) || ! empty($ref)) // To discard case when id is list of ids like '1,2,3...'
+ {
+ $ret = $object->fetch($id, $ref);
+ if ($ret > 0)
+ {
+ $object->fetch_thirdparty();
+ $id = $object->id;
+ }
+ else
+ {
+ if (empty($object->error) && ! count($object->errors)) setEventMessages('Fetch on object return an error without filling $object->error nor $object->errors', null, 'errors');
+ else setEventMessages($object->error, $object->errors, 'errors');
+ $action='';
+ }
+ }
}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 37f87ca1da2..25d9f67a219 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1414,6 +1414,10 @@ abstract class CommonObject
}
if ($fieldid == 'none') return 1;
+ // Security on socid
+ $socid = 0;
+ if ($user->societe_id > 0) $socid = $user->societe_id;
+
// this->ismultientitymanaged contains
// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
$alias = 's';
@@ -1422,18 +1426,25 @@ abstract class CommonObject
$sql = "SELECT MAX(te.".$fieldid.")";
$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
- if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+ else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+ else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+ if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
- if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id;
+ if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
+ if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
if (! empty($filter))
{
if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND "; // For backward compatibility
$sql.=$filter;
}
if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
- if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')';
+ else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+ if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+ if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
+ if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+ if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+ //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql." ";
- //print 'filter = '.$filter.' -> '.$sql." ";
$result = $this->db->query($sql);
if (! $result)
{
@@ -1447,19 +1458,26 @@ abstract class CommonObject
$sql = "SELECT MIN(te.".$fieldid.")";
$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
- if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+ else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+ else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+ if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
- if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2 && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id;
+ if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
+ if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
if (! empty($filter))
{
if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND "; // For backward compatibility
$sql.=$filter;
}
if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
- if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element, 1).')';
+ else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+ if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+ if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
+ if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+ if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+ //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql." ";
// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
- //print $sql." ";
$result = $this->db->query($sql);
if (! $result)
{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 085b9874aeb..e69aa485736 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5281,7 +5281,11 @@ class Form
if ($objecttmp->ismultientitymanaged == 2)
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE t.entity IN (".getEntity($objecttmp->table_element).")";
- if ($objecttmp->ismultientitymanaged == 1 && ! empty($user->societe_id)) $sql.= " AND t.fk_soc = ".$user->societe_id;
+ if ($objecttmp->ismultientitymanaged == 1 && ! empty($user->societe_id))
+ {
+ if ($objecttmp->element == 'societe') $sql.= " AND t.rowid = ".$user->societe_id;
+ else $sql.= " AND t.fk_soc = ".$user->societe_id;
+ }
if ($searchkey != '') $sql.=natural_search(explode(',',$fieldstoshow), $searchkey);
if ($objecttmp->ismultientitymanaged == 2)
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND t.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ea71f3e1100..b0b67b2fb8d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -37,6 +37,7 @@
include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
+
/**
* Function to return value of a static property when class
* name is dynamically defined (not hard coded).
@@ -595,30 +596,34 @@ function GETPOST($paramname, $check='none', $method=0, $filter=NULL, $options=NU
/**
* Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
- * This prefix is unique for instance and avoid conflict between multi-instances,
- * even when having two instances with one root dir or two instances in virtual servers.
+ * This prefix is valid in a web context only and is unique for instance and avoid conflict
+ * between multi-instances, even when having two instances with one root dir or two instances
+ * in virtual servers.
*
- * @param string $mode '' (prefix for session name) or 'email' (prefix for email id)
- * @return string A calculated prefix
+ * @param string $mode '' (prefix for session name) or 'email' (prefix for email id)
+ * @return string A calculated prefix
*/
-function dol_getprefix($mode='')
+if (! function_exists('dol_getprefix'))
{
- global $conf;
-
- // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
- if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
+ function dol_getprefix($mode='')
{
- if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
- else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
- }
+ global $conf;
- if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
- {
- return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
- // Use this for a "clear" cookie name
- //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+ // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
+ if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
+ {
+ if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+ else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
+ }
+
+ if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
+ {
+ return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+ // Use this for a "readable" cookie name
+ //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+ }
+ else return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
}
- else return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
}
/**
@@ -6568,7 +6573,7 @@ function dol_getmypid()
/**
* Generate natural SQL search string for a criteria (this criteria can be tested on one or several fields)
*
- * @param string|string[] $fields String or array of strings, filled with the name of all fields in the SQL query we must check (combined with a OR)
+ * @param string|string[] $fields String or array of strings, filled with the name of all fields in the SQL query we must check (combined with a OR). Example: array("p.field1","p.field2")
* @param string $value The value to look for.
* If param $mode is 0, can contains several keywords separated with a space or |
* like "keyword1 keyword2" = We want record field like keyword1 AND field like keyword2
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index cf37b749b5b..fa624a118f8 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -355,14 +355,14 @@ function restrictedArea($user, $features, $objectid=0, $tableandshare='', $featu
* Check access by user to object.
* This function is also called by restrictedArea
*
- * @param User $user User to check
- * @param array $featuresarray Features/modules to check. Example: ('user','service','member','project','task',...)
- * @param int $objectid Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
- * @param string $tableandshare 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
- * @param string $feature2 Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
- * @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
- * @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional)
- * @return bool True if user has access, False otherwise
+ * @param User $user User to check
+ * @param array $featuresarray Features/modules to check. Example: ('user','service','member','project','task',...)
+ * @param int|string $objectid Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
+ * @param string $tableandshare 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
+ * @param string $feature2 Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
+ * @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
+ * @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional)
+ * @return bool True if user has access, False otherwise
* @see restrictedArea
*/
function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
@@ -379,16 +379,16 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
$sql='';
// For backward compatibility
- if ($feature == 'member') $feature='adherent';
+ if ($feature == 'member') $feature='adherent';
if ($feature == 'project') $feature='projet';
- if ($feature == 'task') $feature='projet_task';
+ if ($feature == 'task') $feature='projet_task';
$check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company)
$checksoc = array('societe'); // Test for societe object
$checkother = array('contact','agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
$checkproject = array('projet','project'); // Test for project object
$checktask = array('projet_task');
- $nocheck = array('barcode','stock','fournisseur'); // No test
+ $nocheck = array('barcode','stock','fournisseur','don'); // No test
$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
// If dbtablename not defined, we use same name for table than module name
@@ -401,9 +401,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
// Check permission for object with entity
if (in_array($feature,$check))
{
- $sql = "SELECT dbt.".$dbt_select;
+ $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
{
$sql.= " AND dbt.entity IS NOT NULL";
@@ -423,10 +423,10 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
// If internal user: Check permission for internal users that are restricted on their objects
else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
{
- $sql = "SELECT sc.fk_soc";
+ $sql = "SELECT COUNT(sc.fk_soc) as nb";
$sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
- $sql.= " WHERE sc.fk_soc = ".$objectid;
+ $sql.= " WHERE sc.fk_soc IN (".$objectid.")";
$sql.= " AND sc.fk_user = ".$user->id;
$sql.= " AND sc.fk_soc = s.rowid";
$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
@@ -434,9 +434,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
// If multicompany and internal users with all permissions, check user is in correct entity
else if (! empty($conf->multicompany->enabled))
{
- $sql = "SELECT s.rowid";
+ $sql = "SELECT COUNT(s.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= " WHERE s.rowid = ".$objectid;
+ $sql.= " WHERE s.rowid IN (".$objectid.")";
$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
}
}
@@ -445,27 +445,27 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
// If external user: Check permission for external users
if ($user->societe_id > 0)
{
- $sql = "SELECT dbt.".$dbt_select;
+ $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
$sql.= " AND dbt.fk_soc = ".$user->societe_id;
}
// If internal user: Check permission for internal users that are restricted on their objects
else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
{
- $sql = "SELECT dbt.".$dbt_select;
+ $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
}
// If multicompany and internal users with all permissions, check user is in correct entity
else if (! empty($conf->multicompany->enabled))
{
- $sql = "SELECT dbt.".$dbt_select;
+ $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
}
}
@@ -481,9 +481,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
}
else
{
- $sql = "SELECT dbt.".$dbt_select;
+ $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
}
}
@@ -502,9 +502,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
}
else
{
- $sql = "SELECT dbt.".$dbt_select;
+ $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
}
}
@@ -514,20 +514,20 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
if ($user->societe_id > 0)
{
if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
- $sql = "SELECT dbt.".$dbt_keyfield;
+ $sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
- $sql.= " WHERE dbt.rowid = ".$objectid;
+ $sql.= " WHERE dbt.rowid IN (".$objectid.")";
$sql.= " AND dbt.".$dbt_keyfield." = ".$user->societe_id;
}
// If internal user: Check permission for internal users that are restricted on their objects
else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
{
if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
- $sql = "SELECT sc.fk_soc";
+ $sql = "SELECT COUNT(sc.fk_soc) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
$sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
$sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
@@ -536,20 +536,20 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh
// If multicompany and internal users with all permissions, check user is in correct entity
else if (! empty($conf->multicompany->enabled))
{
- $sql = "SELECT dbt.".$dbt_select;
+ $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
- $sql.= " WHERE dbt.".$dbt_select." = ".$objectid;
+ $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
}
}
- //print "sql=".$sql." ";
if ($sql)
{
$resql=$db->query($sql);
if ($resql)
{
- if ($db->num_rows($resql) == 0) return false;
+ $obj = $db->fetch_object($resql);
+ if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
}
else
{
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 7d305ded7d4..fab2a15b674 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -126,179 +126,182 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod
* @param Societe $mysoc Company object
* @return void
*/
-function dol_loginfunction($langs,$conf,$mysoc)
+if (! function_exists('dol_loginfunction'))
{
- global $dolibarr_main_demo,$db;
- global $smartphone,$hookmanager;
-
- // Instantiate hooks of thirdparty module only if not already define
- $hookmanager->initHooks(array('mainloginpage'));
-
- $langs->load("main");
- $langs->load("other");
- $langs->load("help");
- $langs->load("admin");
-
- $main_authentication=$conf->file->main_authentication;
- $session_name=session_name();
-
- $dol_url_root = DOL_URL_ROOT;
-
- // Title
- $appli=constant('DOL_APPLICATION_TITLE');
- $title=$appli.' '.constant('DOL_VERSION');
- if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
- $titletruedolibarrversion=constant('DOL_VERSION'); // $title used by login template after the @ to inform of true Dolibarr version
-
- // Note: $conf->css looks like '/theme/eldy/style.css.php'
- $conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
- $themepath=dol_buildpath($conf->css,1);
- if (! empty($conf->modules_parts['theme'])) // Using this feature slow down application
+ function dol_loginfunction($langs,$conf,$mysoc)
{
- foreach($conf->modules_parts['theme'] as $reldir)
+ global $dolibarr_main_demo,$db;
+ global $smartphone,$hookmanager;
+
+ $langs->loadLangs(array("main","other","help","admin"));
+
+ // Instantiate hooks of thirdparty module only if not already define
+ $hookmanager->initHooks(array('mainloginpage'));
+
+ $main_authentication=$conf->file->main_authentication;
+
+ $session_name=session_name(); // Get current session name
+
+ $dol_url_root = DOL_URL_ROOT;
+
+ // Title
+ $appli=constant('DOL_APPLICATION_TITLE');
+ $title=$appli.' '.constant('DOL_VERSION');
+ if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
+ $titletruedolibarrversion=constant('DOL_VERSION'); // $title used by login template after the @ to inform of true Dolibarr version
+
+ // Note: $conf->css looks like '/theme/eldy/style.css.php'
+ /*
+ $conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+ $themepath=dol_buildpath($conf->css,1);
+ if (! empty($conf->modules_parts['theme'])) // Using this feature slow down application
{
- if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+ foreach($conf->modules_parts['theme'] as $reldir)
{
- $themepath=dol_buildpath($reldir.$conf->css, 1);
- break;
+ if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+ {
+ $themepath=dol_buildpath($reldir.$conf->css, 1);
+ break;
+ }
}
}
- }
- $conf_css = $themepath."?lang=".$langs->defaultlang;
+ $conf_css = $themepath."?lang=".$langs->defaultlang;
+ */
- // Select templates dir
- if (! empty($conf->modules_parts['tpl'])) // Using this feature slow down application
- {
- $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
- foreach($dirtpls as $reldir)
+ // Select templates dir
+ if (! empty($conf->modules_parts['tpl'])) // Using this feature slow down application
{
- $tmp=dol_buildpath($reldir.'login.tpl.php');
- if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+ $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl/'));
+ foreach($dirtpls as $reldir)
+ {
+ $tmp=dol_buildpath($reldir.'login.tpl.php');
+ if (file_exists($tmp)) { $template_dir=preg_replace('/login\.tpl\.php$/','',$tmp); break; }
+ }
}
- }
- else
- {
- $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
- }
-
- // Set cookie for timeout management
- $prefix=dol_getprefix();
- $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
- if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
-
- if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
- else unset($_SESSION["urlfrom"]);
-
- if (! GETPOST("username",'alpha')) $focus_element='username';
- else $focus_element='password';
-
- $demologin='';
- $demopassword='';
- if (! empty($dolibarr_main_demo))
- {
- $tab=explode(',',$dolibarr_main_demo);
- $demologin=$tab[0];
- $demopassword=$tab[1];
- }
-
- // Execute hook getLoginPageOptions (for table)
- $parameters=array('entity' => GETPOST('entity','int'));
- $reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
- if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
- $morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
- } else {
- $morelogincontent = $hookmanager->resPrint;
- }
-
- // Execute hook getLoginPageExtraOptions (eg for js)
- $parameters=array('entity' => GETPOST('entity','int'));
- $reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
- $moreloginextracontent = $hookmanager->resPrint;
-
- // Login
- $login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
- $password = $demopassword;
-
- // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
- $width=0;
- $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
-
- if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
- {
- $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
- }
- elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
- {
- $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
- $width=128;
- }
- elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
- {
- $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
- }
- elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
- {
- $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
- }
-
- // Security graphical code
- $captcha=0;
- $captcha_refresh='';
- if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
- {
- $captcha=1;
- $captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
- }
-
- // Extra link
- $forgetpasslink=0;
- $helpcenterlink=0;
- if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
- {
- if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
+ else
{
- $forgetpasslink=1;
+ $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
}
- if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+ // Set cookie for timeout management
+ $prefix=dol_getprefix('');
+ $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
+ if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
+
+ if (GETPOST('urlfrom','alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom','alpha');
+ else unset($_SESSION["urlfrom"]);
+
+ if (! GETPOST("username",'alpha')) $focus_element='username';
+ else $focus_element='password';
+
+ $demologin='';
+ $demopassword='';
+ if (! empty($dolibarr_main_demo))
{
- $helpcenterlink=1;
+ $tab=explode(',',$dolibarr_main_demo);
+ $demologin=$tab[0];
+ $demopassword=$tab[1];
}
+
+ // Execute hook getLoginPageOptions (for table)
+ $parameters=array('entity' => GETPOST('entity','int'));
+ $reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
+ if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
+ $morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
+ } else {
+ $morelogincontent = $hookmanager->resPrint;
+ }
+
+ // Execute hook getLoginPageExtraOptions (eg for js)
+ $parameters=array('entity' => GETPOST('entity','int'));
+ $reshook = $hookmanager->executeHooks('getLoginPageExtraOptions',$parameters); // Note that $action and $object may have been modified by some hooks.
+ $moreloginextracontent = $hookmanager->resPrint;
+
+ // Login
+ $login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin));
+ $password = $demopassword;
+
+ // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
+ $width=0;
+ $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
+
+ if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+ {
+ $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_small);
+ }
+ elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+ {
+ $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($mysoc->logo);
+ $width=128;
+ }
+ elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'))
+ {
+ $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png';
+ }
+ elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
+ {
+ $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+ }
+
+ // Security graphical code
+ $captcha=0;
+ $captcha_refresh='';
+ if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+ {
+ $captcha=1;
+ $captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"');
+ }
+
+ // Extra link
+ $forgetpasslink=0;
+ $helpcenterlink=0;
+ if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+ {
+ if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
+ {
+ $forgetpasslink=1;
+ }
+
+ if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
+ {
+ $helpcenterlink=1;
+ }
+ }
+
+ // Home message
+ $main_home='';
+ if (! empty($conf->global->MAIN_HOME))
+ {
+ $substitutionarray=getCommonSubstitutionArray($langs);
+ complete_substitutions_array($substitutionarray, $langs);
+ $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+
+ $main_home=dol_htmlcleanlastbr($texttoshow);
+ }
+
+ // Google AD
+ $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
+
+ // Set jquery theme
+ $dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
+ $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
+ if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
+ $jquerytheme = 'smoothness';
+ if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+
+ // Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
+ $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
+ $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
+ $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
+ $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
+ $dol_use_jmobile=GETPOST('dol_use_jmobile','int');
+
+ // Include login page template
+ include $template_dir.'login.tpl.php';
+
+
+ $_SESSION["dol_loginmesg"] = '';
}
-
- // Home message
- $main_home='';
- if (! empty($conf->global->MAIN_HOME))
- {
- $substitutionarray=getCommonSubstitutionArray($langs);
- complete_substitutions_array($substitutionarray, $langs);
- $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
-
- $main_home=dol_htmlcleanlastbr($texttoshow);
- }
-
- // Google AD
- $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
-
- // Set jquery theme
- $dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
- $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
- if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
- $jquerytheme = 'smoothness';
- if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-
- // Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
- $dol_hide_topmenu=GETPOST('dol_hide_topmenu','int');
- $dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int');
- $dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int');
- $dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int');
- $dol_use_jmobile=GETPOST('dol_use_jmobile','int');
-
- // Include login page template
- include $template_dir.'login.tpl.php';
-
-
- $_SESSION["dol_loginmesg"] = '';
}
/**
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 9dc1b2c3863..197e050f48a 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -368,6 +368,238 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
$tmp = preg_replace('/'.preg_quote($regs[0][$key],'/').'/i', 'background'.$regs[1][$key].'url("'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'")', $tmp);
}
}
-
}
+
+
+/**
+ * Save content of a page on disk
+ *
+ * @param string $filealias Full path of filename to generate
+ * @param Website $object Object website
+ * @param WebsitePage $objectpage Object websitepage
+ * @return boolean True if OK
+ */
+function dolSavePageAlias($filealias, $object, $objectpage)
+{
+ global $conf;
+
+ // Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
+ dol_syslog("We regenerate the alias page filealias=".$filealias);
+
+ $aliascontent = 'id.'.tpl.php\'; ';
+ $aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+ $aliascontent.= '?>'."\n";
+ $result = file_put_contents($filealias, $aliascontent);
+ if (! empty($conf->global->MAIN_UMASK))
+ @chmod($filealias, octdec($conf->global->MAIN_UMASK));
+
+ return ($result?true:false);
+}
+
+
+/**
+ * Save content of a page on disk
+ *
+ * @param string $filetpl Full path of filename to generate
+ * @param Website $object Object website
+ * @param WebsitePage $objectpage Object websitepage
+ * @return boolean True if OK
+ */
+function dolSavePageContent($filetpl, $object, $objectpage)
+{
+ global $conf;
+
+ // Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
+ dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
+
+ dol_delete_file($filetpl);
+
+ $shortlangcode = '';
+ if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang); // en_US or en-US -> en
+
+ $tplcontent ='';
+ $tplcontent.= "\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= 'ref.'/htmlheader.html"); ?>'."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= $objectpage->htmlheader."\n";
+ $tplcontent.= ''."\n";
+
+ $tplcontent.= ''."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= $objectpage->content."\n";
+ $tplcontent.= ''."\n";
+ $tplcontent.= '