| ';
- /*
- * Linked object block
- */
+ /*
+ * Linked object block
+ */
$somethingshown=$object->showLinkedObjectBlock();
print ' | ';
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index f4864c2635e..b612f8bcacc 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -54,14 +54,17 @@ class DolCookie
/**
- * Encrypt en create the cookie
+ * Encrypt en create the cookie
+ *
+ * @return void
*/
function cryptCookie()
{
if (!empty($this->myKey))
{
$valuecrypt = base64_encode($this->myValue);
- for ($f=0 ; $f<=dol_strlen($valuecrypt)-1; $f++)
+ $max=dol_strlen($valuecrypt)-1;
+ for ($f=0 ; $f <= $max; $f++)
{
$this->cookie .= intval(ord($valuecrypt[$f]))*$this->myKey."|";
}
@@ -75,7 +78,9 @@ class DolCookie
}
/**
- * Decrypt the cookie
+ * Decrypt the cookie
+ *
+ * @return void
*/
function decryptCookie()
{
@@ -98,14 +103,15 @@ class DolCookie
}
/**
- * Set and create the cookie
+ * Set and create the cookie
*
- * @param string $cookie Cookie name
- * @param string $value Cookie value
- * @param string $expire Expiration
- * @param string $path Path of cookie
- * @param string $domaine Domain name
- * @param int $secure 0 or 1
+ * @param string $cookie Cookie name
+ * @param string $value Cookie value
+ * @param string $expire Expiration
+ * @param string $path Path of cookie
+ * @param string $domaine Domain name
+ * @param int $secure 0 or 1
+ * @return void
*/
function _setCookie($cookie, $value, $expire=0, $path="/", $domain="", $secure=0)
{
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 433be9ace59..d54bf45643b 100755
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -30,7 +30,8 @@
/**
* Encode a string for vCard
*
- * @param string String to encode
+ * @param string $string String to encode
+ * @return string String encoded
*/
function encode($string)
{
@@ -42,10 +43,11 @@ function encode($string)
* Taken from php documentation comments
* No more used
*
- * @param input String
- * @param line_max Max length of lines
+ * @param string $input String
+ * @param int $line_max Max length of lines
+ * @return string Encoded string
*/
-function dol_quoted_printable_encode($input, $line_max = 76)
+function dol_quoted_printable_encode($input, $line_max=76)
{
$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
$lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
@@ -53,7 +55,7 @@ function dol_quoted_printable_encode($input, $line_max = 76)
$linebreak = "=0D=0A";
$escape = "=";
$output = "";
-
+
$num = count($lines);
for ($j = 0; $j < $num; $j++)
{
@@ -98,10 +100,12 @@ class vCard
/**
* mise en forme du numero de telephone
*
- * @param number numero de telephone
- * @param type
+ * @param int $number numero de telephone
+ * @param string $type Type
+ * @return void
*/
- function setPhoneNumber($number, $type="") {
+ function setPhoneNumber($number, $type="")
+ {
// type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
$key = "TEL";
if ($type!="") $key .= ";".$type;
@@ -113,32 +117,38 @@ class vCard
* mise en forme de la photo
* warning NON TESTE !
*
- * @param type
- * @param photo
- */
- function setPhoto($type, $photo) { // $type = "GIF" | "JPEG"
+ * @param string $type Type
+ * @param string $photo Photo
+ * @return void
+ */
+ function setPhoto($type, $photo)
+ { // $type = "GIF" | "JPEG"
$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
}
/**
* mise en forme du nom formate
*
- * @param name
+ * @param string $name Name
+ * @return void
*/
- function setFormattedName($name) {
+ function setFormattedName($name)
+ {
$this->properties["FN;CHARSET=".$this->encoding] = encode($name);
}
/**
* mise en forme du nom complet
*
- * @param family
- * @param first
- * @param additional
- * @param prefix
- * @param suffix
+ * @param string $family Family
+ * @param string $first First
+ * @param string $additional Additionnal
+ * @param string $prefix Prefix
+ * @param string $suffix Suffix
+ * @return void
*/
- function setName($family="", $first="", $additional="", $prefix="", $suffix="") {
+ function setName($family="", $first="", $additional="", $prefix="", $suffix="")
+ {
$this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
$this->filename = "$first%20$family.vcf";
if ($this->properties["FN"]=="") $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
@@ -147,32 +157,37 @@ class vCard
/**
* mise en forme de l'anniversaire
*
- * @param date
+ * @param timestamp $date Date
+ * @return void
*/
- function setBirthday($date) { // $date format is YYYY-MM-DD
+ function setBirthday($date)
+ { // $date format is YYYY-MM-DD
$this->properties["BDAY"] = $date;
}
/**
* mise en forme de l'adresse
*
- * @param postoffice
- * @param extended
- * @param street
- * @param city
- * @param region
- * @param zip
- * @param country
- * @param type
+ * @param string $postoffice Postoffice
+ * @param string $extended Extended
+ * @param string $street Street
+ * @param string $city City
+ * @param string $region Region
+ * @param string $zip Zip
+ * @param string $country Country
+ * @param string $type Type
+ * @return void
*/
- function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL") {
+ function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+ {
// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
$key = "ADR";
if ($type!="") $key.= ";$type";
$key.= ";CHARSET=".$this->encoding;
$this->properties[$key] = encode($name).";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
- if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "") {
+ if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
+ {
//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
}
}
@@ -180,14 +195,15 @@ class vCard
/**
* mise en forme du label
*
- * @param postoffice
- * @param extended
- * @param street
- * @param city
- * @param region
- * @param zip
- * @param country
- * @param type
+ * @param string $postoffice Postoffice
+ * @param string $extended Extended
+ * @param string $street Street
+ * @param string $city City
+ * @param string $region Region
+ * @param string $zip Zip
+ * @param string $country Country
+ * @param string $type Type
+ * @return void
*/
function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL") {
$label = "";
@@ -205,28 +221,34 @@ class vCard
/**
* mise en forme de l'email
*
- * @param address EMail
- * @param type Vcard type
+ * @param string $address EMail
+ * @param string $type Vcard type
+ * @return void
*/
- function setEmail($address,$type="internet,pref") {
+ function setEmail($address,$type="internet,pref")
+ {
$this->properties["EMAIL;TYPE=".$type] = $address;
}
/**
* mise en forme de la note
*
- * @param note
+ * @param string $note Note
+ * @return void
*/
- function setNote($note) {
+ function setNote($note)
+ {
$this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
}
/**
* mise en forme de la fonction
*
- * @param title
+ * @param string $title Title
+ * @return void
*/
- function setTitle($title) {
+ function setTitle($title)
+ {
$this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
}
@@ -234,9 +256,11 @@ class vCard
/**
* mise en forme de la societe
*
- * @param org
+ * @param string $org Org
+ * @return void
*/
- function setOrg($org) {
+ function setOrg($org)
+ {
$this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
}
@@ -244,9 +268,11 @@ class vCard
/**
* mise en forme du logiciel generateur
*
- * @param prodid
+ * @param string $prodid Prodid
+ * @return void
*/
- function setProdId($prodid) {
+ function setProdId($prodid)
+ {
$this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
}
@@ -254,9 +280,11 @@ class vCard
/**
* mise en forme du logiciel generateur
*
- * @param uid
+ * @param string $uid Uid
+ * @return void
*/
- function setUID($uid) {
+ function setUID($uid)
+ {
$this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
}
@@ -264,10 +292,12 @@ class vCard
/**
* mise en forme de l'url
*
- * @param url
- * @param type
+ * @param string $url URL
+ * @param string $type Type
+ * @return void
*/
- function setURL($url, $type="") {
+ function setURL($url, $type="")
+ {
// $type may be WORK | HOME
$key = "URL";
if ($type!="") $key.= ";$type";
@@ -276,12 +306,16 @@ class vCard
/**
* permet d'obtenir une vcard
+ *
+ * @return void
*/
- function getVCard() {
+ function getVCard()
+ {
$text = "BEGIN:VCARD\r\n";
//$text.= "VERSION:3.0\r\n";
$text.= "VERSION:2.1\r\n";
- foreach($this->properties as $key => $value) {
+ foreach($this->properties as $key => $value)
+ {
$text.= "$key:$value\r\n";
}
$text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
@@ -292,9 +326,13 @@ class vCard
/**
* permet d'obtenir le nom de fichier
+ *
+ * @return string Filename
*/
- function getFileName() {
+ function getFileName()
+ {
return $this->filename;
}
+
}
?>
diff --git a/htdocs/includes/modules/modDocument.class.php b/htdocs/includes/modules/modDocument.class.php
index 2b7511aa561..86167b35cfd 100644
--- a/htdocs/includes/modules/modDocument.class.php
+++ b/htdocs/includes/modules/modDocument.class.php
@@ -1,127 +1,127 @@
-
- * Copyright (C) 2005-2009 Regis Houssin
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
- * \defgroup document Module mass mailings
- * \brief Module pour gerer des generations de documents
- * \file htdocs/includes/modules/modDocument.class.php
- * \ingroup document
- * \brief Fichier de description et activation du module Generation document
- */
-
-include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
-
-
-/**
- * \class modDocument
- * \brief Classe de description et activation du module Document
- */
-
-class modDocument extends DolibarrModules
-{
-
- /**
- * \brief Constructeur. Definit les noms, constantes et boites
- * \param DB handler d'acces base
- */
- function modDocument($DB)
- {
- $this->db = $DB ;
- $this->numero = 51 ;
-
- $this->family = "technic";
- // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
- $this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "Generation de courriers/publipostages papiers";
- // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
- $this->version = 'development';
-
- $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
- $this->special = 0;
- $this->picto='email';
-
- // Data directories to create when module is enabled
- $this->dirs = array("/document/temp");
-
- // Config pages
- //$this->config_page_url = array("document.php");
-
- // Dependencies
- $this->depends = array();
- $this->requiredby = array();
- $this->conflictwith = array();
- $this->langfiles = array("orders","bills","companies");
-
- // Constantes
-
- $this->const = array();
-
- // Boites
- $this->boxes = array();
-
- // Permissions
- $this->rights = array();
- $this->rights_class = 'document';
-
- $r=0;
-
- $this->rights[$r][0] = 511;
- $this->rights[$r][1] = 'Lire les documents';
- $this->rights[$r][2] = 'r';
- $this->rights[$r][3] = 1;
- $this->rights[$r][4] = 'lire';
-
- $r++;
- $this->rights[$r][0] = 512;
- $this->rights[$r][1] = 'Supprimer les documents clients';
- $this->rights[$r][2] = 'd';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'supprimer';
- }
-
-
- /**
- * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
- * Definit egalement les repertoires de donnees a creer pour ce module.
- */
- function init()
- {
- global $conf;
-
- // Permissions
- $this->remove();
-
- $sql = array();
-
- return $this->_init($sql);
- }
-
-
- /**
- * \brief Fonction appelee lors de la desactivation d'un module.
- * Supprime de la base les constantes, boites et permissions du module.
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-}
-?>
+
+ * Copyright (C) 2005-2009 Regis Houssin
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * \defgroup document Module mass mailings
+ * \brief Module pour gerer des generations de documents
+ * \file htdocs/includes/modules/modDocument.class.php
+ * \ingroup document
+ * \brief Fichier de description et activation du module Generation document
+ */
+
+include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
+
+
+/**
+ * \class modDocument
+ * \brief Classe de description et activation du module Document
+ */
+
+class modDocument extends DolibarrModules
+{
+
+ /**
+ * \brief Constructeur. Definit les noms, constantes et boites
+ * \param DB handler d'acces base
+ */
+ function modDocument($DB)
+ {
+ $this->db = $DB ;
+ $this->numero = 51 ;
+
+ $this->family = "technic";
+ // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+ $this->name = preg_replace('/^mod/i','',get_class($this));
+ $this->description = "Generation de courriers/publipostages papiers";
+ // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+ $this->version = 'development';
+
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ $this->special = 0;
+ $this->picto='email';
+
+ // Data directories to create when module is enabled
+ $this->dirs = array("/document/temp");
+
+ // Config pages
+ //$this->config_page_url = array("document.php");
+
+ // Dependencies
+ $this->depends = array();
+ $this->requiredby = array();
+ $this->conflictwith = array();
+ $this->langfiles = array("orders","bills","companies");
+
+ // Constantes
+
+ $this->const = array();
+
+ // Boites
+ $this->boxes = array();
+
+ // Permissions
+ $this->rights = array();
+ $this->rights_class = 'document';
+
+ $r=0;
+
+ $this->rights[$r][0] = 511;
+ $this->rights[$r][1] = 'Lire les documents';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 1;
+ $this->rights[$r][4] = 'lire';
+
+ $r++;
+ $this->rights[$r][0] = 512;
+ $this->rights[$r][1] = 'Supprimer les documents clients';
+ $this->rights[$r][2] = 'd';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'supprimer';
+ }
+
+
+ /**
+ * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
+ * Definit egalement les repertoires de donnees a creer pour ce module.
+ */
+ function init()
+ {
+ global $conf;
+
+ // Permissions
+ $this->remove();
+
+ $sql = array();
+
+ return $this->_init($sql);
+ }
+
+
+ /**
+ * \brief Fonction appelee lors de la desactivation d'un module.
+ * Supprime de la base les constantes, boites et permissions du module.
+ */
+ function remove()
+ {
+ $sql = array();
+
+ return $this->_remove($sql);
+ }
+}
+?>
diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php
index aa5e08d5dfe..a312d24e2b8 100644
--- a/htdocs/includes/modules/modExpedition.class.php
+++ b/htdocs/includes/modules/modExpedition.class.php
@@ -1,227 +1,227 @@
-
- * Copyright (C) 2004-2010 Laurent Destailleur
- * Copyright (C) 2005-2011 Regis Houssin
- * Copyright (C) 2011 Juanjo Menent
- *
- * 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 2 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 .
- */
-
-/**
- * \defgroup expedition Module shipping
- * \brief Module pour gerer les expeditions de produits
- * \file htdocs/includes/modules/modExpedition.class.php
- * \ingroup expedition
- * \brief Fichier de description et activation du module Expedition
- */
-
-include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
-
-
-/**
- * \class modExpedition
- * \brief Classe de description et activation du module Expedition
- */
-class modExpedition extends DolibarrModules
-{
-
- /**
- * \brief Constructeur. Definit les noms, constantes et boites
- * \param DB handler d'acces base
- */
- function modExpedition($DB)
- {
- $this->db = $DB ;
- $this->numero = 80 ;
-
- $this->family = "crm";
- // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
- $this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "Gestion des expeditions";
-
- // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
- $this->version = 'dolibarr';
-
- $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
- $this->special = 0;
- $this->picto = "sending";
-
- // Data directories to create when module is enabled
- $this->dirs = array("/expedition/temp",
- "/expedition/sending",
- "/expedition/sending/temp",
- "/expedition/receipt",
- "/expedition/receipt/temp"
- );
-
- // Config pages
- $this->config_page_url = array("confexped.php");
-
- // Dependances
- $this->depends = array("modCommande");
- $this->requiredby = array();
-
- // Constantes
- $this->const = array();
- $r=0;
-
- $this->const[$r][0] = "EXPEDITION_ADDON_PDF";
- $this->const[$r][1] = "chaine";
- $this->const[$r][2] = "rouget";
- $this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF';
- $this->const[$r][4] = 0;
- $r++;
-
- $this->const[$r][0] = "EXPEDITION_ADDON";
- $this->const[$r][1] = "chaine";
- $this->const[$r][2] = "elevement";
- $this->const[$r][3] = 'Nom du gestionnaire du type d\'expedition';
- $this->const[$r][4] = 0;
- $r++;
-
- $this->const[$r][0] = "LIVRAISON_ADDON_PDF";
- $this->const[$r][1] = "chaine";
- $this->const[$r][2] = "typhon";
- $this->const[$r][3] = 'Nom du gestionnaire de generation des bons de reception en PDF';
- $this->const[$r][4] = 0;
- $r++;
-
- $this->const[$r][0] = "LIVRAISON_ADDON";
- $this->const[$r][1] = "chaine";
- $this->const[$r][2] = "mod_livraison_jade";
- $this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception';
- $this->const[$r][4] = 0;
- $r++;
-
- $this->const[$r][0] = "EXPEDITION_ADDON_NUMBER";
- $this->const[$r][1] = "chaine";
- $this->const[$r][2] = "mod_expedition_safor";
- $this->const[$r][3] = 'Nom du gestionnaire de numerotation des expeditions';
- $this->const[$r][4] = 0;
- $r++;
-
- // Boxes
- $this->boxes = array();
-
- // Permissions
- $this->rights = array();
- $this->rights_class = 'expedition';
- $r=0;
-
- $r++;
- $this->rights[$r][0] = 101;
- $this->rights[$r][1] = 'Lire les expeditions';
- $this->rights[$r][2] = 'r';
- $this->rights[$r][3] = 1;
- $this->rights[$r][4] = 'lire';
-
- $r++;
- $this->rights[$r][0] = 102;
- $this->rights[$r][1] = 'Creer modifier les expeditions';
- $this->rights[$r][2] = 'w';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'creer';
-
- $r++;
- $this->rights[$r][0] = 104;
- $this->rights[$r][1] = 'Valider les expeditions';
- $this->rights[$r][2] = 'd';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'valider';
-
- $r++;
- $this->rights[$r][0] = 105; // id de la permission
- $this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission
- $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
- $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
- $this->rights[$r][4] = 'shipping_advance';
- $this->rights[$r][5] = 'send';
-
- $r++;
- $this->rights[$r][0] = 109;
- $this->rights[$r][1] = 'Supprimer les expeditions';
- $this->rights[$r][2] = 'd';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'supprimer';
-
- $r++;
- $this->rights[$r][0] = 1101;
- $this->rights[$r][1] = 'Lire les bons de livraison';
- $this->rights[$r][2] = 'r';
- $this->rights[$r][3] = 1;
- $this->rights[$r][4] = 'livraison';
- $this->rights[$r][5] = 'lire';
-
- $r++;
- $this->rights[$r][0] = 1102;
- $this->rights[$r][1] = 'Creer modifier les bons de livraison';
- $this->rights[$r][2] = 'w';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'livraison';
- $this->rights[$r][5] = 'creer';
-
- $r++;
- $this->rights[$r][0] = 1104;
- $this->rights[$r][1] = 'Valider les bons de livraison';
- $this->rights[$r][2] = 'd';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'livraison';
- $this->rights[$r][5] = 'valider';
-
- $r++;
- $this->rights[$r][0] = 1109;
- $this->rights[$r][1] = 'Supprimer les bons de livraison';
- $this->rights[$r][2] = 'd';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'livraison';
- $this->rights[$r][5] = 'supprimer';
-
- }
-
-
- /**
- * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
- * Definit egalement les repertoires de donnees a creer pour ce module.
- */
- function init()
- {
- global $conf;
-
- // Permissions
- $this->remove();
-
- $sql = array();
-
- $sql = array(
- "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
- "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','shipping',".$conf->entity.")",
- "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[1][2]."' AND entity = ".$conf->entity,
- "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[1][2]."','delivery',".$conf->entity.")",
- );
-
- return $this->_init($sql);
- }
-
- /**
- * \brief Fonction appelee lors de la desactivation d'un module.
- * Supprime de la base les constantes, boites et permissions du module.
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-}
-?>
+
+ * Copyright (C) 2004-2010 Laurent Destailleur
+ * Copyright (C) 2005-2011 Regis Houssin
+ * Copyright (C) 2011 Juanjo Menent
+ *
+ * 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 2 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 .
+ */
+
+/**
+ * \defgroup expedition Module shipping
+ * \brief Module pour gerer les expeditions de produits
+ * \file htdocs/includes/modules/modExpedition.class.php
+ * \ingroup expedition
+ * \brief Fichier de description et activation du module Expedition
+ */
+
+include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
+
+
+/**
+ * \class modExpedition
+ * \brief Classe de description et activation du module Expedition
+ */
+class modExpedition extends DolibarrModules
+{
+
+ /**
+ * \brief Constructeur. Definit les noms, constantes et boites
+ * \param DB handler d'acces base
+ */
+ function modExpedition($DB)
+ {
+ $this->db = $DB ;
+ $this->numero = 80 ;
+
+ $this->family = "crm";
+ // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+ $this->name = preg_replace('/^mod/i','',get_class($this));
+ $this->description = "Gestion des expeditions";
+
+ // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+ $this->version = 'dolibarr';
+
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ $this->special = 0;
+ $this->picto = "sending";
+
+ // Data directories to create when module is enabled
+ $this->dirs = array("/expedition/temp",
+ "/expedition/sending",
+ "/expedition/sending/temp",
+ "/expedition/receipt",
+ "/expedition/receipt/temp"
+ );
+
+ // Config pages
+ $this->config_page_url = array("confexped.php");
+
+ // Dependances
+ $this->depends = array("modCommande");
+ $this->requiredby = array();
+
+ // Constantes
+ $this->const = array();
+ $r=0;
+
+ $this->const[$r][0] = "EXPEDITION_ADDON_PDF";
+ $this->const[$r][1] = "chaine";
+ $this->const[$r][2] = "rouget";
+ $this->const[$r][3] = 'Nom du gestionnaire de generation des bons expeditions en PDF';
+ $this->const[$r][4] = 0;
+ $r++;
+
+ $this->const[$r][0] = "EXPEDITION_ADDON";
+ $this->const[$r][1] = "chaine";
+ $this->const[$r][2] = "elevement";
+ $this->const[$r][3] = 'Nom du gestionnaire du type d\'expedition';
+ $this->const[$r][4] = 0;
+ $r++;
+
+ $this->const[$r][0] = "LIVRAISON_ADDON_PDF";
+ $this->const[$r][1] = "chaine";
+ $this->const[$r][2] = "typhon";
+ $this->const[$r][3] = 'Nom du gestionnaire de generation des bons de reception en PDF';
+ $this->const[$r][4] = 0;
+ $r++;
+
+ $this->const[$r][0] = "LIVRAISON_ADDON";
+ $this->const[$r][1] = "chaine";
+ $this->const[$r][2] = "mod_livraison_jade";
+ $this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception';
+ $this->const[$r][4] = 0;
+ $r++;
+
+ $this->const[$r][0] = "EXPEDITION_ADDON_NUMBER";
+ $this->const[$r][1] = "chaine";
+ $this->const[$r][2] = "mod_expedition_safor";
+ $this->const[$r][3] = 'Nom du gestionnaire de numerotation des expeditions';
+ $this->const[$r][4] = 0;
+ $r++;
+
+ // Boxes
+ $this->boxes = array();
+
+ // Permissions
+ $this->rights = array();
+ $this->rights_class = 'expedition';
+ $r=0;
+
+ $r++;
+ $this->rights[$r][0] = 101;
+ $this->rights[$r][1] = 'Lire les expeditions';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 1;
+ $this->rights[$r][4] = 'lire';
+
+ $r++;
+ $this->rights[$r][0] = 102;
+ $this->rights[$r][1] = 'Creer modifier les expeditions';
+ $this->rights[$r][2] = 'w';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'creer';
+
+ $r++;
+ $this->rights[$r][0] = 104;
+ $this->rights[$r][1] = 'Valider les expeditions';
+ $this->rights[$r][2] = 'd';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'valider';
+
+ $r++;
+ $this->rights[$r][0] = 105; // id de la permission
+ $this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission
+ $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+ $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+ $this->rights[$r][4] = 'shipping_advance';
+ $this->rights[$r][5] = 'send';
+
+ $r++;
+ $this->rights[$r][0] = 109;
+ $this->rights[$r][1] = 'Supprimer les expeditions';
+ $this->rights[$r][2] = 'd';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'supprimer';
+
+ $r++;
+ $this->rights[$r][0] = 1101;
+ $this->rights[$r][1] = 'Lire les bons de livraison';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 1;
+ $this->rights[$r][4] = 'livraison';
+ $this->rights[$r][5] = 'lire';
+
+ $r++;
+ $this->rights[$r][0] = 1102;
+ $this->rights[$r][1] = 'Creer modifier les bons de livraison';
+ $this->rights[$r][2] = 'w';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'livraison';
+ $this->rights[$r][5] = 'creer';
+
+ $r++;
+ $this->rights[$r][0] = 1104;
+ $this->rights[$r][1] = 'Valider les bons de livraison';
+ $this->rights[$r][2] = 'd';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'livraison';
+ $this->rights[$r][5] = 'valider';
+
+ $r++;
+ $this->rights[$r][0] = 1109;
+ $this->rights[$r][1] = 'Supprimer les bons de livraison';
+ $this->rights[$r][2] = 'd';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'livraison';
+ $this->rights[$r][5] = 'supprimer';
+
+ }
+
+
+ /**
+ * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
+ * Definit egalement les repertoires de donnees a creer pour ce module.
+ */
+ function init()
+ {
+ global $conf;
+
+ // Permissions
+ $this->remove();
+
+ $sql = array();
+
+ $sql = array(
+ "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
+ "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','shipping',".$conf->entity.")",
+ "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[1][2]."' AND entity = ".$conf->entity,
+ "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[1][2]."','delivery',".$conf->entity.")",
+ );
+
+ return $this->_init($sql);
+ }
+
+ /**
+ * \brief Fonction appelee lors de la desactivation d'un module.
+ * Supprime de la base les constantes, boites et permissions du module.
+ */
+ function remove()
+ {
+ $sql = array();
+
+ return $this->_remove($sql);
+ }
+}
+?>
diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/includes/modules/modFicheinter.class.php
index eb9afc6bebf..87652809052 100644
--- a/htdocs/includes/modules/modFicheinter.class.php
+++ b/htdocs/includes/modules/modFicheinter.class.php
@@ -1,183 +1,183 @@
-
- * Copyright (C) 2004-2009 Laurent Destailleur
- * Copyright (C) 2004 Sebastien Di Cintio
- * Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2005-2009 Regis Houssin
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/**
- * \defgroup ficheinter Module intervention cards
- * \brief Module to manage intervention cards
- * \file htdocs/includes/modules/modFicheinter.class.php
- * \ingroup ficheinter
- * \brief Fichier de description et activation du module Ficheinter
- */
-
-include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
-
-
-/**
- * \class modFicheinter
- * \brief Classe de description et activation du module Ficheinter
- */
-class modFicheinter extends DolibarrModules
-{
-
- /**
- * \brief Constructeur. Definit les noms, constantes et boites
- * \param DB Database access handler
- */
- function modFicheinter($DB)
- {
- global $conf;
-
- $this->db = $DB ;
- $this->numero = 70 ;
-
- $this->family = "crm";
- // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
- $this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "Gestion des fiches d'intervention";
-
- // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
- $this->version = 'dolibarr';
-
- $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
- $this->special = 0;
- $this->picto = "intervention";
-
- // Data directories to create when module is enabled
- $this->dirs = array("/ficheinter/temp");
-
- // Dependencies
- $this->depends = array("modSociete");
- $this->requiredby = array();
- $this->conflictwith = array();
- $this->langfiles = array("bills","companies","interventions");
-
- // Config pages
- $this->config_page_url = array("fichinter.php");
-
- // Constantes
- $this->const = array();
- $r=0;
-
- $this->const[$r][0] = "FICHEINTER_ADDON_PDF";
- $this->const[$r][1] = "chaine";
- $this->const[$r][2] = "soleil";
- $r++;
-
- $this->const[$r][0] = "FICHEINTER_ADDON";
- $this->const[$r][1] = "chaine";
- $this->const[$r][2] = "pacific";
- $r++;
-
- // Boites
- $this->boxes = array();
-
- // Permissions
- $this->rights = array();
- $this->rights_class = 'ficheinter';
- $r=0;
-
- $r++;
- $this->rights[$r][0] = 61;
- $this->rights[$r][1] = 'Lire les fiches d\'intervention';
- $this->rights[$r][2] = 'r';
- $this->rights[$r][3] = 1;
- $this->rights[$r][4] = 'lire';
-
- $r++;
- $this->rights[$r][0] = 62;
- $this->rights[$r][1] = 'Creer/modifier les fiches d\'intervention';
- $this->rights[$r][2] = 'w';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'creer';
-
- $r++;
- $this->rights[$r][0] = 64;
- $this->rights[$r][1] = 'Supprimer les fiches d\'intervention';
- $this->rights[$r][2] = 'd';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'supprimer';
-
- $r++;
- $this->rights[$r][0] = 67;
- $this->rights[$r][1] = 'Exporter les fiches interventions';
- $this->rights[$r][2] = 'r';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'export';
-
- $r++;
- $this->rights[$r][0] = 68;
- $this->rights[$r][1] = 'Envoyer les fiches d\'intervention par courriel';
- $this->rights[$r][2] = 'r';
- $this->rights[$r][3] = 0;
- $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
- $this->rights[$r][5] = 'send';
-
- //Exports
- //--------
- $r=1;
-
- $this->export_code[$r]=$this->rights_class.'_'.$r;
- $this->export_label[$r]='InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
- $this->export_permission[$r]=array(array("ficheinter","export"));
- $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InterId",'f.ref'=>"InterRef",'f.datec'=>"InterDateCreation",'f.duree'=>"InterDuration",'f.fk_statut'=>'InterStatus','f.description'=>"InterNote",'fd.rowid'=>'InterLineId','fd.date'=>"InterLineDate",'fd.duree'=>"InterLineDuration",'fd.description'=>"InterLineDesc");
- $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"intervention",'f.ref'=>"intervention",'f.datec'=>"intervention",'f.duree'=>"intervention",'f.fk_statut'=>"intervention",'f.description'=>"intervention",'fd.rowid'=>"inter_line",'fd.date'=>"inter_line",'fd.duree'=>'inter_line','fd.description'=>'inter_line');
-
- $this->export_sql_start[$r]='SELECT DISTINCT ';
- $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'fichinter as f, '.MAIN_DB_PREFIX.'fichinterdet as fd, '.MAIN_DB_PREFIX.'societe as s)';
- $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_fichinter';
- $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
- $r++;
-
- }
-
-
- /**
- * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
- * Definit egalement les repertoires de donnees a creer pour ce module.
- */
- function init()
- {
- global $conf;
-
- // Permissions
- $this->remove();
-
- $sql = array(
- "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
- "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','ficheinter',".$conf->entity.")",
- );
-
- return $this->_init($sql);
- }
-
- /**
- * \brief Fonction appelee lors de la desactivation d'un module.
- * Supprime de la base les constantes, boites et permissions du module.
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-}
-?>
+
+ * Copyright (C) 2004-2009 Laurent Destailleur
+ * Copyright (C) 2004 Sebastien Di Cintio
+ * Copyright (C) 2004 Benoit Mortier
+ * Copyright (C) 2005-2009 Regis Houssin
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * \defgroup ficheinter Module intervention cards
+ * \brief Module to manage intervention cards
+ * \file htdocs/includes/modules/modFicheinter.class.php
+ * \ingroup ficheinter
+ * \brief Fichier de description et activation du module Ficheinter
+ */
+
+include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
+
+
+/**
+ * \class modFicheinter
+ * \brief Classe de description et activation du module Ficheinter
+ */
+class modFicheinter extends DolibarrModules
+{
+
+ /**
+ * \brief Constructeur. Definit les noms, constantes et boites
+ * \param DB Database access handler
+ */
+ function modFicheinter($DB)
+ {
+ global $conf;
+
+ $this->db = $DB ;
+ $this->numero = 70 ;
+
+ $this->family = "crm";
+ // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+ $this->name = preg_replace('/^mod/i','',get_class($this));
+ $this->description = "Gestion des fiches d'intervention";
+
+ // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+ $this->version = 'dolibarr';
+
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ $this->special = 0;
+ $this->picto = "intervention";
+
+ // Data directories to create when module is enabled
+ $this->dirs = array("/ficheinter/temp");
+
+ // Dependencies
+ $this->depends = array("modSociete");
+ $this->requiredby = array();
+ $this->conflictwith = array();
+ $this->langfiles = array("bills","companies","interventions");
+
+ // Config pages
+ $this->config_page_url = array("fichinter.php");
+
+ // Constantes
+ $this->const = array();
+ $r=0;
+
+ $this->const[$r][0] = "FICHEINTER_ADDON_PDF";
+ $this->const[$r][1] = "chaine";
+ $this->const[$r][2] = "soleil";
+ $r++;
+
+ $this->const[$r][0] = "FICHEINTER_ADDON";
+ $this->const[$r][1] = "chaine";
+ $this->const[$r][2] = "pacific";
+ $r++;
+
+ // Boites
+ $this->boxes = array();
+
+ // Permissions
+ $this->rights = array();
+ $this->rights_class = 'ficheinter';
+ $r=0;
+
+ $r++;
+ $this->rights[$r][0] = 61;
+ $this->rights[$r][1] = 'Lire les fiches d\'intervention';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 1;
+ $this->rights[$r][4] = 'lire';
+
+ $r++;
+ $this->rights[$r][0] = 62;
+ $this->rights[$r][1] = 'Creer/modifier les fiches d\'intervention';
+ $this->rights[$r][2] = 'w';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'creer';
+
+ $r++;
+ $this->rights[$r][0] = 64;
+ $this->rights[$r][1] = 'Supprimer les fiches d\'intervention';
+ $this->rights[$r][2] = 'd';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'supprimer';
+
+ $r++;
+ $this->rights[$r][0] = 67;
+ $this->rights[$r][1] = 'Exporter les fiches interventions';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'export';
+
+ $r++;
+ $this->rights[$r][0] = 68;
+ $this->rights[$r][1] = 'Envoyer les fiches d\'intervention par courriel';
+ $this->rights[$r][2] = 'r';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+ $this->rights[$r][5] = 'send';
+
+ //Exports
+ //--------
+ $r=1;
+
+ $this->export_code[$r]=$this->rights_class.'_'.$r;
+ $this->export_label[$r]='InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+ $this->export_permission[$r]=array(array("ficheinter","export"));
+ $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InterId",'f.ref'=>"InterRef",'f.datec'=>"InterDateCreation",'f.duree'=>"InterDuration",'f.fk_statut'=>'InterStatus','f.description'=>"InterNote",'fd.rowid'=>'InterLineId','fd.date'=>"InterLineDate",'fd.duree'=>"InterLineDuration",'fd.description'=>"InterLineDesc");
+ $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"intervention",'f.ref'=>"intervention",'f.datec'=>"intervention",'f.duree'=>"intervention",'f.fk_statut'=>"intervention",'f.description'=>"intervention",'fd.rowid'=>"inter_line",'fd.date'=>"inter_line",'fd.duree'=>'inter_line','fd.description'=>'inter_line');
+
+ $this->export_sql_start[$r]='SELECT DISTINCT ';
+ $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'fichinter as f, '.MAIN_DB_PREFIX.'fichinterdet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+ $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_fichinter';
+ $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+ $r++;
+
+ }
+
+
+ /**
+ * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
+ * Definit egalement les repertoires de donnees a creer pour ce module.
+ */
+ function init()
+ {
+ global $conf;
+
+ // Permissions
+ $this->remove();
+
+ $sql = array(
+ "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity,
+ "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','ficheinter',".$conf->entity.")",
+ );
+
+ return $this->_init($sql);
+ }
+
+ /**
+ * \brief Fonction appelee lors de la desactivation d'un module.
+ * Supprime de la base les constantes, boites et permissions du module.
+ */
+ function remove()
+ {
+ $sql = array();
+
+ return $this->_remove($sql);
+ }
+}
+?>
diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/includes/modules/modLabel.class.php
index bcc063bfd43..b00b88ae3b2 100644
--- a/htdocs/includes/modules/modLabel.class.php
+++ b/htdocs/includes/modules/modLabel.class.php
@@ -1,119 +1,119 @@
-
- * Copyright (C) 2008 Laurent Destailleur
- *
- * 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 2 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 .
- */
-
-/**
- * \defgroup label Module labels
- * \brief Module pour gerer les formats d'impression des etiquettes
- * \file htdocs/includes/modules/modLabel.class.php
- * \ingroup other
- * \brief Fichier de description et activation du module Label
- */
-
-include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
-
-
-/**
- * \class modLabel
- * \brief Classe de description et activation du module Label
- */
-
-class modLabel extends DolibarrModules
-{
-
- /**
- * \brief Constructeur. Definit les noms, constantes et boites
- * \param DB handler d'acces base
- */
- function modLabel($DB)
- {
- $this->db = $DB ;
- $this->numero = 60 ;
-
- $this->family = "other";
- // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
- $this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "Gestion des etiquettes";
- $this->version = 'development'; // 'development' or 'experimental' or 'dolibarr' or version
- $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
- $this->special = 2;
- $this->picto='label';
-
- // Data directories to create when module is enabled
- $this->dirs = array("/label/temp");
-
- // Dependancies
- $this->depends = array();
- $this->requiredby = array();
-
- // Config pages
- $this->config_page_url = array("label.php");
-
- // Constants
- $this->const = array();
-
- // Boxes
- $this->boxes = array();
-
- // Permissions
- $this->rights = array();
- $this->rights_class = 'label';
-
- $this->rights[1][0] = 601; // id de la permission
- $this->rights[1][1] = 'Lire les etiquettes'; // libelle de la permission
- $this->rights[1][3] = 1; // La permission est-elle une permission par defaut
- $this->rights[1][4] = 'lire';
-
- $this->rights[2][0] = 602; // id de la permission
- $this->rights[2][1] = 'Creer/modifier les etiquettes'; // libelle de la permission
- $this->rights[2][3] = 0; // La permission est-elle une permission par defaut
- $this->rights[2][4] = 'creer';
-
- $this->rights[4][0] = 609; // id de la permission
- $this->rights[4][1] = 'Supprimer les etiquettes'; // libelle de la permission
- $this->rights[4][3] = 0; // La permission est-elle une permission par defaut
- $this->rights[4][4] = 'supprimer';
-
- }
-
-
- /**
- * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
- * Definit egalement les repertoires de donnees a creer pour ce module.
- */
- function init()
- {
- // Permissions
- $this->remove();
-
- $sql = array();
-
- return $this->_init($sql);
- }
-
- /**
- * \brief Fonction appelee lors de la desactivation d'un module.
- * Supprime de la base les constantes, boites et permissions du module.
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-}
-?>
+
+ * Copyright (C) 2008 Laurent Destailleur
+ *
+ * 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 2 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 .
+ */
+
+/**
+ * \defgroup label Module labels
+ * \brief Module pour gerer les formats d'impression des etiquettes
+ * \file htdocs/includes/modules/modLabel.class.php
+ * \ingroup other
+ * \brief Fichier de description et activation du module Label
+ */
+
+include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
+
+
+/**
+ * \class modLabel
+ * \brief Classe de description et activation du module Label
+ */
+
+class modLabel extends DolibarrModules
+{
+
+ /**
+ * \brief Constructeur. Definit les noms, constantes et boites
+ * \param DB handler d'acces base
+ */
+ function modLabel($DB)
+ {
+ $this->db = $DB ;
+ $this->numero = 60 ;
+
+ $this->family = "other";
+ // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+ $this->name = preg_replace('/^mod/i','',get_class($this));
+ $this->description = "Gestion des etiquettes";
+ $this->version = 'development'; // 'development' or 'experimental' or 'dolibarr' or version
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ $this->special = 2;
+ $this->picto='label';
+
+ // Data directories to create when module is enabled
+ $this->dirs = array("/label/temp");
+
+ // Dependancies
+ $this->depends = array();
+ $this->requiredby = array();
+
+ // Config pages
+ $this->config_page_url = array("label.php");
+
+ // Constants
+ $this->const = array();
+
+ // Boxes
+ $this->boxes = array();
+
+ // Permissions
+ $this->rights = array();
+ $this->rights_class = 'label';
+
+ $this->rights[1][0] = 601; // id de la permission
+ $this->rights[1][1] = 'Lire les etiquettes'; // libelle de la permission
+ $this->rights[1][3] = 1; // La permission est-elle une permission par defaut
+ $this->rights[1][4] = 'lire';
+
+ $this->rights[2][0] = 602; // id de la permission
+ $this->rights[2][1] = 'Creer/modifier les etiquettes'; // libelle de la permission
+ $this->rights[2][3] = 0; // La permission est-elle une permission par defaut
+ $this->rights[2][4] = 'creer';
+
+ $this->rights[4][0] = 609; // id de la permission
+ $this->rights[4][1] = 'Supprimer les etiquettes'; // libelle de la permission
+ $this->rights[4][3] = 0; // La permission est-elle une permission par defaut
+ $this->rights[4][4] = 'supprimer';
+
+ }
+
+
+ /**
+ * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
+ * Definit egalement les repertoires de donnees a creer pour ce module.
+ */
+ function init()
+ {
+ // Permissions
+ $this->remove();
+
+ $sql = array();
+
+ return $this->_init($sql);
+ }
+
+ /**
+ * \brief Fonction appelee lors de la desactivation d'un module.
+ * Supprime de la base les constantes, boites et permissions du module.
+ */
+ function remove()
+ {
+ $sql = array();
+
+ return $this->_remove($sql);
+ }
+}
+?>
diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/includes/modules/modMailing.class.php
index 5d9d88cdcf2..5f21e1354e0 100644
--- a/htdocs/includes/modules/modMailing.class.php
+++ b/htdocs/includes/modules/modMailing.class.php
@@ -1,127 +1,127 @@
-
- * Copyright (C) 2005-2008 Laurent Destailleur
- * Copyright (C) 2005-2009 Regis Houssin
- *
- * 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 2 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 .
- */
-
-/**
- * \defgroup mailing Module emailing
- * \brief Module to manage EMailings
- * \file htdocs/includes/modules/modMailing.class.php
- * \ingroup mailing
- * \brief Fichier de description et activation du module Mailing
- */
-
-include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
-
-
-/**
- * \class modMailing
- * \brief Classe de description et activation du module Mailing
- */
-class modMailing extends DolibarrModules
-{
-
- /**
- * \brief Constructeur. Definit les noms, constantes et boites
- * \param DB handler d'acces base
- */
- function modMailing($DB)
- {
- $this->db = $DB ;
- $this->numero = 22 ;
-
- $this->family = "technic";
- // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
- $this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "Gestion des EMailings";
- $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
- $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
- $this->special = 0;
- $this->picto='email';
-
- // Data directories to create when module is enabled
- $this->dirs = array("/mailing/temp");
-
- // Dependances
- $this->depends = array();
- $this->requiredby = array();
- $this->langfiles = array("mails");
-
- // Config pages
- $this->config_page_url = array("mailing.php");
-
- // Constantes
- $this->const = array();
-
- // Boites
- $this->boxes = array();
-
- // Permissions
- $this->rights = array();
- $this->rights_class = 'mailing';
-
- $this->rights[1][0] = 221; // id de la permission
- $this->rights[1][1] = 'Consulter les mailings'; // libelle de la permission
- $this->rights[1][2] = 'r'; // type de la permission (deprecie a ce jour)
- $this->rights[1][3] = 1; // La permission est-elle une permission par defaut
- $this->rights[1][4] = 'lire';
-
- $this->rights[2][0] = 222;
- $this->rights[2][1] = 'Creer/modifier les mailings (sujet, destinataires...)';
- $this->rights[2][2] = 'w';
- $this->rights[2][3] = 0;
- $this->rights[2][4] = 'creer';
-
- $this->rights[3][0] = 223;
- $this->rights[3][1] = 'Valider les mailings (permet leur envoi)';
- $this->rights[3][2] = 'w';
- $this->rights[3][3] = 0;
- $this->rights[3][4] = 'valider';
-
- $this->rights[4][0] = 229;
- $this->rights[4][1] = 'Supprimer les mailings)';
- $this->rights[4][2] = 'd';
- $this->rights[4][3] = 0;
- $this->rights[4][4] = 'supprimer';
-
- }
-
-
- /**
- * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
- * Definit egalement les repertoires de donnees a creer pour ce module.
- */
- function init()
- {
- // Permissions
- $this->remove();
-
- return $this->_init($sql);
- }
-
- /**
- \brief Fonction appelee lors de la desactivation d'un module.
- Supprime de la base les constantes, boites et permissions du module.
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-}
-?>
+
+ * Copyright (C) 2005-2008 Laurent Destailleur
+ * Copyright (C) 2005-2009 Regis Houssin
+ *
+ * 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 2 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 .
+ */
+
+/**
+ * \defgroup mailing Module emailing
+ * \brief Module to manage EMailings
+ * \file htdocs/includes/modules/modMailing.class.php
+ * \ingroup mailing
+ * \brief Fichier de description et activation du module Mailing
+ */
+
+include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
+
+
+/**
+ * \class modMailing
+ * \brief Classe de description et activation du module Mailing
+ */
+class modMailing extends DolibarrModules
+{
+
+ /**
+ * \brief Constructeur. Definit les noms, constantes et boites
+ * \param DB handler d'acces base
+ */
+ function modMailing($DB)
+ {
+ $this->db = $DB ;
+ $this->numero = 22 ;
+
+ $this->family = "technic";
+ // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+ $this->name = preg_replace('/^mod/i','',get_class($this));
+ $this->description = "Gestion des EMailings";
+ $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ $this->special = 0;
+ $this->picto='email';
+
+ // Data directories to create when module is enabled
+ $this->dirs = array("/mailing/temp");
+
+ // Dependances
+ $this->depends = array();
+ $this->requiredby = array();
+ $this->langfiles = array("mails");
+
+ // Config pages
+ $this->config_page_url = array("mailing.php");
+
+ // Constantes
+ $this->const = array();
+
+ // Boites
+ $this->boxes = array();
+
+ // Permissions
+ $this->rights = array();
+ $this->rights_class = 'mailing';
+
+ $this->rights[1][0] = 221; // id de la permission
+ $this->rights[1][1] = 'Consulter les mailings'; // libelle de la permission
+ $this->rights[1][2] = 'r'; // type de la permission (deprecie a ce jour)
+ $this->rights[1][3] = 1; // La permission est-elle une permission par defaut
+ $this->rights[1][4] = 'lire';
+
+ $this->rights[2][0] = 222;
+ $this->rights[2][1] = 'Creer/modifier les mailings (sujet, destinataires...)';
+ $this->rights[2][2] = 'w';
+ $this->rights[2][3] = 0;
+ $this->rights[2][4] = 'creer';
+
+ $this->rights[3][0] = 223;
+ $this->rights[3][1] = 'Valider les mailings (permet leur envoi)';
+ $this->rights[3][2] = 'w';
+ $this->rights[3][3] = 0;
+ $this->rights[3][4] = 'valider';
+
+ $this->rights[4][0] = 229;
+ $this->rights[4][1] = 'Supprimer les mailings)';
+ $this->rights[4][2] = 'd';
+ $this->rights[4][3] = 0;
+ $this->rights[4][4] = 'supprimer';
+
+ }
+
+
+ /**
+ * \brief Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
+ * Definit egalement les repertoires de donnees a creer pour ce module.
+ */
+ function init()
+ {
+ // Permissions
+ $this->remove();
+
+ return $this->_init($sql);
+ }
+
+ /**
+ \brief Fonction appelee lors de la desactivation d'un module.
+ Supprime de la base les constantes, boites et permissions du module.
+ */
+ function remove()
+ {
+ $sql = array();
+
+ return $this->_remove($sql);
+ }
+}
+?>
diff --git a/htdocs/lib/ws.lib.php b/htdocs/lib/ws.lib.php
index 511b08f0725..468ed4c2bcd 100755
--- a/htdocs/lib/ws.lib.php
+++ b/htdocs/lib/ws.lib.php
@@ -40,23 +40,35 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel)
$error++;
$errorcode='BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel='Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
}
+
+ if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity']))
+ {
+ $error++;
+ $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter entity must be empty (or filled with numeric id of instance if multicompany module is used).";
+ }
+
if (! $error)
{
$result=$fuser->fetch('',$authentication['login'],'',0);
if ($result <= 0) $error++;
- // TODO Check password
+ // Validation of login with a third party login module method
+ if (! $error)
+ {
+ $test=true;
+ if (is_array($conf->login_method_modules) && !empty($conf->login_method_modules))
+ {
+ $login = getLoginMethod($authentication['login'],$authentication['password'],$authentication['entity']);
+ if ($login) $test=false;
+ }
+ if ($test) $error++;
+ }
if ($error)
{
$errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
}
}
- if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity']))
- {
- $error++;
- $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter entity must be empty (or a numeric with id of instance if multicompany module is used).";
- }
return $fuser;
}
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index 062084c7882..8073d664e31 100755
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -1,70 +1,70 @@
-
- * Copyright (C) 2011 Regis Houssin
- *
- * 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 2 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 .
- */
-
-/**
- * \file htdocs/paypal/lib/paypalfunctions.lib.php
- * \ingroup paypal
- * \brief Page with Paypal init var.
- */
-
-if (session_id() == "") session_start();
-
-
-// ==================================
-// PayPal Express Checkout Module
-// ==================================
-
-$API_version="56";
-
-/*
- ' Define the PayPal Redirect URLs.
- ' This is the URL that the buyer is first sent to do authorize payment with their paypal account
- ' change the URL depending if you are testing on the sandbox or the live PayPal site
- '
- ' For the sandbox, the URL is https://www.sandbox.paypal.com/webscr&cmd=_express-checkout&token=
- ' For the live site, the URL is https://www.paypal.com/webscr&cmd=_express-checkout&token=
- */
-if ($conf->global->PAYPAL_API_SANDBOX)
-{
- $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
- $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-}
-else
-{
- $API_Endpoint = "https://api-3t.paypal.com/nvp";
- $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
-}
-
-// Clean parameters
-$PAYPAL_API_USER="";
-if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
-$PAYPAL_API_PASSWORD="";
-if ($conf->global->PAYPAL_API_PASSWORD) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
-$PAYPAL_API_SIGNATURE="";
-if ($conf->global->PAYPAL_API_SIGNATURE) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
-$PAYPAL_API_SANDBOX="";
-if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
-
-// Proxy
-$PROXY_HOST = $conf->global->MAIN_PROXY_HOST;
-$PROXY_PORT = $conf->global->MAIN_PROXY_PORT;
-$PROXY_USER = $conf->global->MAIN_PROXY_USER;
-$PROXY_PASS = $conf->global->MAIN_PROXY_PASS;
-$USE_PROXY = empty($conf->global->MAIN_PROXY_USE)?false:true;
-
+
+ * Copyright (C) 2011 Regis Houssin
+ *
+ * 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 2 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 .
+ */
+
+/**
+ * \file htdocs/paypal/lib/paypalfunctions.lib.php
+ * \ingroup paypal
+ * \brief Page with Paypal init var.
+ */
+
+if (session_id() == "") session_start();
+
+
+// ==================================
+// PayPal Express Checkout Module
+// ==================================
+
+$API_version="56";
+
+/*
+ ' Define the PayPal Redirect URLs.
+ ' This is the URL that the buyer is first sent to do authorize payment with their paypal account
+ ' change the URL depending if you are testing on the sandbox or the live PayPal site
+ '
+ ' For the sandbox, the URL is https://www.sandbox.paypal.com/webscr&cmd=_express-checkout&token=
+ ' For the live site, the URL is https://www.paypal.com/webscr&cmd=_express-checkout&token=
+ */
+if ($conf->global->PAYPAL_API_SANDBOX)
+{
+ $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
+ $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
+}
+else
+{
+ $API_Endpoint = "https://api-3t.paypal.com/nvp";
+ $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
+}
+
+// Clean parameters
+$PAYPAL_API_USER="";
+if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
+$PAYPAL_API_PASSWORD="";
+if ($conf->global->PAYPAL_API_PASSWORD) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
+$PAYPAL_API_SIGNATURE="";
+if ($conf->global->PAYPAL_API_SIGNATURE) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
+$PAYPAL_API_SANDBOX="";
+if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+
+// Proxy
+$PROXY_HOST = $conf->global->MAIN_PROXY_HOST;
+$PROXY_PORT = $conf->global->MAIN_PROXY_PORT;
+$PROXY_USER = $conf->global->MAIN_PROXY_USER;
+$PROXY_PASS = $conf->global->MAIN_PROXY_PASS;
+$USE_PROXY = empty($conf->global->MAIN_PROXY_USE)?false:true;
+
?>
\ No newline at end of file
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 881c86fb449..678625ba3cb 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -51,6 +51,9 @@ class ActionsCardCompany extends ActionsCardCommon
/**
* Return the title of card
+ *
+ * @param string $action Action code
+ * @return string Title
*/
private function getTitle($action)
{
@@ -70,6 +73,7 @@ class ActionsCardCompany extends ActionsCardCommon
* Execute actions
*
* @param int $socid Id of object (may be empty for creation)
+ * @return int <0 if KO, >0 if OK
*/
function doActions($socid)
{
@@ -82,6 +86,7 @@ class ActionsCardCompany extends ActionsCardCommon
* Assign custom values for canvas (for example into this->tpl to be used by templates)
*
* @param string $action Type of action
+ * @return void
*/
function assign_values($action)
{
@@ -208,14 +213,15 @@ class ActionsCardCompany extends ActionsCardCommon
/**
* Check permissions of a user to show a page and an object. Check read permission
* If $_REQUEST['action'] defined, we also check write permission.
- * @param user User to check
- * @param features Features to check (in most cases, it's module name)
- * @param objectid Object ID if we want to check permission on a particular record (optionnal)
- * @param dbtablename Table name where object is stored. Not used if objectid is null (optionnal)
- * @param feature2 Feature to check (second level of permission)
- * @param dbt_keyfield Field name for socid foreign key if not fk_soc. (optionnal)
- * @param dbt_select Field name for select if not rowid. (optionnal)
- * @return int 1
+ *
+ * @param User $user User to check
+ * @param string $features Features to check (in most cases, it's module name)
+ * @param int $objectid Object ID if we want to check permission on a particular record (optionnal)
+ * @param string $dbtablename Table name where object is stored. Not used if objectid is null (optionnal)
+ * @param string $feature2 Feature to check (second level of permission)
+ * @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. (optionnal)
+ * @param string $dbt_select Field name for select if not rowid. (optionnal)
+ * @return int 1
*/
function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
{
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 52e8f33f247..51dfe098b1b 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -51,6 +51,9 @@ class ActionsCardIndividual extends ActionsCardCommon
/**
* Return the title of card
+ *
+ * @param string $action Action code
+ * @return string Title
*/
private function getTitle($action)
{
@@ -67,9 +70,10 @@ class ActionsCardIndividual extends ActionsCardCommon
/**
- * Execute actions
+ * Execute actions
*
- * @param int $socid Id of object (may be empty for creation)
+ * @param int $socid Id of object (may be empty for creation)
+ * @return int <0 if KO, >0 if OK
*/
function doActions($socid)
{
@@ -79,9 +83,10 @@ class ActionsCardIndividual extends ActionsCardCommon
}
/**
- * Assign custom values for canvas (for example into this->tpl to be used by templates)
+ * Assign custom values for canvas (for example into this->tpl to be used by templates)
*
- * @param string $action Type of action
+ * @param string $action Type of action
+ * @return void
*/
function assign_values($action)
{
@@ -107,14 +112,15 @@ class ActionsCardIndividual extends ActionsCardCommon
/**
* Check permissions of a user to show a page and an object. Check read permission
* If $_REQUEST['action'] defined, we also check write permission.
- * @param user User to check
- * @param features Features to check (in most cases, it's module name)
- * @param objectid Object ID if we want to check permission on a particular record (optionnal)
- * @param dbtablename Table name where object is stored. Not used if objectid is null (optionnal)
- * @param feature2 Feature to check (second level of permission)
- * @param dbt_keyfield Field name for socid foreign key if not fk_soc. (optionnal)
- * @param dbt_select Field name for select if not rowid. (optionnal)
- * @return int 1
+ *
+ * @param User $user User to check
+ * @param string $features Features to check (in most cases, it's module name)
+ * @param int $objectid Object ID if we want to check permission on a particular record (optionnal)
+ * @param string $dbtablename Table name where object is stored. Not used if objectid is null (optionnal)
+ * @param string $feature2 Feature to check (second level of permission)
+ * @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. (optionnal)
+ * @param string $dbt_select Field name for select if not rowid. (optionnal)
+ * @return int 1
*/
function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
{
diff --git a/htdocs/theme/auguria/fckeditor/fck_dialog.css b/htdocs/theme/auguria/fckeditor/fck_dialog.css
index 53f16ef8d3c..35d0fc0b180 100644
--- a/htdocs/theme/auguria/fckeditor/fck_dialog.css
+++ b/htdocs/theme/auguria/fckeditor/fck_dialog.css
@@ -1,402 +1,402 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the dialog boxes.
- */
-
-html, body
-{
- background-color: transparent;
- margin: 0px;
- padding: 0px;
-}
-
-body
-{
- padding: 10px;
-}
-
-body, td, input, select, textarea
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
-}
-
-body, .BackColor
-{
- background-color: #f7f7f7;
-}
-
-.PopupBody
-{
- height: 100%;
- width: 100%;
- overflow: hidden;
- background-color: transparent;
- padding: 0px;
-}
-
-#header
-{
- cursor: move;
-}
-
-.PopupTitle
-{
- font-weight: bold;
- font-size: 14pt;
- color: #504845;
- background-color: #dedede;
- padding: 3px 10px 3px 10px;
-}
-
-.PopupButtons
-{
- position: absolute;
- right: 0px;
- left: 0px;
- bottom: 0px;
- border-top: #cec6b5 1px solid;
- background-color: #DEDEDE;
- padding: 7px 10px 7px 10px;
-}
-
-.Button
-{
- border: #7a7261 1px solid;
- color: #504845;
- background-color: #cec6b5;
-}
-
-#btnOk
-{
- width: 100px;
-}
-
-.DarkBackground
-{
- background-color: #f2f2f2;
-}
-
-.LightBackground
-{
- background-color: #ffffbe;
-}
-
-.PopupTitleBorder
-{
- border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTabArea
-{
- color: #504845;
- background-color: #DEDEDE;
-}
-
-.PopupTabEmptyArea
-{
- padding-left: 10px ;
- border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTab, .PopupTabSelected
-{
- border-right: #cec6b5 1px solid;
- border-top: #cec6b5 1px solid;
- border-left: #cec6b5 1px solid;
- padding: 3px 5px 3px 5px;
- color: #504845;
-}
-
-.PopupTab
-{
- margin-top: 1px;
- border-bottom: #cec6b5 1px solid;
- cursor: pointer;
- cursor: hand;
-}
-
-.PopupTabSelected
-{
- font-weight:bold;
- cursor: default;
- padding-top: 4px;
- border-bottom: #f1f1e3 1px solid;
- background-color: #f7f7f7;
-}
-
-.PopupSelectionBox
-{
- border: #a9a9a9 1px solid !important;
- background-color: #dcdcdc !important;
- cursor: pointer;
- cursor: hand;
-}
-
-#tdBrowse
-{
- vertical-align: bottom;
-}
-
-/**
- * Dialog frame related styles.
- */
-
-.contents
-{
- position: absolute;
- top: 2px;
- left: 16px;
- right: 16px;
- bottom: 20px;
- background-color: #f7f7f7;
- overflow: hidden;
- z-index: 1;
-}
-
-.tl, .tr, .tc, .bl, .br, .bc
-{
- position: absolute;
- background-image: url(images/sprites.png);
- background-repeat: no-repeat;
-}
-
-* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
-{
- background-image: url(images/sprites.gif);
-}
-
-.ml, .mr
-{
- position: absolute;
- background-image: url(images/dialog.sides.png);
- background-repeat: repeat-y;
-}
-
-* html .ml, * html .mr
-{
- background-image: url(images/dialog.sides.gif);
-}
-
-.rtl .ml, .rtl .mr
-{
- position: absolute;
- background-image: url(images/dialog.sides.rtl.png);
- background-repeat: repeat-y;
-}
-
-* html .rtl .ml, * html .rtl .mr
-{
- background-image: url(images/dialog.sides.gif);
-}
-
-.tl
-{
- top: 0px;
- left: 0px;
- width: 16px;
- height: 16px;
- background-position: -16px -16px;
-}
-
-.rtl .tl
-{
- background-position: -16px -397px;
-}
-
-.tr
-{
- top: 0px;
- right: 0px;
- width: 16px;
- height: 16px;
- background-position: -16px -76px;
-}
-
-.rtl .tr
-{
- background-position: -16px -457px;
-}
-
-.tc
-{
- top: 0px;
- right: 16px;
- left: 16px;
- height: 16px;
- background-position: 0px -136px;
- background-repeat: repeat-x;
-}
-
-.ml
-{
- top: 16px;
- left: 0px;
- width: 16px;
- bottom: 51px;
- background-position: 0px 0px;
-}
-
-.mr
-{
- top: 16px;
- right: 0px;
- width: 16px;
- bottom: 51px;
- background-position: -16px 0px;
-}
-
-.bl
-{
- bottom: 0px;
- left: 0px;
- width: 30px;
- height: 51px;
- background-position: -16px -196px;
-}
-
-.rtl .bl
-{
- background-position: -16px -517px;
-}
-
-.br
-{
- bottom: 0px;
- right: 0px;
- width: 30px;
- height: 51px;
- background-position: -16px -263px;
-}
-
-.rtl .br
-{
- background-position: -16px -584px;
-}
-
-.bc
-{
- bottom: 0px;
- right: 30px;
- left: 30px;
- height: 51px;
- background-position: 0px -330px;
- background-repeat: repeat-x;
-}
-
-/* For IE6. Do not change it. */
-* html .blocker
-{
- position: absolute;
- width: 100%;
- height: 100%;
- z-index: 12;
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
-}
-
-/* The layer used to cover the dialog when opening a child dialog. */
-.cover
-{
- position: absolute;
- top: 0px;
- left: 14px;
- right: 14px;
- bottom: 18px;
- z-index: 11;
-}
-
-#closeButton
-{
- position: absolute;
- right: 0px;
- top: 0px;
- margin-top: 5px;
- margin-right: 10px;
- width: 20px;
- height: 20px;
- cursor: pointer;
- background-image: url(images/sprites.png);
- background-repeat: no-repeat;
- background-position: -16px -651px;
-}
-
-* html #closeButton
-{
- cursor: hand;
- background-image: url(images/sprites.gif);
-}
-
-.rtl #closeButton
-{
- right: auto;
- left: 10px;
- margin-right: 0px;
-}
-
-#closeButton:hover
-{
- background-position: -16px -687px;
-}
-
-#throbberBlock
-{
- z-index: 10;
-}
-
-#throbberBlock div
-{
- float: left;
- width: 8px;
- height: 9px;
- margin-left: 2px;
- margin-right: 2px;
- font-size: 1px; /* IE6 */
-}
-
-/*
- Color Gradient Generator:
- http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
-*/
-
-.throbber_1
-{
- background-color: #504845;
-}
-
-.throbber_2
-{
- background-color: #736D6B;
-}
-
-.throbber_3
-{
- background-color: #979391;
-}
-
-.throbber_4
-{
- background-color: #BAB8B7;
-}
-
-.throbber_5
-{
- background-color: #DEDEDE;
-}
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the dialog boxes.
+ */
+
+html, body
+{
+ background-color: transparent;
+ margin: 0px;
+ padding: 0px;
+}
+
+body
+{
+ padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+body, .BackColor
+{
+ background-color: #f7f7f7;
+}
+
+.PopupBody
+{
+ height: 100%;
+ width: 100%;
+ overflow: hidden;
+ background-color: transparent;
+ padding: 0px;
+}
+
+#header
+{
+ cursor: move;
+}
+
+.PopupTitle
+{
+ font-weight: bold;
+ font-size: 14pt;
+ color: #504845;
+ background-color: #dedede;
+ padding: 3px 10px 3px 10px;
+}
+
+.PopupButtons
+{
+ position: absolute;
+ right: 0px;
+ left: 0px;
+ bottom: 0px;
+ border-top: #cec6b5 1px solid;
+ background-color: #DEDEDE;
+ padding: 7px 10px 7px 10px;
+}
+
+.Button
+{
+ border: #7a7261 1px solid;
+ color: #504845;
+ background-color: #cec6b5;
+}
+
+#btnOk
+{
+ width: 100px;
+}
+
+.DarkBackground
+{
+ background-color: #f2f2f2;
+}
+
+.LightBackground
+{
+ background-color: #ffffbe;
+}
+
+.PopupTitleBorder
+{
+ border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTabArea
+{
+ color: #504845;
+ background-color: #DEDEDE;
+}
+
+.PopupTabEmptyArea
+{
+ padding-left: 10px ;
+ border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+ border-right: #cec6b5 1px solid;
+ border-top: #cec6b5 1px solid;
+ border-left: #cec6b5 1px solid;
+ padding: 3px 5px 3px 5px;
+ color: #504845;
+}
+
+.PopupTab
+{
+ margin-top: 1px;
+ border-bottom: #cec6b5 1px solid;
+ cursor: pointer;
+ cursor: hand;
+}
+
+.PopupTabSelected
+{
+ font-weight:bold;
+ cursor: default;
+ padding-top: 4px;
+ border-bottom: #f1f1e3 1px solid;
+ background-color: #f7f7f7;
+}
+
+.PopupSelectionBox
+{
+ border: #a9a9a9 1px solid !important;
+ background-color: #dcdcdc !important;
+ cursor: pointer;
+ cursor: hand;
+}
+
+#tdBrowse
+{
+ vertical-align: bottom;
+}
+
+/**
+ * Dialog frame related styles.
+ */
+
+.contents
+{
+ position: absolute;
+ top: 2px;
+ left: 16px;
+ right: 16px;
+ bottom: 20px;
+ background-color: #f7f7f7;
+ overflow: hidden;
+ z-index: 1;
+}
+
+.tl, .tr, .tc, .bl, .br, .bc
+{
+ position: absolute;
+ background-image: url(images/sprites.png);
+ background-repeat: no-repeat;
+}
+
+* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
+{
+ background-image: url(images/sprites.gif);
+}
+
+.ml, .mr
+{
+ position: absolute;
+ background-image: url(images/dialog.sides.png);
+ background-repeat: repeat-y;
+}
+
+* html .ml, * html .mr
+{
+ background-image: url(images/dialog.sides.gif);
+}
+
+.rtl .ml, .rtl .mr
+{
+ position: absolute;
+ background-image: url(images/dialog.sides.rtl.png);
+ background-repeat: repeat-y;
+}
+
+* html .rtl .ml, * html .rtl .mr
+{
+ background-image: url(images/dialog.sides.gif);
+}
+
+.tl
+{
+ top: 0px;
+ left: 0px;
+ width: 16px;
+ height: 16px;
+ background-position: -16px -16px;
+}
+
+.rtl .tl
+{
+ background-position: -16px -397px;
+}
+
+.tr
+{
+ top: 0px;
+ right: 0px;
+ width: 16px;
+ height: 16px;
+ background-position: -16px -76px;
+}
+
+.rtl .tr
+{
+ background-position: -16px -457px;
+}
+
+.tc
+{
+ top: 0px;
+ right: 16px;
+ left: 16px;
+ height: 16px;
+ background-position: 0px -136px;
+ background-repeat: repeat-x;
+}
+
+.ml
+{
+ top: 16px;
+ left: 0px;
+ width: 16px;
+ bottom: 51px;
+ background-position: 0px 0px;
+}
+
+.mr
+{
+ top: 16px;
+ right: 0px;
+ width: 16px;
+ bottom: 51px;
+ background-position: -16px 0px;
+}
+
+.bl
+{
+ bottom: 0px;
+ left: 0px;
+ width: 30px;
+ height: 51px;
+ background-position: -16px -196px;
+}
+
+.rtl .bl
+{
+ background-position: -16px -517px;
+}
+
+.br
+{
+ bottom: 0px;
+ right: 0px;
+ width: 30px;
+ height: 51px;
+ background-position: -16px -263px;
+}
+
+.rtl .br
+{
+ background-position: -16px -584px;
+}
+
+.bc
+{
+ bottom: 0px;
+ right: 30px;
+ left: 30px;
+ height: 51px;
+ background-position: 0px -330px;
+ background-repeat: repeat-x;
+}
+
+/* For IE6. Do not change it. */
+* html .blocker
+{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: 12;
+ filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+}
+
+/* The layer used to cover the dialog when opening a child dialog. */
+.cover
+{
+ position: absolute;
+ top: 0px;
+ left: 14px;
+ right: 14px;
+ bottom: 18px;
+ z-index: 11;
+}
+
+#closeButton
+{
+ position: absolute;
+ right: 0px;
+ top: 0px;
+ margin-top: 5px;
+ margin-right: 10px;
+ width: 20px;
+ height: 20px;
+ cursor: pointer;
+ background-image: url(images/sprites.png);
+ background-repeat: no-repeat;
+ background-position: -16px -651px;
+}
+
+* html #closeButton
+{
+ cursor: hand;
+ background-image: url(images/sprites.gif);
+}
+
+.rtl #closeButton
+{
+ right: auto;
+ left: 10px;
+ margin-right: 0px;
+}
+
+#closeButton:hover
+{
+ background-position: -16px -687px;
+}
+
+#throbberBlock
+{
+ z-index: 10;
+}
+
+#throbberBlock div
+{
+ float: left;
+ width: 8px;
+ height: 9px;
+ margin-left: 2px;
+ margin-right: 2px;
+ font-size: 1px; /* IE6 */
+}
+
+/*
+ Color Gradient Generator:
+ http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
+*/
+
+.throbber_1
+{
+ background-color: #504845;
+}
+
+.throbber_2
+{
+ background-color: #736D6B;
+}
+
+.throbber_3
+{
+ background-color: #979391;
+}
+
+.throbber_4
+{
+ background-color: #BAB8B7;
+}
+
+.throbber_5
+{
+ background-color: #DEDEDE;
+}
diff --git a/htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js b/htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js
index 4fc9ba66f52..804cc8d24de 100644
--- a/htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js
+++ b/htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js
@@ -1,110 +1,110 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- */
-
-(function()
-{
- // IE6 doens't handle absolute positioning properly (it is always in quirks
- // mode). This function fixes the sizes and positions of many elements that
- // compose the skin (this is skin specific).
- var fixSizes = window.DoResizeFixes = function()
- {
- var fckDlg = window.document.body ;
-
- for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
- {
- var child = fckDlg.childNodes[i] ;
- switch ( child.className )
- {
- case 'contents' :
- child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
- child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
- break ;
-
- case 'blocker' :
- case 'cover' :
- child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
- child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
- break ;
-
- case 'tr' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 16);
- break ;
-
- case 'tc' :
- child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
- break ;
-
- case 'ml' :
- child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
- break ;
-
- case 'mr' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 16);
- child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
- break ;
-
- case 'bl' :
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
-
- case 'br' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 30);
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
-
- case 'bc' :
- child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
- }
- }
- }
-
- var closeButtonOver = function()
- {
- this.style.backgroundPosition = '-16px -687px' ;
- } ;
-
- var closeButtonOut = function()
- {
- this.style.backgroundPosition = '-16px -651px' ;
- } ;
-
- var fixCloseButton = function()
- {
- var closeButton = document.getElementById ('closeButton');
-
- closeButton.onmouseover = closeButtonOver ;
- closeButton.onmouseout = closeButtonOut ;
- }
-
- var onLoad = function()
- {
- fixSizes() ;
- fixCloseButton() ;
-
- window.attachEvent('onresize', fixSizes);
- window.detachEvent('onload', onLoad);
- }
-
- window.attachEvent('onload', onLoad);
-
-})() ;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+(function()
+{
+ // IE6 doens't handle absolute positioning properly (it is always in quirks
+ // mode). This function fixes the sizes and positions of many elements that
+ // compose the skin (this is skin specific).
+ var fixSizes = window.DoResizeFixes = function()
+ {
+ var fckDlg = window.document.body ;
+
+ for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
+ {
+ var child = fckDlg.childNodes[i] ;
+ switch ( child.className )
+ {
+ case 'contents' :
+ child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
+ child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
+ break ;
+
+ case 'blocker' :
+ case 'cover' :
+ child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
+ child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
+ break ;
+
+ case 'tr' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 16);
+ break ;
+
+ case 'tc' :
+ child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
+ break ;
+
+ case 'ml' :
+ child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
+ break ;
+
+ case 'mr' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 16);
+ child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
+ break ;
+
+ case 'bl' :
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+
+ case 'br' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 30);
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+
+ case 'bc' :
+ child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+ }
+ }
+ }
+
+ var closeButtonOver = function()
+ {
+ this.style.backgroundPosition = '-16px -687px' ;
+ } ;
+
+ var closeButtonOut = function()
+ {
+ this.style.backgroundPosition = '-16px -651px' ;
+ } ;
+
+ var fixCloseButton = function()
+ {
+ var closeButton = document.getElementById ('closeButton');
+
+ closeButton.onmouseover = closeButtonOver ;
+ closeButton.onmouseout = closeButtonOut ;
+ }
+
+ var onLoad = function()
+ {
+ fixSizes() ;
+ fixCloseButton() ;
+
+ window.attachEvent('onresize', fixSizes);
+ window.detachEvent('onload', onLoad);
+ }
+
+ window.attachEvent('onload', onLoad);
+
+})() ;
diff --git a/htdocs/theme/auguria/fckeditor/fck_editor.css b/htdocs/theme/auguria/fckeditor/fck_editor.css
index 0862d375fe6..8ba21189397 100644
--- a/htdocs/theme/auguria/fckeditor/fck_editor.css
+++ b/htdocs/theme/auguria/fckeditor/fck_editor.css
@@ -1,465 +1,465 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the editor IFRAME and Toolbar.
- */
-
-/*
- ### Basic Editor IFRAME Styles.
-*/
-
-body
-{
- padding: 1px;
- margin: 0;
- background-color: #ffffff;
-}
-
-#xEditingArea
-{
- border: #696969 1px solid;
-}
-
-.SourceField
-{
- padding: 5px;
- margin: 0px;
- font-family: Monospace;
-}
-
-/*
- Toolbar
-*/
-
-.TB_ToolbarSet, .TB_Expand, .TB_Collapse
-{
- cursor: default;
- background-color: #f7f7f7;
-}
-
-.TB_ToolbarSet
-{
- border-top: #f7f7f7 1px outset;
- border-bottom: #f7f7f7 1px outset;
-}
-
-.TB_ToolbarSet TD
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.TB_Toolbar
-{
- height: 24px;
- display: inline-table; /* inline = Opera jumping buttons bug */
-}
-
-.TB_Separator
-{
- width: 1px;
- height: 16px;
- margin: 2px;
- background-color: #999966;
-}
-
-.TB_Start
-{
- background-image: url(images/toolbar.start.gif);
- margin: 2px;
- width: 3px;
- background-repeat: no-repeat;
- height: 16px;
-}
-
-.TB_End
-{
- display: none;
-}
-
-.TB_ExpandImg
-{
- background-image: url(images/toolbar.expand.gif);
- background-repeat: no-repeat;
-}
-
-.TB_CollapseImg
-{
- background-image: url(images/toolbar.collapse.gif);
- background-repeat: no-repeat;
-}
-
-.TB_SideBorder
-{
- background-color: #696969;
-}
-
-.TB_Expand, .TB_Collapse
-{
- padding: 2px 2px 2px 2px;
- border: #f7f7f7 1px outset;
-}
-
-.TB_Collapse
-{
- width: 5px;
-}
-
-.TB_Break
-{
- height: 24px; /* IE needs the height to be set, otherwise no break */
-}
-
-/*
- Toolbar Button
-*/
-
-.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
-{
- border: #f7f7f7 1px solid; /* This is the default border */
- height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
-}
-
-.TB_Button_On
-{
- border: #316ac5 1px solid;
- background-color: #c1d2ee;
-}
-
-.TB_Button_On_Over, .TB_Button_Off_Over
-{
- border: #316ac5 1px solid;
- background-color: #dff1ff;
-}
-
-.TB_Button_Off
-{
- filter: alpha(opacity=70); /* IE */
- opacity: 0.70; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Disabled
-{
- filter: gray() alpha(opacity=30); /* IE */
- opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Padding
-{
- visibility: hidden;
- width: 3px;
- height: 22px;
-}
-
-.TB_Button_Image
-{
- overflow: hidden;
- width: 16px;
- height: 16px;
- margin: 3px;
- background-repeat: no-repeat;
-}
-
-.TB_Button_Image img
-{
- position: relative;
-}
-
-.TB_Button_Off .TB_Button_Text
-{
- background-color: #f7f7f7; /* Needed because of a bug on Clear Type */
-}
-
-.TB_ConnectionLine
-{
- background-color: #ffffff;
- height: 1px;
- margin-left: 1px; /* ltr */
- margin-right: 1px; /* rtl */
-}
-
-.TB_Text
-{
- height: 22px;
-}
-
-.TB_Button_Off .TB_Text
-{
- background-color: #f7f7f7 ; /* Needed because of a bug on ClearType */
-}
-
-.TB_Button_On_Over .TB_Text
-{
- background-color: #dff1ff ; /* Needed because of a bug on ClearType */
-}
-
-/*
- Menu
-*/
-
-.MN_Menu
-{
- border: 1px solid #8f8f73;
- padding: 2px;
- background-color: #ffffff;
- cursor: default;
-}
-
-.MN_Menu, .MN_Menu .MN_Label
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.MN_Item_Padding
-{
- visibility: hidden;
- width: 3px;
- height: 20px;
-}
-
-.MN_Icon
-{
- background-color: #dedede;
- text-align: center;
- height: 20px;
-}
-
-.MN_Label
-{
- padding-left: 3px;
- padding-right: 3px;
-}
-
-.MN_Separator
-{
- height: 3px;
-}
-
-.MN_Separator_Line
-{
- border-top: #b9b99d 1px solid;
-}
-
-.MN_Item .MN_Icon IMG
-{
- filter: alpha(opacity=70);
- opacity: 0.70;
-}
-
-.MN_Item_Over
-{
- color: #ffffff;
- background-color: #8a857d;
-}
-
-.MN_Item_Over .MN_Icon
-{
- background-color: #6c6761;
-}
-
-.MN_Item_Disabled IMG
-{
- filter: gray() alpha(opacity=30); /* IE */
- opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.MN_Item_Disabled .MN_Label
-{
- color: #b7b7b7;
-}
-
-.MN_Arrow
-{
- padding-right: 3px;
- padding-left: 3px;
-}
-
-.MN_ConnectionLine
-{
- background-color: #ffffff;
-}
-
-.Menu .TB_Button_On, .Menu .TB_Button_On_Over
-{
- border: #8f8f73 1px solid;
- background-color: #ffffff;
-}
-
-/*
- ### Panel Styles
-*/
-
-.FCK_Panel
-{
- border: #8f8f73 1px solid;
- padding: 2px;
- background-color: #ffffff;
-}
-
-.FCK_Panel, .FCK_Panel TD
-{
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
- font-size: 11px;
-}
-
-/*
- ### Special Combos
-*/
-
-.SC_Panel
-{
- overflow: auto;
- white-space: nowrap;
- cursor: default;
- border: 1px solid #8f8f73;
- padding-left: 2px;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the editor IFRAME and Toolbar.
+ */
+
+/*
+ ### Basic Editor IFRAME Styles.
+*/
+
+body
+{
+ padding: 1px;
+ margin: 0;
+ background-color: #ffffff;
+}
+
+#xEditingArea
+{
+ border: #696969 1px solid;
+}
+
+.SourceField
+{
+ padding: 5px;
+ margin: 0px;
+ font-family: Monospace;
+}
+
+/*
+ Toolbar
+*/
+
+.TB_ToolbarSet, .TB_Expand, .TB_Collapse
+{
+ cursor: default;
+ background-color: #f7f7f7;
+}
+
+.TB_ToolbarSet
+{
+ border-top: #f7f7f7 1px outset;
+ border-bottom: #f7f7f7 1px outset;
+}
+
+.TB_ToolbarSet TD
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.TB_Toolbar
+{
+ height: 24px;
+ display: inline-table; /* inline = Opera jumping buttons bug */
+}
+
+.TB_Separator
+{
+ width: 1px;
+ height: 16px;
+ margin: 2px;
+ background-color: #999966;
+}
+
+.TB_Start
+{
+ background-image: url(images/toolbar.start.gif);
+ margin: 2px;
+ width: 3px;
+ background-repeat: no-repeat;
+ height: 16px;
+}
+
+.TB_End
+{
+ display: none;
+}
+
+.TB_ExpandImg
+{
+ background-image: url(images/toolbar.expand.gif);
+ background-repeat: no-repeat;
+}
+
+.TB_CollapseImg
+{
+ background-image: url(images/toolbar.collapse.gif);
+ background-repeat: no-repeat;
+}
+
+.TB_SideBorder
+{
+ background-color: #696969;
+}
+
+.TB_Expand, .TB_Collapse
+{
+ padding: 2px 2px 2px 2px;
+ border: #f7f7f7 1px outset;
+}
+
+.TB_Collapse
+{
+ width: 5px;
+}
+
+.TB_Break
+{
+ height: 24px; /* IE needs the height to be set, otherwise no break */
+}
+
+/*
+ Toolbar Button
+*/
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+ border: #f7f7f7 1px solid; /* This is the default border */
+ height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
+}
+
+.TB_Button_On
+{
+ border: #316ac5 1px solid;
+ background-color: #c1d2ee;
+}
+
+.TB_Button_On_Over, .TB_Button_Off_Over
+{
+ border: #316ac5 1px solid;
+ background-color: #dff1ff;
+}
+
+.TB_Button_Off
+{
+ filter: alpha(opacity=70); /* IE */
+ opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Disabled
+{
+ filter: gray() alpha(opacity=30); /* IE */
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Padding
+{
+ visibility: hidden;
+ width: 3px;
+ height: 22px;
+}
+
+.TB_Button_Image
+{
+ overflow: hidden;
+ width: 16px;
+ height: 16px;
+ margin: 3px;
+ background-repeat: no-repeat;
+}
+
+.TB_Button_Image img
+{
+ position: relative;
+}
+
+.TB_Button_Off .TB_Button_Text
+{
+ background-color: #f7f7f7; /* Needed because of a bug on Clear Type */
+}
+
+.TB_ConnectionLine
+{
+ background-color: #ffffff;
+ height: 1px;
+ margin-left: 1px; /* ltr */
+ margin-right: 1px; /* rtl */
+}
+
+.TB_Text
+{
+ height: 22px;
+}
+
+.TB_Button_Off .TB_Text
+{
+ background-color: #f7f7f7 ; /* Needed because of a bug on ClearType */
+}
+
+.TB_Button_On_Over .TB_Text
+{
+ background-color: #dff1ff ; /* Needed because of a bug on ClearType */
+}
+
+/*
+ Menu
+*/
+
+.MN_Menu
+{
+ border: 1px solid #8f8f73;
+ padding: 2px;
+ background-color: #ffffff;
+ cursor: default;
+}
+
+.MN_Menu, .MN_Menu .MN_Label
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.MN_Item_Padding
+{
+ visibility: hidden;
+ width: 3px;
+ height: 20px;
+}
+
+.MN_Icon
+{
+ background-color: #dedede;
+ text-align: center;
+ height: 20px;
+}
+
+.MN_Label
+{
+ padding-left: 3px;
+ padding-right: 3px;
+}
+
+.MN_Separator
+{
+ height: 3px;
+}
+
+.MN_Separator_Line
+{
+ border-top: #b9b99d 1px solid;
+}
+
+.MN_Item .MN_Icon IMG
+{
+ filter: alpha(opacity=70);
+ opacity: 0.70;
+}
+
+.MN_Item_Over
+{
+ color: #ffffff;
+ background-color: #8a857d;
+}
+
+.MN_Item_Over .MN_Icon
+{
+ background-color: #6c6761;
+}
+
+.MN_Item_Disabled IMG
+{
+ filter: gray() alpha(opacity=30); /* IE */
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.MN_Item_Disabled .MN_Label
+{
+ color: #b7b7b7;
+}
+
+.MN_Arrow
+{
+ padding-right: 3px;
+ padding-left: 3px;
+}
+
+.MN_ConnectionLine
+{
+ background-color: #ffffff;
+}
+
+.Menu .TB_Button_On, .Menu .TB_Button_On_Over
+{
+ border: #8f8f73 1px solid;
+ background-color: #ffffff;
+}
+
+/*
+ ### Panel Styles
+*/
+
+.FCK_Panel
+{
+ border: #8f8f73 1px solid;
+ padding: 2px;
+ background-color: #ffffff;
+}
+
+.FCK_Panel, .FCK_Panel TD
+{
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+ font-size: 11px;
+}
+
+/*
+ ### Special Combos
+*/
+
+.SC_Panel
+{
+ overflow: auto;
+ white-space: nowrap;
+ cursor: default;
+ border: 1px solid #8f8f73;
+ padding-left: 2px;
padding-right: 2px;
- background-color: #ffffff;
-}
-
-.SC_Panel, .SC_Panel TD
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.SC_Item, .SC_ItemSelected
-{
- margin-top: 2px;
- margin-bottom: 2px;
- background-position: left center;
- padding-left: 11px;
- padding-right: 3px;
- padding-top: 2px;
- padding-bottom: 2px;
- text-overflow: ellipsis;
- overflow: hidden;
- background-repeat: no-repeat;
- border: #dddddd 1px solid;
-}
-
-.SC_Item *, .SC_ItemSelected *
-{
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-.SC_ItemSelected
-{
- border: #9a9afb 1px solid;
- background-image: url(images/toolbar.arrowright.gif);
-}
-
-.SC_ItemOver
-{
- border: #404040 1px solid;
-}
-
-.SC_Field
-{
- border: #b7b7a6 1px solid;
- cursor: default;
-}
-
-.SC_FieldCaption
-{
- overflow: visible;
- padding-right: 5px;
- padding-left: 5px;
- opacity: 0.75; /* Safari, Opera and Mozilla */
- filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
- height: 23px;
- background-color: #f7f7f7;
-}
-
-.SC_FieldLabel
-{
- white-space: nowrap;
- padding: 2px;
- width: 100%;
- cursor: default;
- background-color: #ffffff;
- text-overflow: ellipsis;
- overflow: hidden;
-}
-
-.SC_FieldButton
-{
- background-position: center center;
- background-image: url(images/toolbar.buttonarrow.gif);
- border-left: #b7b7a6 1px solid;
- width: 14px;
- background-repeat: no-repeat;
-}
-
-.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
-{
- opacity: 0.30; /* Safari, Opera and Mozilla */
- filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
-}
-
-.SC_FieldOver
-{
- border: #316ac5 1px solid;
-}
-
-.SC_FieldOver .SC_FieldButton
-{
- border-left: #316ac5 1px solid;
-}
-
-/*
- ### Color Selector Panel
-*/
-
-.ColorBoxBorder
-{
- border: #808080 1px solid;
- position: static;
-}
-
-.ColorBox
-{
- font-size: 1px;
- width: 10px;
- position: static;
- height: 10px;
-}
-
-.ColorDeselected, .ColorSelected
-{
- cursor: default;
-}
-
-.ColorDeselected
-{
- border: #ffffff 1px solid;
- padding: 2px;
- float: left;
-}
-
-.ColorSelected
-{
- border: #316ac5 1px solid;
- padding: 2px;
- float: left;
- background-color: #c1d2ee;
-}
+ background-color: #ffffff;
+}
+
+.SC_Panel, .SC_Panel TD
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.SC_Item, .SC_ItemSelected
+{
+ margin-top: 2px;
+ margin-bottom: 2px;
+ background-position: left center;
+ padding-left: 11px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ background-repeat: no-repeat;
+ border: #dddddd 1px solid;
+}
+
+.SC_Item *, .SC_ItemSelected *
+{
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
+.SC_ItemSelected
+{
+ border: #9a9afb 1px solid;
+ background-image: url(images/toolbar.arrowright.gif);
+}
+
+.SC_ItemOver
+{
+ border: #404040 1px solid;
+}
+
+.SC_Field
+{
+ border: #b7b7a6 1px solid;
+ cursor: default;
+}
+
+.SC_FieldCaption
+{
+ overflow: visible;
+ padding-right: 5px;
+ padding-left: 5px;
+ opacity: 0.75; /* Safari, Opera and Mozilla */
+ filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
+ height: 23px;
+ background-color: #f7f7f7;
+}
+
+.SC_FieldLabel
+{
+ white-space: nowrap;
+ padding: 2px;
+ width: 100%;
+ cursor: default;
+ background-color: #ffffff;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.SC_FieldButton
+{
+ background-position: center center;
+ background-image: url(images/toolbar.buttonarrow.gif);
+ border-left: #b7b7a6 1px solid;
+ width: 14px;
+ background-repeat: no-repeat;
+}
+
+.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
+{
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+ filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
+}
+
+.SC_FieldOver
+{
+ border: #316ac5 1px solid;
+}
+
+.SC_FieldOver .SC_FieldButton
+{
+ border-left: #316ac5 1px solid;
+}
+
+/*
+ ### Color Selector Panel
+*/
+
+.ColorBoxBorder
+{
+ border: #808080 1px solid;
+ position: static;
+}
+
+.ColorBox
+{
+ font-size: 1px;
+ width: 10px;
+ position: static;
+ height: 10px;
+}
+
+.ColorDeselected, .ColorSelected
+{
+ cursor: default;
+}
+
+.ColorDeselected
+{
+ border: #ffffff 1px solid;
+ padding: 2px;
+ float: left;
+}
+
+.ColorSelected
+{
+ border: #316ac5 1px solid;
+ padding: 2px;
+ float: left;
+ background-color: #c1d2ee;
+}
diff --git a/htdocs/theme/bureau2crea/fckeditor/fck_dialog.css b/htdocs/theme/bureau2crea/fckeditor/fck_dialog.css
index 4582b89bf81..35d0fc0b180 100644
--- a/htdocs/theme/bureau2crea/fckeditor/fck_dialog.css
+++ b/htdocs/theme/bureau2crea/fckeditor/fck_dialog.css
@@ -1,4 +1,4 @@
-/*
+/*
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
diff --git a/htdocs/theme/bureau2crea/fckeditor/fck_editor.css b/htdocs/theme/bureau2crea/fckeditor/fck_editor.css
index 3452f3aef39..8ba21189397 100644
--- a/htdocs/theme/bureau2crea/fckeditor/fck_editor.css
+++ b/htdocs/theme/bureau2crea/fckeditor/fck_editor.css
@@ -1,4 +1,4 @@
-/*
+/*
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
diff --git a/htdocs/theme/cameleo/fckeditor/fck_dialog.css b/htdocs/theme/cameleo/fckeditor/fck_dialog.css
index 53f16ef8d3c..35d0fc0b180 100644
--- a/htdocs/theme/cameleo/fckeditor/fck_dialog.css
+++ b/htdocs/theme/cameleo/fckeditor/fck_dialog.css
@@ -1,402 +1,402 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the dialog boxes.
- */
-
-html, body
-{
- background-color: transparent;
- margin: 0px;
- padding: 0px;
-}
-
-body
-{
- padding: 10px;
-}
-
-body, td, input, select, textarea
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
-}
-
-body, .BackColor
-{
- background-color: #f7f7f7;
-}
-
-.PopupBody
-{
- height: 100%;
- width: 100%;
- overflow: hidden;
- background-color: transparent;
- padding: 0px;
-}
-
-#header
-{
- cursor: move;
-}
-
-.PopupTitle
-{
- font-weight: bold;
- font-size: 14pt;
- color: #504845;
- background-color: #dedede;
- padding: 3px 10px 3px 10px;
-}
-
-.PopupButtons
-{
- position: absolute;
- right: 0px;
- left: 0px;
- bottom: 0px;
- border-top: #cec6b5 1px solid;
- background-color: #DEDEDE;
- padding: 7px 10px 7px 10px;
-}
-
-.Button
-{
- border: #7a7261 1px solid;
- color: #504845;
- background-color: #cec6b5;
-}
-
-#btnOk
-{
- width: 100px;
-}
-
-.DarkBackground
-{
- background-color: #f2f2f2;
-}
-
-.LightBackground
-{
- background-color: #ffffbe;
-}
-
-.PopupTitleBorder
-{
- border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTabArea
-{
- color: #504845;
- background-color: #DEDEDE;
-}
-
-.PopupTabEmptyArea
-{
- padding-left: 10px ;
- border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTab, .PopupTabSelected
-{
- border-right: #cec6b5 1px solid;
- border-top: #cec6b5 1px solid;
- border-left: #cec6b5 1px solid;
- padding: 3px 5px 3px 5px;
- color: #504845;
-}
-
-.PopupTab
-{
- margin-top: 1px;
- border-bottom: #cec6b5 1px solid;
- cursor: pointer;
- cursor: hand;
-}
-
-.PopupTabSelected
-{
- font-weight:bold;
- cursor: default;
- padding-top: 4px;
- border-bottom: #f1f1e3 1px solid;
- background-color: #f7f7f7;
-}
-
-.PopupSelectionBox
-{
- border: #a9a9a9 1px solid !important;
- background-color: #dcdcdc !important;
- cursor: pointer;
- cursor: hand;
-}
-
-#tdBrowse
-{
- vertical-align: bottom;
-}
-
-/**
- * Dialog frame related styles.
- */
-
-.contents
-{
- position: absolute;
- top: 2px;
- left: 16px;
- right: 16px;
- bottom: 20px;
- background-color: #f7f7f7;
- overflow: hidden;
- z-index: 1;
-}
-
-.tl, .tr, .tc, .bl, .br, .bc
-{
- position: absolute;
- background-image: url(images/sprites.png);
- background-repeat: no-repeat;
-}
-
-* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
-{
- background-image: url(images/sprites.gif);
-}
-
-.ml, .mr
-{
- position: absolute;
- background-image: url(images/dialog.sides.png);
- background-repeat: repeat-y;
-}
-
-* html .ml, * html .mr
-{
- background-image: url(images/dialog.sides.gif);
-}
-
-.rtl .ml, .rtl .mr
-{
- position: absolute;
- background-image: url(images/dialog.sides.rtl.png);
- background-repeat: repeat-y;
-}
-
-* html .rtl .ml, * html .rtl .mr
-{
- background-image: url(images/dialog.sides.gif);
-}
-
-.tl
-{
- top: 0px;
- left: 0px;
- width: 16px;
- height: 16px;
- background-position: -16px -16px;
-}
-
-.rtl .tl
-{
- background-position: -16px -397px;
-}
-
-.tr
-{
- top: 0px;
- right: 0px;
- width: 16px;
- height: 16px;
- background-position: -16px -76px;
-}
-
-.rtl .tr
-{
- background-position: -16px -457px;
-}
-
-.tc
-{
- top: 0px;
- right: 16px;
- left: 16px;
- height: 16px;
- background-position: 0px -136px;
- background-repeat: repeat-x;
-}
-
-.ml
-{
- top: 16px;
- left: 0px;
- width: 16px;
- bottom: 51px;
- background-position: 0px 0px;
-}
-
-.mr
-{
- top: 16px;
- right: 0px;
- width: 16px;
- bottom: 51px;
- background-position: -16px 0px;
-}
-
-.bl
-{
- bottom: 0px;
- left: 0px;
- width: 30px;
- height: 51px;
- background-position: -16px -196px;
-}
-
-.rtl .bl
-{
- background-position: -16px -517px;
-}
-
-.br
-{
- bottom: 0px;
- right: 0px;
- width: 30px;
- height: 51px;
- background-position: -16px -263px;
-}
-
-.rtl .br
-{
- background-position: -16px -584px;
-}
-
-.bc
-{
- bottom: 0px;
- right: 30px;
- left: 30px;
- height: 51px;
- background-position: 0px -330px;
- background-repeat: repeat-x;
-}
-
-/* For IE6. Do not change it. */
-* html .blocker
-{
- position: absolute;
- width: 100%;
- height: 100%;
- z-index: 12;
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
-}
-
-/* The layer used to cover the dialog when opening a child dialog. */
-.cover
-{
- position: absolute;
- top: 0px;
- left: 14px;
- right: 14px;
- bottom: 18px;
- z-index: 11;
-}
-
-#closeButton
-{
- position: absolute;
- right: 0px;
- top: 0px;
- margin-top: 5px;
- margin-right: 10px;
- width: 20px;
- height: 20px;
- cursor: pointer;
- background-image: url(images/sprites.png);
- background-repeat: no-repeat;
- background-position: -16px -651px;
-}
-
-* html #closeButton
-{
- cursor: hand;
- background-image: url(images/sprites.gif);
-}
-
-.rtl #closeButton
-{
- right: auto;
- left: 10px;
- margin-right: 0px;
-}
-
-#closeButton:hover
-{
- background-position: -16px -687px;
-}
-
-#throbberBlock
-{
- z-index: 10;
-}
-
-#throbberBlock div
-{
- float: left;
- width: 8px;
- height: 9px;
- margin-left: 2px;
- margin-right: 2px;
- font-size: 1px; /* IE6 */
-}
-
-/*
- Color Gradient Generator:
- http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
-*/
-
-.throbber_1
-{
- background-color: #504845;
-}
-
-.throbber_2
-{
- background-color: #736D6B;
-}
-
-.throbber_3
-{
- background-color: #979391;
-}
-
-.throbber_4
-{
- background-color: #BAB8B7;
-}
-
-.throbber_5
-{
- background-color: #DEDEDE;
-}
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the dialog boxes.
+ */
+
+html, body
+{
+ background-color: transparent;
+ margin: 0px;
+ padding: 0px;
+}
+
+body
+{
+ padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+body, .BackColor
+{
+ background-color: #f7f7f7;
+}
+
+.PopupBody
+{
+ height: 100%;
+ width: 100%;
+ overflow: hidden;
+ background-color: transparent;
+ padding: 0px;
+}
+
+#header
+{
+ cursor: move;
+}
+
+.PopupTitle
+{
+ font-weight: bold;
+ font-size: 14pt;
+ color: #504845;
+ background-color: #dedede;
+ padding: 3px 10px 3px 10px;
+}
+
+.PopupButtons
+{
+ position: absolute;
+ right: 0px;
+ left: 0px;
+ bottom: 0px;
+ border-top: #cec6b5 1px solid;
+ background-color: #DEDEDE;
+ padding: 7px 10px 7px 10px;
+}
+
+.Button
+{
+ border: #7a7261 1px solid;
+ color: #504845;
+ background-color: #cec6b5;
+}
+
+#btnOk
+{
+ width: 100px;
+}
+
+.DarkBackground
+{
+ background-color: #f2f2f2;
+}
+
+.LightBackground
+{
+ background-color: #ffffbe;
+}
+
+.PopupTitleBorder
+{
+ border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTabArea
+{
+ color: #504845;
+ background-color: #DEDEDE;
+}
+
+.PopupTabEmptyArea
+{
+ padding-left: 10px ;
+ border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+ border-right: #cec6b5 1px solid;
+ border-top: #cec6b5 1px solid;
+ border-left: #cec6b5 1px solid;
+ padding: 3px 5px 3px 5px;
+ color: #504845;
+}
+
+.PopupTab
+{
+ margin-top: 1px;
+ border-bottom: #cec6b5 1px solid;
+ cursor: pointer;
+ cursor: hand;
+}
+
+.PopupTabSelected
+{
+ font-weight:bold;
+ cursor: default;
+ padding-top: 4px;
+ border-bottom: #f1f1e3 1px solid;
+ background-color: #f7f7f7;
+}
+
+.PopupSelectionBox
+{
+ border: #a9a9a9 1px solid !important;
+ background-color: #dcdcdc !important;
+ cursor: pointer;
+ cursor: hand;
+}
+
+#tdBrowse
+{
+ vertical-align: bottom;
+}
+
+/**
+ * Dialog frame related styles.
+ */
+
+.contents
+{
+ position: absolute;
+ top: 2px;
+ left: 16px;
+ right: 16px;
+ bottom: 20px;
+ background-color: #f7f7f7;
+ overflow: hidden;
+ z-index: 1;
+}
+
+.tl, .tr, .tc, .bl, .br, .bc
+{
+ position: absolute;
+ background-image: url(images/sprites.png);
+ background-repeat: no-repeat;
+}
+
+* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
+{
+ background-image: url(images/sprites.gif);
+}
+
+.ml, .mr
+{
+ position: absolute;
+ background-image: url(images/dialog.sides.png);
+ background-repeat: repeat-y;
+}
+
+* html .ml, * html .mr
+{
+ background-image: url(images/dialog.sides.gif);
+}
+
+.rtl .ml, .rtl .mr
+{
+ position: absolute;
+ background-image: url(images/dialog.sides.rtl.png);
+ background-repeat: repeat-y;
+}
+
+* html .rtl .ml, * html .rtl .mr
+{
+ background-image: url(images/dialog.sides.gif);
+}
+
+.tl
+{
+ top: 0px;
+ left: 0px;
+ width: 16px;
+ height: 16px;
+ background-position: -16px -16px;
+}
+
+.rtl .tl
+{
+ background-position: -16px -397px;
+}
+
+.tr
+{
+ top: 0px;
+ right: 0px;
+ width: 16px;
+ height: 16px;
+ background-position: -16px -76px;
+}
+
+.rtl .tr
+{
+ background-position: -16px -457px;
+}
+
+.tc
+{
+ top: 0px;
+ right: 16px;
+ left: 16px;
+ height: 16px;
+ background-position: 0px -136px;
+ background-repeat: repeat-x;
+}
+
+.ml
+{
+ top: 16px;
+ left: 0px;
+ width: 16px;
+ bottom: 51px;
+ background-position: 0px 0px;
+}
+
+.mr
+{
+ top: 16px;
+ right: 0px;
+ width: 16px;
+ bottom: 51px;
+ background-position: -16px 0px;
+}
+
+.bl
+{
+ bottom: 0px;
+ left: 0px;
+ width: 30px;
+ height: 51px;
+ background-position: -16px -196px;
+}
+
+.rtl .bl
+{
+ background-position: -16px -517px;
+}
+
+.br
+{
+ bottom: 0px;
+ right: 0px;
+ width: 30px;
+ height: 51px;
+ background-position: -16px -263px;
+}
+
+.rtl .br
+{
+ background-position: -16px -584px;
+}
+
+.bc
+{
+ bottom: 0px;
+ right: 30px;
+ left: 30px;
+ height: 51px;
+ background-position: 0px -330px;
+ background-repeat: repeat-x;
+}
+
+/* For IE6. Do not change it. */
+* html .blocker
+{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: 12;
+ filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+}
+
+/* The layer used to cover the dialog when opening a child dialog. */
+.cover
+{
+ position: absolute;
+ top: 0px;
+ left: 14px;
+ right: 14px;
+ bottom: 18px;
+ z-index: 11;
+}
+
+#closeButton
+{
+ position: absolute;
+ right: 0px;
+ top: 0px;
+ margin-top: 5px;
+ margin-right: 10px;
+ width: 20px;
+ height: 20px;
+ cursor: pointer;
+ background-image: url(images/sprites.png);
+ background-repeat: no-repeat;
+ background-position: -16px -651px;
+}
+
+* html #closeButton
+{
+ cursor: hand;
+ background-image: url(images/sprites.gif);
+}
+
+.rtl #closeButton
+{
+ right: auto;
+ left: 10px;
+ margin-right: 0px;
+}
+
+#closeButton:hover
+{
+ background-position: -16px -687px;
+}
+
+#throbberBlock
+{
+ z-index: 10;
+}
+
+#throbberBlock div
+{
+ float: left;
+ width: 8px;
+ height: 9px;
+ margin-left: 2px;
+ margin-right: 2px;
+ font-size: 1px; /* IE6 */
+}
+
+/*
+ Color Gradient Generator:
+ http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
+*/
+
+.throbber_1
+{
+ background-color: #504845;
+}
+
+.throbber_2
+{
+ background-color: #736D6B;
+}
+
+.throbber_3
+{
+ background-color: #979391;
+}
+
+.throbber_4
+{
+ background-color: #BAB8B7;
+}
+
+.throbber_5
+{
+ background-color: #DEDEDE;
+}
diff --git a/htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js b/htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js
index 4fc9ba66f52..804cc8d24de 100644
--- a/htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js
+++ b/htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js
@@ -1,110 +1,110 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- */
-
-(function()
-{
- // IE6 doens't handle absolute positioning properly (it is always in quirks
- // mode). This function fixes the sizes and positions of many elements that
- // compose the skin (this is skin specific).
- var fixSizes = window.DoResizeFixes = function()
- {
- var fckDlg = window.document.body ;
-
- for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
- {
- var child = fckDlg.childNodes[i] ;
- switch ( child.className )
- {
- case 'contents' :
- child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
- child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
- break ;
-
- case 'blocker' :
- case 'cover' :
- child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
- child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
- break ;
-
- case 'tr' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 16);
- break ;
-
- case 'tc' :
- child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
- break ;
-
- case 'ml' :
- child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
- break ;
-
- case 'mr' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 16);
- child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
- break ;
-
- case 'bl' :
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
-
- case 'br' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 30);
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
-
- case 'bc' :
- child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
- }
- }
- }
-
- var closeButtonOver = function()
- {
- this.style.backgroundPosition = '-16px -687px' ;
- } ;
-
- var closeButtonOut = function()
- {
- this.style.backgroundPosition = '-16px -651px' ;
- } ;
-
- var fixCloseButton = function()
- {
- var closeButton = document.getElementById ('closeButton');
-
- closeButton.onmouseover = closeButtonOver ;
- closeButton.onmouseout = closeButtonOut ;
- }
-
- var onLoad = function()
- {
- fixSizes() ;
- fixCloseButton() ;
-
- window.attachEvent('onresize', fixSizes);
- window.detachEvent('onload', onLoad);
- }
-
- window.attachEvent('onload', onLoad);
-
-})() ;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+(function()
+{
+ // IE6 doens't handle absolute positioning properly (it is always in quirks
+ // mode). This function fixes the sizes and positions of many elements that
+ // compose the skin (this is skin specific).
+ var fixSizes = window.DoResizeFixes = function()
+ {
+ var fckDlg = window.document.body ;
+
+ for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
+ {
+ var child = fckDlg.childNodes[i] ;
+ switch ( child.className )
+ {
+ case 'contents' :
+ child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
+ child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
+ break ;
+
+ case 'blocker' :
+ case 'cover' :
+ child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
+ child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
+ break ;
+
+ case 'tr' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 16);
+ break ;
+
+ case 'tc' :
+ child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
+ break ;
+
+ case 'ml' :
+ child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
+ break ;
+
+ case 'mr' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 16);
+ child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
+ break ;
+
+ case 'bl' :
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+
+ case 'br' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 30);
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+
+ case 'bc' :
+ child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+ }
+ }
+ }
+
+ var closeButtonOver = function()
+ {
+ this.style.backgroundPosition = '-16px -687px' ;
+ } ;
+
+ var closeButtonOut = function()
+ {
+ this.style.backgroundPosition = '-16px -651px' ;
+ } ;
+
+ var fixCloseButton = function()
+ {
+ var closeButton = document.getElementById ('closeButton');
+
+ closeButton.onmouseover = closeButtonOver ;
+ closeButton.onmouseout = closeButtonOut ;
+ }
+
+ var onLoad = function()
+ {
+ fixSizes() ;
+ fixCloseButton() ;
+
+ window.attachEvent('onresize', fixSizes);
+ window.detachEvent('onload', onLoad);
+ }
+
+ window.attachEvent('onload', onLoad);
+
+})() ;
diff --git a/htdocs/theme/cameleo/fckeditor/fck_editor.css b/htdocs/theme/cameleo/fckeditor/fck_editor.css
index 0862d375fe6..8ba21189397 100644
--- a/htdocs/theme/cameleo/fckeditor/fck_editor.css
+++ b/htdocs/theme/cameleo/fckeditor/fck_editor.css
@@ -1,465 +1,465 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the editor IFRAME and Toolbar.
- */
-
-/*
- ### Basic Editor IFRAME Styles.
-*/
-
-body
-{
- padding: 1px;
- margin: 0;
- background-color: #ffffff;
-}
-
-#xEditingArea
-{
- border: #696969 1px solid;
-}
-
-.SourceField
-{
- padding: 5px;
- margin: 0px;
- font-family: Monospace;
-}
-
-/*
- Toolbar
-*/
-
-.TB_ToolbarSet, .TB_Expand, .TB_Collapse
-{
- cursor: default;
- background-color: #f7f7f7;
-}
-
-.TB_ToolbarSet
-{
- border-top: #f7f7f7 1px outset;
- border-bottom: #f7f7f7 1px outset;
-}
-
-.TB_ToolbarSet TD
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.TB_Toolbar
-{
- height: 24px;
- display: inline-table; /* inline = Opera jumping buttons bug */
-}
-
-.TB_Separator
-{
- width: 1px;
- height: 16px;
- margin: 2px;
- background-color: #999966;
-}
-
-.TB_Start
-{
- background-image: url(images/toolbar.start.gif);
- margin: 2px;
- width: 3px;
- background-repeat: no-repeat;
- height: 16px;
-}
-
-.TB_End
-{
- display: none;
-}
-
-.TB_ExpandImg
-{
- background-image: url(images/toolbar.expand.gif);
- background-repeat: no-repeat;
-}
-
-.TB_CollapseImg
-{
- background-image: url(images/toolbar.collapse.gif);
- background-repeat: no-repeat;
-}
-
-.TB_SideBorder
-{
- background-color: #696969;
-}
-
-.TB_Expand, .TB_Collapse
-{
- padding: 2px 2px 2px 2px;
- border: #f7f7f7 1px outset;
-}
-
-.TB_Collapse
-{
- width: 5px;
-}
-
-.TB_Break
-{
- height: 24px; /* IE needs the height to be set, otherwise no break */
-}
-
-/*
- Toolbar Button
-*/
-
-.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
-{
- border: #f7f7f7 1px solid; /* This is the default border */
- height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
-}
-
-.TB_Button_On
-{
- border: #316ac5 1px solid;
- background-color: #c1d2ee;
-}
-
-.TB_Button_On_Over, .TB_Button_Off_Over
-{
- border: #316ac5 1px solid;
- background-color: #dff1ff;
-}
-
-.TB_Button_Off
-{
- filter: alpha(opacity=70); /* IE */
- opacity: 0.70; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Disabled
-{
- filter: gray() alpha(opacity=30); /* IE */
- opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Padding
-{
- visibility: hidden;
- width: 3px;
- height: 22px;
-}
-
-.TB_Button_Image
-{
- overflow: hidden;
- width: 16px;
- height: 16px;
- margin: 3px;
- background-repeat: no-repeat;
-}
-
-.TB_Button_Image img
-{
- position: relative;
-}
-
-.TB_Button_Off .TB_Button_Text
-{
- background-color: #f7f7f7; /* Needed because of a bug on Clear Type */
-}
-
-.TB_ConnectionLine
-{
- background-color: #ffffff;
- height: 1px;
- margin-left: 1px; /* ltr */
- margin-right: 1px; /* rtl */
-}
-
-.TB_Text
-{
- height: 22px;
-}
-
-.TB_Button_Off .TB_Text
-{
- background-color: #f7f7f7 ; /* Needed because of a bug on ClearType */
-}
-
-.TB_Button_On_Over .TB_Text
-{
- background-color: #dff1ff ; /* Needed because of a bug on ClearType */
-}
-
-/*
- Menu
-*/
-
-.MN_Menu
-{
- border: 1px solid #8f8f73;
- padding: 2px;
- background-color: #ffffff;
- cursor: default;
-}
-
-.MN_Menu, .MN_Menu .MN_Label
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.MN_Item_Padding
-{
- visibility: hidden;
- width: 3px;
- height: 20px;
-}
-
-.MN_Icon
-{
- background-color: #dedede;
- text-align: center;
- height: 20px;
-}
-
-.MN_Label
-{
- padding-left: 3px;
- padding-right: 3px;
-}
-
-.MN_Separator
-{
- height: 3px;
-}
-
-.MN_Separator_Line
-{
- border-top: #b9b99d 1px solid;
-}
-
-.MN_Item .MN_Icon IMG
-{
- filter: alpha(opacity=70);
- opacity: 0.70;
-}
-
-.MN_Item_Over
-{
- color: #ffffff;
- background-color: #8a857d;
-}
-
-.MN_Item_Over .MN_Icon
-{
- background-color: #6c6761;
-}
-
-.MN_Item_Disabled IMG
-{
- filter: gray() alpha(opacity=30); /* IE */
- opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.MN_Item_Disabled .MN_Label
-{
- color: #b7b7b7;
-}
-
-.MN_Arrow
-{
- padding-right: 3px;
- padding-left: 3px;
-}
-
-.MN_ConnectionLine
-{
- background-color: #ffffff;
-}
-
-.Menu .TB_Button_On, .Menu .TB_Button_On_Over
-{
- border: #8f8f73 1px solid;
- background-color: #ffffff;
-}
-
-/*
- ### Panel Styles
-*/
-
-.FCK_Panel
-{
- border: #8f8f73 1px solid;
- padding: 2px;
- background-color: #ffffff;
-}
-
-.FCK_Panel, .FCK_Panel TD
-{
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
- font-size: 11px;
-}
-
-/*
- ### Special Combos
-*/
-
-.SC_Panel
-{
- overflow: auto;
- white-space: nowrap;
- cursor: default;
- border: 1px solid #8f8f73;
- padding-left: 2px;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the editor IFRAME and Toolbar.
+ */
+
+/*
+ ### Basic Editor IFRAME Styles.
+*/
+
+body
+{
+ padding: 1px;
+ margin: 0;
+ background-color: #ffffff;
+}
+
+#xEditingArea
+{
+ border: #696969 1px solid;
+}
+
+.SourceField
+{
+ padding: 5px;
+ margin: 0px;
+ font-family: Monospace;
+}
+
+/*
+ Toolbar
+*/
+
+.TB_ToolbarSet, .TB_Expand, .TB_Collapse
+{
+ cursor: default;
+ background-color: #f7f7f7;
+}
+
+.TB_ToolbarSet
+{
+ border-top: #f7f7f7 1px outset;
+ border-bottom: #f7f7f7 1px outset;
+}
+
+.TB_ToolbarSet TD
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.TB_Toolbar
+{
+ height: 24px;
+ display: inline-table; /* inline = Opera jumping buttons bug */
+}
+
+.TB_Separator
+{
+ width: 1px;
+ height: 16px;
+ margin: 2px;
+ background-color: #999966;
+}
+
+.TB_Start
+{
+ background-image: url(images/toolbar.start.gif);
+ margin: 2px;
+ width: 3px;
+ background-repeat: no-repeat;
+ height: 16px;
+}
+
+.TB_End
+{
+ display: none;
+}
+
+.TB_ExpandImg
+{
+ background-image: url(images/toolbar.expand.gif);
+ background-repeat: no-repeat;
+}
+
+.TB_CollapseImg
+{
+ background-image: url(images/toolbar.collapse.gif);
+ background-repeat: no-repeat;
+}
+
+.TB_SideBorder
+{
+ background-color: #696969;
+}
+
+.TB_Expand, .TB_Collapse
+{
+ padding: 2px 2px 2px 2px;
+ border: #f7f7f7 1px outset;
+}
+
+.TB_Collapse
+{
+ width: 5px;
+}
+
+.TB_Break
+{
+ height: 24px; /* IE needs the height to be set, otherwise no break */
+}
+
+/*
+ Toolbar Button
+*/
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+ border: #f7f7f7 1px solid; /* This is the default border */
+ height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
+}
+
+.TB_Button_On
+{
+ border: #316ac5 1px solid;
+ background-color: #c1d2ee;
+}
+
+.TB_Button_On_Over, .TB_Button_Off_Over
+{
+ border: #316ac5 1px solid;
+ background-color: #dff1ff;
+}
+
+.TB_Button_Off
+{
+ filter: alpha(opacity=70); /* IE */
+ opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Disabled
+{
+ filter: gray() alpha(opacity=30); /* IE */
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Padding
+{
+ visibility: hidden;
+ width: 3px;
+ height: 22px;
+}
+
+.TB_Button_Image
+{
+ overflow: hidden;
+ width: 16px;
+ height: 16px;
+ margin: 3px;
+ background-repeat: no-repeat;
+}
+
+.TB_Button_Image img
+{
+ position: relative;
+}
+
+.TB_Button_Off .TB_Button_Text
+{
+ background-color: #f7f7f7; /* Needed because of a bug on Clear Type */
+}
+
+.TB_ConnectionLine
+{
+ background-color: #ffffff;
+ height: 1px;
+ margin-left: 1px; /* ltr */
+ margin-right: 1px; /* rtl */
+}
+
+.TB_Text
+{
+ height: 22px;
+}
+
+.TB_Button_Off .TB_Text
+{
+ background-color: #f7f7f7 ; /* Needed because of a bug on ClearType */
+}
+
+.TB_Button_On_Over .TB_Text
+{
+ background-color: #dff1ff ; /* Needed because of a bug on ClearType */
+}
+
+/*
+ Menu
+*/
+
+.MN_Menu
+{
+ border: 1px solid #8f8f73;
+ padding: 2px;
+ background-color: #ffffff;
+ cursor: default;
+}
+
+.MN_Menu, .MN_Menu .MN_Label
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.MN_Item_Padding
+{
+ visibility: hidden;
+ width: 3px;
+ height: 20px;
+}
+
+.MN_Icon
+{
+ background-color: #dedede;
+ text-align: center;
+ height: 20px;
+}
+
+.MN_Label
+{
+ padding-left: 3px;
+ padding-right: 3px;
+}
+
+.MN_Separator
+{
+ height: 3px;
+}
+
+.MN_Separator_Line
+{
+ border-top: #b9b99d 1px solid;
+}
+
+.MN_Item .MN_Icon IMG
+{
+ filter: alpha(opacity=70);
+ opacity: 0.70;
+}
+
+.MN_Item_Over
+{
+ color: #ffffff;
+ background-color: #8a857d;
+}
+
+.MN_Item_Over .MN_Icon
+{
+ background-color: #6c6761;
+}
+
+.MN_Item_Disabled IMG
+{
+ filter: gray() alpha(opacity=30); /* IE */
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.MN_Item_Disabled .MN_Label
+{
+ color: #b7b7b7;
+}
+
+.MN_Arrow
+{
+ padding-right: 3px;
+ padding-left: 3px;
+}
+
+.MN_ConnectionLine
+{
+ background-color: #ffffff;
+}
+
+.Menu .TB_Button_On, .Menu .TB_Button_On_Over
+{
+ border: #8f8f73 1px solid;
+ background-color: #ffffff;
+}
+
+/*
+ ### Panel Styles
+*/
+
+.FCK_Panel
+{
+ border: #8f8f73 1px solid;
+ padding: 2px;
+ background-color: #ffffff;
+}
+
+.FCK_Panel, .FCK_Panel TD
+{
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+ font-size: 11px;
+}
+
+/*
+ ### Special Combos
+*/
+
+.SC_Panel
+{
+ overflow: auto;
+ white-space: nowrap;
+ cursor: default;
+ border: 1px solid #8f8f73;
+ padding-left: 2px;
padding-right: 2px;
- background-color: #ffffff;
-}
-
-.SC_Panel, .SC_Panel TD
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.SC_Item, .SC_ItemSelected
-{
- margin-top: 2px;
- margin-bottom: 2px;
- background-position: left center;
- padding-left: 11px;
- padding-right: 3px;
- padding-top: 2px;
- padding-bottom: 2px;
- text-overflow: ellipsis;
- overflow: hidden;
- background-repeat: no-repeat;
- border: #dddddd 1px solid;
-}
-
-.SC_Item *, .SC_ItemSelected *
-{
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-.SC_ItemSelected
-{
- border: #9a9afb 1px solid;
- background-image: url(images/toolbar.arrowright.gif);
-}
-
-.SC_ItemOver
-{
- border: #404040 1px solid;
-}
-
-.SC_Field
-{
- border: #b7b7a6 1px solid;
- cursor: default;
-}
-
-.SC_FieldCaption
-{
- overflow: visible;
- padding-right: 5px;
- padding-left: 5px;
- opacity: 0.75; /* Safari, Opera and Mozilla */
- filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
- height: 23px;
- background-color: #f7f7f7;
-}
-
-.SC_FieldLabel
-{
- white-space: nowrap;
- padding: 2px;
- width: 100%;
- cursor: default;
- background-color: #ffffff;
- text-overflow: ellipsis;
- overflow: hidden;
-}
-
-.SC_FieldButton
-{
- background-position: center center;
- background-image: url(images/toolbar.buttonarrow.gif);
- border-left: #b7b7a6 1px solid;
- width: 14px;
- background-repeat: no-repeat;
-}
-
-.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
-{
- opacity: 0.30; /* Safari, Opera and Mozilla */
- filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
-}
-
-.SC_FieldOver
-{
- border: #316ac5 1px solid;
-}
-
-.SC_FieldOver .SC_FieldButton
-{
- border-left: #316ac5 1px solid;
-}
-
-/*
- ### Color Selector Panel
-*/
-
-.ColorBoxBorder
-{
- border: #808080 1px solid;
- position: static;
-}
-
-.ColorBox
-{
- font-size: 1px;
- width: 10px;
- position: static;
- height: 10px;
-}
-
-.ColorDeselected, .ColorSelected
-{
- cursor: default;
-}
-
-.ColorDeselected
-{
- border: #ffffff 1px solid;
- padding: 2px;
- float: left;
-}
-
-.ColorSelected
-{
- border: #316ac5 1px solid;
- padding: 2px;
- float: left;
- background-color: #c1d2ee;
-}
+ background-color: #ffffff;
+}
+
+.SC_Panel, .SC_Panel TD
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.SC_Item, .SC_ItemSelected
+{
+ margin-top: 2px;
+ margin-bottom: 2px;
+ background-position: left center;
+ padding-left: 11px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ background-repeat: no-repeat;
+ border: #dddddd 1px solid;
+}
+
+.SC_Item *, .SC_ItemSelected *
+{
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
+.SC_ItemSelected
+{
+ border: #9a9afb 1px solid;
+ background-image: url(images/toolbar.arrowright.gif);
+}
+
+.SC_ItemOver
+{
+ border: #404040 1px solid;
+}
+
+.SC_Field
+{
+ border: #b7b7a6 1px solid;
+ cursor: default;
+}
+
+.SC_FieldCaption
+{
+ overflow: visible;
+ padding-right: 5px;
+ padding-left: 5px;
+ opacity: 0.75; /* Safari, Opera and Mozilla */
+ filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
+ height: 23px;
+ background-color: #f7f7f7;
+}
+
+.SC_FieldLabel
+{
+ white-space: nowrap;
+ padding: 2px;
+ width: 100%;
+ cursor: default;
+ background-color: #ffffff;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.SC_FieldButton
+{
+ background-position: center center;
+ background-image: url(images/toolbar.buttonarrow.gif);
+ border-left: #b7b7a6 1px solid;
+ width: 14px;
+ background-repeat: no-repeat;
+}
+
+.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
+{
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+ filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
+}
+
+.SC_FieldOver
+{
+ border: #316ac5 1px solid;
+}
+
+.SC_FieldOver .SC_FieldButton
+{
+ border-left: #316ac5 1px solid;
+}
+
+/*
+ ### Color Selector Panel
+*/
+
+.ColorBoxBorder
+{
+ border: #808080 1px solid;
+ position: static;
+}
+
+.ColorBox
+{
+ font-size: 1px;
+ width: 10px;
+ position: static;
+ height: 10px;
+}
+
+.ColorDeselected, .ColorSelected
+{
+ cursor: default;
+}
+
+.ColorDeselected
+{
+ border: #ffffff 1px solid;
+ padding: 2px;
+ float: left;
+}
+
+.ColorSelected
+{
+ border: #316ac5 1px solid;
+ padding: 2px;
+ float: left;
+ background-color: #c1d2ee;
+}
diff --git a/htdocs/theme/eldy/fckeditor/fck_dialog.css b/htdocs/theme/eldy/fckeditor/fck_dialog.css
index 53f16ef8d3c..35d0fc0b180 100644
--- a/htdocs/theme/eldy/fckeditor/fck_dialog.css
+++ b/htdocs/theme/eldy/fckeditor/fck_dialog.css
@@ -1,402 +1,402 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the dialog boxes.
- */
-
-html, body
-{
- background-color: transparent;
- margin: 0px;
- padding: 0px;
-}
-
-body
-{
- padding: 10px;
-}
-
-body, td, input, select, textarea
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
-}
-
-body, .BackColor
-{
- background-color: #f7f7f7;
-}
-
-.PopupBody
-{
- height: 100%;
- width: 100%;
- overflow: hidden;
- background-color: transparent;
- padding: 0px;
-}
-
-#header
-{
- cursor: move;
-}
-
-.PopupTitle
-{
- font-weight: bold;
- font-size: 14pt;
- color: #504845;
- background-color: #dedede;
- padding: 3px 10px 3px 10px;
-}
-
-.PopupButtons
-{
- position: absolute;
- right: 0px;
- left: 0px;
- bottom: 0px;
- border-top: #cec6b5 1px solid;
- background-color: #DEDEDE;
- padding: 7px 10px 7px 10px;
-}
-
-.Button
-{
- border: #7a7261 1px solid;
- color: #504845;
- background-color: #cec6b5;
-}
-
-#btnOk
-{
- width: 100px;
-}
-
-.DarkBackground
-{
- background-color: #f2f2f2;
-}
-
-.LightBackground
-{
- background-color: #ffffbe;
-}
-
-.PopupTitleBorder
-{
- border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTabArea
-{
- color: #504845;
- background-color: #DEDEDE;
-}
-
-.PopupTabEmptyArea
-{
- padding-left: 10px ;
- border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTab, .PopupTabSelected
-{
- border-right: #cec6b5 1px solid;
- border-top: #cec6b5 1px solid;
- border-left: #cec6b5 1px solid;
- padding: 3px 5px 3px 5px;
- color: #504845;
-}
-
-.PopupTab
-{
- margin-top: 1px;
- border-bottom: #cec6b5 1px solid;
- cursor: pointer;
- cursor: hand;
-}
-
-.PopupTabSelected
-{
- font-weight:bold;
- cursor: default;
- padding-top: 4px;
- border-bottom: #f1f1e3 1px solid;
- background-color: #f7f7f7;
-}
-
-.PopupSelectionBox
-{
- border: #a9a9a9 1px solid !important;
- background-color: #dcdcdc !important;
- cursor: pointer;
- cursor: hand;
-}
-
-#tdBrowse
-{
- vertical-align: bottom;
-}
-
-/**
- * Dialog frame related styles.
- */
-
-.contents
-{
- position: absolute;
- top: 2px;
- left: 16px;
- right: 16px;
- bottom: 20px;
- background-color: #f7f7f7;
- overflow: hidden;
- z-index: 1;
-}
-
-.tl, .tr, .tc, .bl, .br, .bc
-{
- position: absolute;
- background-image: url(images/sprites.png);
- background-repeat: no-repeat;
-}
-
-* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
-{
- background-image: url(images/sprites.gif);
-}
-
-.ml, .mr
-{
- position: absolute;
- background-image: url(images/dialog.sides.png);
- background-repeat: repeat-y;
-}
-
-* html .ml, * html .mr
-{
- background-image: url(images/dialog.sides.gif);
-}
-
-.rtl .ml, .rtl .mr
-{
- position: absolute;
- background-image: url(images/dialog.sides.rtl.png);
- background-repeat: repeat-y;
-}
-
-* html .rtl .ml, * html .rtl .mr
-{
- background-image: url(images/dialog.sides.gif);
-}
-
-.tl
-{
- top: 0px;
- left: 0px;
- width: 16px;
- height: 16px;
- background-position: -16px -16px;
-}
-
-.rtl .tl
-{
- background-position: -16px -397px;
-}
-
-.tr
-{
- top: 0px;
- right: 0px;
- width: 16px;
- height: 16px;
- background-position: -16px -76px;
-}
-
-.rtl .tr
-{
- background-position: -16px -457px;
-}
-
-.tc
-{
- top: 0px;
- right: 16px;
- left: 16px;
- height: 16px;
- background-position: 0px -136px;
- background-repeat: repeat-x;
-}
-
-.ml
-{
- top: 16px;
- left: 0px;
- width: 16px;
- bottom: 51px;
- background-position: 0px 0px;
-}
-
-.mr
-{
- top: 16px;
- right: 0px;
- width: 16px;
- bottom: 51px;
- background-position: -16px 0px;
-}
-
-.bl
-{
- bottom: 0px;
- left: 0px;
- width: 30px;
- height: 51px;
- background-position: -16px -196px;
-}
-
-.rtl .bl
-{
- background-position: -16px -517px;
-}
-
-.br
-{
- bottom: 0px;
- right: 0px;
- width: 30px;
- height: 51px;
- background-position: -16px -263px;
-}
-
-.rtl .br
-{
- background-position: -16px -584px;
-}
-
-.bc
-{
- bottom: 0px;
- right: 30px;
- left: 30px;
- height: 51px;
- background-position: 0px -330px;
- background-repeat: repeat-x;
-}
-
-/* For IE6. Do not change it. */
-* html .blocker
-{
- position: absolute;
- width: 100%;
- height: 100%;
- z-index: 12;
- filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
-}
-
-/* The layer used to cover the dialog when opening a child dialog. */
-.cover
-{
- position: absolute;
- top: 0px;
- left: 14px;
- right: 14px;
- bottom: 18px;
- z-index: 11;
-}
-
-#closeButton
-{
- position: absolute;
- right: 0px;
- top: 0px;
- margin-top: 5px;
- margin-right: 10px;
- width: 20px;
- height: 20px;
- cursor: pointer;
- background-image: url(images/sprites.png);
- background-repeat: no-repeat;
- background-position: -16px -651px;
-}
-
-* html #closeButton
-{
- cursor: hand;
- background-image: url(images/sprites.gif);
-}
-
-.rtl #closeButton
-{
- right: auto;
- left: 10px;
- margin-right: 0px;
-}
-
-#closeButton:hover
-{
- background-position: -16px -687px;
-}
-
-#throbberBlock
-{
- z-index: 10;
-}
-
-#throbberBlock div
-{
- float: left;
- width: 8px;
- height: 9px;
- margin-left: 2px;
- margin-right: 2px;
- font-size: 1px; /* IE6 */
-}
-
-/*
- Color Gradient Generator:
- http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
-*/
-
-.throbber_1
-{
- background-color: #504845;
-}
-
-.throbber_2
-{
- background-color: #736D6B;
-}
-
-.throbber_3
-{
- background-color: #979391;
-}
-
-.throbber_4
-{
- background-color: #BAB8B7;
-}
-
-.throbber_5
-{
- background-color: #DEDEDE;
-}
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the dialog boxes.
+ */
+
+html, body
+{
+ background-color: transparent;
+ margin: 0px;
+ padding: 0px;
+}
+
+body
+{
+ padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+body, .BackColor
+{
+ background-color: #f7f7f7;
+}
+
+.PopupBody
+{
+ height: 100%;
+ width: 100%;
+ overflow: hidden;
+ background-color: transparent;
+ padding: 0px;
+}
+
+#header
+{
+ cursor: move;
+}
+
+.PopupTitle
+{
+ font-weight: bold;
+ font-size: 14pt;
+ color: #504845;
+ background-color: #dedede;
+ padding: 3px 10px 3px 10px;
+}
+
+.PopupButtons
+{
+ position: absolute;
+ right: 0px;
+ left: 0px;
+ bottom: 0px;
+ border-top: #cec6b5 1px solid;
+ background-color: #DEDEDE;
+ padding: 7px 10px 7px 10px;
+}
+
+.Button
+{
+ border: #7a7261 1px solid;
+ color: #504845;
+ background-color: #cec6b5;
+}
+
+#btnOk
+{
+ width: 100px;
+}
+
+.DarkBackground
+{
+ background-color: #f2f2f2;
+}
+
+.LightBackground
+{
+ background-color: #ffffbe;
+}
+
+.PopupTitleBorder
+{
+ border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTabArea
+{
+ color: #504845;
+ background-color: #DEDEDE;
+}
+
+.PopupTabEmptyArea
+{
+ padding-left: 10px ;
+ border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+ border-right: #cec6b5 1px solid;
+ border-top: #cec6b5 1px solid;
+ border-left: #cec6b5 1px solid;
+ padding: 3px 5px 3px 5px;
+ color: #504845;
+}
+
+.PopupTab
+{
+ margin-top: 1px;
+ border-bottom: #cec6b5 1px solid;
+ cursor: pointer;
+ cursor: hand;
+}
+
+.PopupTabSelected
+{
+ font-weight:bold;
+ cursor: default;
+ padding-top: 4px;
+ border-bottom: #f1f1e3 1px solid;
+ background-color: #f7f7f7;
+}
+
+.PopupSelectionBox
+{
+ border: #a9a9a9 1px solid !important;
+ background-color: #dcdcdc !important;
+ cursor: pointer;
+ cursor: hand;
+}
+
+#tdBrowse
+{
+ vertical-align: bottom;
+}
+
+/**
+ * Dialog frame related styles.
+ */
+
+.contents
+{
+ position: absolute;
+ top: 2px;
+ left: 16px;
+ right: 16px;
+ bottom: 20px;
+ background-color: #f7f7f7;
+ overflow: hidden;
+ z-index: 1;
+}
+
+.tl, .tr, .tc, .bl, .br, .bc
+{
+ position: absolute;
+ background-image: url(images/sprites.png);
+ background-repeat: no-repeat;
+}
+
+* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
+{
+ background-image: url(images/sprites.gif);
+}
+
+.ml, .mr
+{
+ position: absolute;
+ background-image: url(images/dialog.sides.png);
+ background-repeat: repeat-y;
+}
+
+* html .ml, * html .mr
+{
+ background-image: url(images/dialog.sides.gif);
+}
+
+.rtl .ml, .rtl .mr
+{
+ position: absolute;
+ background-image: url(images/dialog.sides.rtl.png);
+ background-repeat: repeat-y;
+}
+
+* html .rtl .ml, * html .rtl .mr
+{
+ background-image: url(images/dialog.sides.gif);
+}
+
+.tl
+{
+ top: 0px;
+ left: 0px;
+ width: 16px;
+ height: 16px;
+ background-position: -16px -16px;
+}
+
+.rtl .tl
+{
+ background-position: -16px -397px;
+}
+
+.tr
+{
+ top: 0px;
+ right: 0px;
+ width: 16px;
+ height: 16px;
+ background-position: -16px -76px;
+}
+
+.rtl .tr
+{
+ background-position: -16px -457px;
+}
+
+.tc
+{
+ top: 0px;
+ right: 16px;
+ left: 16px;
+ height: 16px;
+ background-position: 0px -136px;
+ background-repeat: repeat-x;
+}
+
+.ml
+{
+ top: 16px;
+ left: 0px;
+ width: 16px;
+ bottom: 51px;
+ background-position: 0px 0px;
+}
+
+.mr
+{
+ top: 16px;
+ right: 0px;
+ width: 16px;
+ bottom: 51px;
+ background-position: -16px 0px;
+}
+
+.bl
+{
+ bottom: 0px;
+ left: 0px;
+ width: 30px;
+ height: 51px;
+ background-position: -16px -196px;
+}
+
+.rtl .bl
+{
+ background-position: -16px -517px;
+}
+
+.br
+{
+ bottom: 0px;
+ right: 0px;
+ width: 30px;
+ height: 51px;
+ background-position: -16px -263px;
+}
+
+.rtl .br
+{
+ background-position: -16px -584px;
+}
+
+.bc
+{
+ bottom: 0px;
+ right: 30px;
+ left: 30px;
+ height: 51px;
+ background-position: 0px -330px;
+ background-repeat: repeat-x;
+}
+
+/* For IE6. Do not change it. */
+* html .blocker
+{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: 12;
+ filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+}
+
+/* The layer used to cover the dialog when opening a child dialog. */
+.cover
+{
+ position: absolute;
+ top: 0px;
+ left: 14px;
+ right: 14px;
+ bottom: 18px;
+ z-index: 11;
+}
+
+#closeButton
+{
+ position: absolute;
+ right: 0px;
+ top: 0px;
+ margin-top: 5px;
+ margin-right: 10px;
+ width: 20px;
+ height: 20px;
+ cursor: pointer;
+ background-image: url(images/sprites.png);
+ background-repeat: no-repeat;
+ background-position: -16px -651px;
+}
+
+* html #closeButton
+{
+ cursor: hand;
+ background-image: url(images/sprites.gif);
+}
+
+.rtl #closeButton
+{
+ right: auto;
+ left: 10px;
+ margin-right: 0px;
+}
+
+#closeButton:hover
+{
+ background-position: -16px -687px;
+}
+
+#throbberBlock
+{
+ z-index: 10;
+}
+
+#throbberBlock div
+{
+ float: left;
+ width: 8px;
+ height: 9px;
+ margin-left: 2px;
+ margin-right: 2px;
+ font-size: 1px; /* IE6 */
+}
+
+/*
+ Color Gradient Generator:
+ http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
+*/
+
+.throbber_1
+{
+ background-color: #504845;
+}
+
+.throbber_2
+{
+ background-color: #736D6B;
+}
+
+.throbber_3
+{
+ background-color: #979391;
+}
+
+.throbber_4
+{
+ background-color: #BAB8B7;
+}
+
+.throbber_5
+{
+ background-color: #DEDEDE;
+}
diff --git a/htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js b/htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js
index 4fc9ba66f52..804cc8d24de 100644
--- a/htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js
+++ b/htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js
@@ -1,110 +1,110 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- */
-
-(function()
-{
- // IE6 doens't handle absolute positioning properly (it is always in quirks
- // mode). This function fixes the sizes and positions of many elements that
- // compose the skin (this is skin specific).
- var fixSizes = window.DoResizeFixes = function()
- {
- var fckDlg = window.document.body ;
-
- for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
- {
- var child = fckDlg.childNodes[i] ;
- switch ( child.className )
- {
- case 'contents' :
- child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
- child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
- break ;
-
- case 'blocker' :
- case 'cover' :
- child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
- child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
- break ;
-
- case 'tr' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 16);
- break ;
-
- case 'tc' :
- child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
- break ;
-
- case 'ml' :
- child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
- break ;
-
- case 'mr' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 16);
- child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
- break ;
-
- case 'bl' :
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
-
- case 'br' :
- child.style.left = Math.max(0, fckDlg.clientWidth - 30);
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
-
- case 'bc' :
- child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
- child.style.top = Math.max(0, fckDlg.clientHeight - 51);
- break ;
- }
- }
- }
-
- var closeButtonOver = function()
- {
- this.style.backgroundPosition = '-16px -687px' ;
- } ;
-
- var closeButtonOut = function()
- {
- this.style.backgroundPosition = '-16px -651px' ;
- } ;
-
- var fixCloseButton = function()
- {
- var closeButton = document.getElementById ('closeButton');
-
- closeButton.onmouseover = closeButtonOver ;
- closeButton.onmouseout = closeButtonOut ;
- }
-
- var onLoad = function()
- {
- fixSizes() ;
- fixCloseButton() ;
-
- window.attachEvent('onresize', fixSizes);
- window.detachEvent('onload', onLoad);
- }
-
- window.attachEvent('onload', onLoad);
-
-})() ;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+(function()
+{
+ // IE6 doens't handle absolute positioning properly (it is always in quirks
+ // mode). This function fixes the sizes and positions of many elements that
+ // compose the skin (this is skin specific).
+ var fixSizes = window.DoResizeFixes = function()
+ {
+ var fckDlg = window.document.body ;
+
+ for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
+ {
+ var child = fckDlg.childNodes[i] ;
+ switch ( child.className )
+ {
+ case 'contents' :
+ child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16); // -left -right
+ child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2); // -bottom -top
+ break ;
+
+ case 'blocker' :
+ case 'cover' :
+ child.style.width = Math.max(0, fckDlg.offsetWidth - 16 - 16 + 4); // -left -right + 4
+ child.style.height = Math.max(0, fckDlg.clientHeight - 20 - 2 + 4); // -bottom -top + 4
+ break ;
+
+ case 'tr' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 16);
+ break ;
+
+ case 'tc' :
+ child.style.width = Math.max(0, fckDlg.clientWidth - 16 - 16);
+ break ;
+
+ case 'ml' :
+ child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
+ break ;
+
+ case 'mr' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 16);
+ child.style.height = Math.max(0, fckDlg.clientHeight - 16 - 51);
+ break ;
+
+ case 'bl' :
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+
+ case 'br' :
+ child.style.left = Math.max(0, fckDlg.clientWidth - 30);
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+
+ case 'bc' :
+ child.style.width = Math.max(0, fckDlg.clientWidth - 30 - 30);
+ child.style.top = Math.max(0, fckDlg.clientHeight - 51);
+ break ;
+ }
+ }
+ }
+
+ var closeButtonOver = function()
+ {
+ this.style.backgroundPosition = '-16px -687px' ;
+ } ;
+
+ var closeButtonOut = function()
+ {
+ this.style.backgroundPosition = '-16px -651px' ;
+ } ;
+
+ var fixCloseButton = function()
+ {
+ var closeButton = document.getElementById ('closeButton');
+
+ closeButton.onmouseover = closeButtonOver ;
+ closeButton.onmouseout = closeButtonOut ;
+ }
+
+ var onLoad = function()
+ {
+ fixSizes() ;
+ fixCloseButton() ;
+
+ window.attachEvent('onresize', fixSizes);
+ window.detachEvent('onload', onLoad);
+ }
+
+ window.attachEvent('onload', onLoad);
+
+})() ;
diff --git a/htdocs/theme/eldy/fckeditor/fck_editor.css b/htdocs/theme/eldy/fckeditor/fck_editor.css
index 0862d375fe6..8ba21189397 100644
--- a/htdocs/theme/eldy/fckeditor/fck_editor.css
+++ b/htdocs/theme/eldy/fckeditor/fck_editor.css
@@ -1,465 +1,465 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the editor IFRAME and Toolbar.
- */
-
-/*
- ### Basic Editor IFRAME Styles.
-*/
-
-body
-{
- padding: 1px;
- margin: 0;
- background-color: #ffffff;
-}
-
-#xEditingArea
-{
- border: #696969 1px solid;
-}
-
-.SourceField
-{
- padding: 5px;
- margin: 0px;
- font-family: Monospace;
-}
-
-/*
- Toolbar
-*/
-
-.TB_ToolbarSet, .TB_Expand, .TB_Collapse
-{
- cursor: default;
- background-color: #f7f7f7;
-}
-
-.TB_ToolbarSet
-{
- border-top: #f7f7f7 1px outset;
- border-bottom: #f7f7f7 1px outset;
-}
-
-.TB_ToolbarSet TD
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.TB_Toolbar
-{
- height: 24px;
- display: inline-table; /* inline = Opera jumping buttons bug */
-}
-
-.TB_Separator
-{
- width: 1px;
- height: 16px;
- margin: 2px;
- background-color: #999966;
-}
-
-.TB_Start
-{
- background-image: url(images/toolbar.start.gif);
- margin: 2px;
- width: 3px;
- background-repeat: no-repeat;
- height: 16px;
-}
-
-.TB_End
-{
- display: none;
-}
-
-.TB_ExpandImg
-{
- background-image: url(images/toolbar.expand.gif);
- background-repeat: no-repeat;
-}
-
-.TB_CollapseImg
-{
- background-image: url(images/toolbar.collapse.gif);
- background-repeat: no-repeat;
-}
-
-.TB_SideBorder
-{
- background-color: #696969;
-}
-
-.TB_Expand, .TB_Collapse
-{
- padding: 2px 2px 2px 2px;
- border: #f7f7f7 1px outset;
-}
-
-.TB_Collapse
-{
- width: 5px;
-}
-
-.TB_Break
-{
- height: 24px; /* IE needs the height to be set, otherwise no break */
-}
-
-/*
- Toolbar Button
-*/
-
-.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
-{
- border: #f7f7f7 1px solid; /* This is the default border */
- height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
-}
-
-.TB_Button_On
-{
- border: #316ac5 1px solid;
- background-color: #c1d2ee;
-}
-
-.TB_Button_On_Over, .TB_Button_Off_Over
-{
- border: #316ac5 1px solid;
- background-color: #dff1ff;
-}
-
-.TB_Button_Off
-{
- filter: alpha(opacity=70); /* IE */
- opacity: 0.70; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Disabled
-{
- filter: gray() alpha(opacity=30); /* IE */
- opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Padding
-{
- visibility: hidden;
- width: 3px;
- height: 22px;
-}
-
-.TB_Button_Image
-{
- overflow: hidden;
- width: 16px;
- height: 16px;
- margin: 3px;
- background-repeat: no-repeat;
-}
-
-.TB_Button_Image img
-{
- position: relative;
-}
-
-.TB_Button_Off .TB_Button_Text
-{
- background-color: #f7f7f7; /* Needed because of a bug on Clear Type */
-}
-
-.TB_ConnectionLine
-{
- background-color: #ffffff;
- height: 1px;
- margin-left: 1px; /* ltr */
- margin-right: 1px; /* rtl */
-}
-
-.TB_Text
-{
- height: 22px;
-}
-
-.TB_Button_Off .TB_Text
-{
- background-color: #f7f7f7 ; /* Needed because of a bug on ClearType */
-}
-
-.TB_Button_On_Over .TB_Text
-{
- background-color: #dff1ff ; /* Needed because of a bug on ClearType */
-}
-
-/*
- Menu
-*/
-
-.MN_Menu
-{
- border: 1px solid #8f8f73;
- padding: 2px;
- background-color: #ffffff;
- cursor: default;
-}
-
-.MN_Menu, .MN_Menu .MN_Label
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.MN_Item_Padding
-{
- visibility: hidden;
- width: 3px;
- height: 20px;
-}
-
-.MN_Icon
-{
- background-color: #dedede;
- text-align: center;
- height: 20px;
-}
-
-.MN_Label
-{
- padding-left: 3px;
- padding-right: 3px;
-}
-
-.MN_Separator
-{
- height: 3px;
-}
-
-.MN_Separator_Line
-{
- border-top: #b9b99d 1px solid;
-}
-
-.MN_Item .MN_Icon IMG
-{
- filter: alpha(opacity=70);
- opacity: 0.70;
-}
-
-.MN_Item_Over
-{
- color: #ffffff;
- background-color: #8a857d;
-}
-
-.MN_Item_Over .MN_Icon
-{
- background-color: #6c6761;
-}
-
-.MN_Item_Disabled IMG
-{
- filter: gray() alpha(opacity=30); /* IE */
- opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.MN_Item_Disabled .MN_Label
-{
- color: #b7b7b7;
-}
-
-.MN_Arrow
-{
- padding-right: 3px;
- padding-left: 3px;
-}
-
-.MN_ConnectionLine
-{
- background-color: #ffffff;
-}
-
-.Menu .TB_Button_On, .Menu .TB_Button_On_Over
-{
- border: #8f8f73 1px solid;
- background-color: #ffffff;
-}
-
-/*
- ### Panel Styles
-*/
-
-.FCK_Panel
-{
- border: #8f8f73 1px solid;
- padding: 2px;
- background-color: #ffffff;
-}
-
-.FCK_Panel, .FCK_Panel TD
-{
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
- font-size: 11px;
-}
-
-/*
- ### Special Combos
-*/
-
-.SC_Panel
-{
- overflow: auto;
- white-space: nowrap;
- cursor: default;
- border: 1px solid #8f8f73;
- padding-left: 2px;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the editor IFRAME and Toolbar.
+ */
+
+/*
+ ### Basic Editor IFRAME Styles.
+*/
+
+body
+{
+ padding: 1px;
+ margin: 0;
+ background-color: #ffffff;
+}
+
+#xEditingArea
+{
+ border: #696969 1px solid;
+}
+
+.SourceField
+{
+ padding: 5px;
+ margin: 0px;
+ font-family: Monospace;
+}
+
+/*
+ Toolbar
+*/
+
+.TB_ToolbarSet, .TB_Expand, .TB_Collapse
+{
+ cursor: default;
+ background-color: #f7f7f7;
+}
+
+.TB_ToolbarSet
+{
+ border-top: #f7f7f7 1px outset;
+ border-bottom: #f7f7f7 1px outset;
+}
+
+.TB_ToolbarSet TD
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.TB_Toolbar
+{
+ height: 24px;
+ display: inline-table; /* inline = Opera jumping buttons bug */
+}
+
+.TB_Separator
+{
+ width: 1px;
+ height: 16px;
+ margin: 2px;
+ background-color: #999966;
+}
+
+.TB_Start
+{
+ background-image: url(images/toolbar.start.gif);
+ margin: 2px;
+ width: 3px;
+ background-repeat: no-repeat;
+ height: 16px;
+}
+
+.TB_End
+{
+ display: none;
+}
+
+.TB_ExpandImg
+{
+ background-image: url(images/toolbar.expand.gif);
+ background-repeat: no-repeat;
+}
+
+.TB_CollapseImg
+{
+ background-image: url(images/toolbar.collapse.gif);
+ background-repeat: no-repeat;
+}
+
+.TB_SideBorder
+{
+ background-color: #696969;
+}
+
+.TB_Expand, .TB_Collapse
+{
+ padding: 2px 2px 2px 2px;
+ border: #f7f7f7 1px outset;
+}
+
+.TB_Collapse
+{
+ width: 5px;
+}
+
+.TB_Break
+{
+ height: 24px; /* IE needs the height to be set, otherwise no break */
+}
+
+/*
+ Toolbar Button
+*/
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+ border: #f7f7f7 1px solid; /* This is the default border */
+ height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
+}
+
+.TB_Button_On
+{
+ border: #316ac5 1px solid;
+ background-color: #c1d2ee;
+}
+
+.TB_Button_On_Over, .TB_Button_Off_Over
+{
+ border: #316ac5 1px solid;
+ background-color: #dff1ff;
+}
+
+.TB_Button_Off
+{
+ filter: alpha(opacity=70); /* IE */
+ opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Disabled
+{
+ filter: gray() alpha(opacity=30); /* IE */
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Padding
+{
+ visibility: hidden;
+ width: 3px;
+ height: 22px;
+}
+
+.TB_Button_Image
+{
+ overflow: hidden;
+ width: 16px;
+ height: 16px;
+ margin: 3px;
+ background-repeat: no-repeat;
+}
+
+.TB_Button_Image img
+{
+ position: relative;
+}
+
+.TB_Button_Off .TB_Button_Text
+{
+ background-color: #f7f7f7; /* Needed because of a bug on Clear Type */
+}
+
+.TB_ConnectionLine
+{
+ background-color: #ffffff;
+ height: 1px;
+ margin-left: 1px; /* ltr */
+ margin-right: 1px; /* rtl */
+}
+
+.TB_Text
+{
+ height: 22px;
+}
+
+.TB_Button_Off .TB_Text
+{
+ background-color: #f7f7f7 ; /* Needed because of a bug on ClearType */
+}
+
+.TB_Button_On_Over .TB_Text
+{
+ background-color: #dff1ff ; /* Needed because of a bug on ClearType */
+}
+
+/*
+ Menu
+*/
+
+.MN_Menu
+{
+ border: 1px solid #8f8f73;
+ padding: 2px;
+ background-color: #ffffff;
+ cursor: default;
+}
+
+.MN_Menu, .MN_Menu .MN_Label
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.MN_Item_Padding
+{
+ visibility: hidden;
+ width: 3px;
+ height: 20px;
+}
+
+.MN_Icon
+{
+ background-color: #dedede;
+ text-align: center;
+ height: 20px;
+}
+
+.MN_Label
+{
+ padding-left: 3px;
+ padding-right: 3px;
+}
+
+.MN_Separator
+{
+ height: 3px;
+}
+
+.MN_Separator_Line
+{
+ border-top: #b9b99d 1px solid;
+}
+
+.MN_Item .MN_Icon IMG
+{
+ filter: alpha(opacity=70);
+ opacity: 0.70;
+}
+
+.MN_Item_Over
+{
+ color: #ffffff;
+ background-color: #8a857d;
+}
+
+.MN_Item_Over .MN_Icon
+{
+ background-color: #6c6761;
+}
+
+.MN_Item_Disabled IMG
+{
+ filter: gray() alpha(opacity=30); /* IE */
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.MN_Item_Disabled .MN_Label
+{
+ color: #b7b7b7;
+}
+
+.MN_Arrow
+{
+ padding-right: 3px;
+ padding-left: 3px;
+}
+
+.MN_ConnectionLine
+{
+ background-color: #ffffff;
+}
+
+.Menu .TB_Button_On, .Menu .TB_Button_On_Over
+{
+ border: #8f8f73 1px solid;
+ background-color: #ffffff;
+}
+
+/*
+ ### Panel Styles
+*/
+
+.FCK_Panel
+{
+ border: #8f8f73 1px solid;
+ padding: 2px;
+ background-color: #ffffff;
+}
+
+.FCK_Panel, .FCK_Panel TD
+{
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+ font-size: 11px;
+}
+
+/*
+ ### Special Combos
+*/
+
+.SC_Panel
+{
+ overflow: auto;
+ white-space: nowrap;
+ cursor: default;
+ border: 1px solid #8f8f73;
+ padding-left: 2px;
padding-right: 2px;
- background-color: #ffffff;
-}
-
-.SC_Panel, .SC_Panel TD
-{
- font-size: 11px;
- font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.SC_Item, .SC_ItemSelected
-{
- margin-top: 2px;
- margin-bottom: 2px;
- background-position: left center;
- padding-left: 11px;
- padding-right: 3px;
- padding-top: 2px;
- padding-bottom: 2px;
- text-overflow: ellipsis;
- overflow: hidden;
- background-repeat: no-repeat;
- border: #dddddd 1px solid;
-}
-
-.SC_Item *, .SC_ItemSelected *
-{
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-.SC_ItemSelected
-{
- border: #9a9afb 1px solid;
- background-image: url(images/toolbar.arrowright.gif);
-}
-
-.SC_ItemOver
-{
- border: #404040 1px solid;
-}
-
-.SC_Field
-{
- border: #b7b7a6 1px solid;
- cursor: default;
-}
-
-.SC_FieldCaption
-{
- overflow: visible;
- padding-right: 5px;
- padding-left: 5px;
- opacity: 0.75; /* Safari, Opera and Mozilla */
- filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
- height: 23px;
- background-color: #f7f7f7;
-}
-
-.SC_FieldLabel
-{
- white-space: nowrap;
- padding: 2px;
- width: 100%;
- cursor: default;
- background-color: #ffffff;
- text-overflow: ellipsis;
- overflow: hidden;
-}
-
-.SC_FieldButton
-{
- background-position: center center;
- background-image: url(images/toolbar.buttonarrow.gif);
- border-left: #b7b7a6 1px solid;
- width: 14px;
- background-repeat: no-repeat;
-}
-
-.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
-{
- opacity: 0.30; /* Safari, Opera and Mozilla */
- filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
-}
-
-.SC_FieldOver
-{
- border: #316ac5 1px solid;
-}
-
-.SC_FieldOver .SC_FieldButton
-{
- border-left: #316ac5 1px solid;
-}
-
-/*
- ### Color Selector Panel
-*/
-
-.ColorBoxBorder
-{
- border: #808080 1px solid;
- position: static;
-}
-
-.ColorBox
-{
- font-size: 1px;
- width: 10px;
- position: static;
- height: 10px;
-}
-
-.ColorDeselected, .ColorSelected
-{
- cursor: default;
-}
-
-.ColorDeselected
-{
- border: #ffffff 1px solid;
- padding: 2px;
- float: left;
-}
-
-.ColorSelected
-{
- border: #316ac5 1px solid;
- padding: 2px;
- float: left;
- background-color: #c1d2ee;
-}
+ background-color: #ffffff;
+}
+
+.SC_Panel, .SC_Panel TD
+{
+ font-size: 11px;
+ font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.SC_Item, .SC_ItemSelected
+{
+ margin-top: 2px;
+ margin-bottom: 2px;
+ background-position: left center;
+ padding-left: 11px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ background-repeat: no-repeat;
+ border: #dddddd 1px solid;
+}
+
+.SC_Item *, .SC_ItemSelected *
+{
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
+.SC_ItemSelected
+{
+ border: #9a9afb 1px solid;
+ background-image: url(images/toolbar.arrowright.gif);
+}
+
+.SC_ItemOver
+{
+ border: #404040 1px solid;
+}
+
+.SC_Field
+{
+ border: #b7b7a6 1px solid;
+ cursor: default;
+}
+
+.SC_FieldCaption
+{
+ overflow: visible;
+ padding-right: 5px;
+ padding-left: 5px;
+ opacity: 0.75; /* Safari, Opera and Mozilla */
+ filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
+ height: 23px;
+ background-color: #f7f7f7;
+}
+
+.SC_FieldLabel
+{
+ white-space: nowrap;
+ padding: 2px;
+ width: 100%;
+ cursor: default;
+ background-color: #ffffff;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.SC_FieldButton
+{
+ background-position: center center;
+ background-image: url(images/toolbar.buttonarrow.gif);
+ border-left: #b7b7a6 1px solid;
+ width: 14px;
+ background-repeat: no-repeat;
+}
+
+.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
+{
+ opacity: 0.30; /* Safari, Opera and Mozilla */
+ filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
+}
+
+.SC_FieldOver
+{
+ border: #316ac5 1px solid;
+}
+
+.SC_FieldOver .SC_FieldButton
+{
+ border-left: #316ac5 1px solid;
+}
+
+/*
+ ### Color Selector Panel
+*/
+
+.ColorBoxBorder
+{
+ border: #808080 1px solid;
+ position: static;
+}
+
+.ColorBox
+{
+ font-size: 1px;
+ width: 10px;
+ position: static;
+ height: 10px;
+}
+
+.ColorDeselected, .ColorSelected
+{
+ cursor: default;
+}
+
+.ColorDeselected
+{
+ border: #ffffff 1px solid;
+ padding: 2px;
+ float: left;
+}
+
+.ColorSelected
+{
+ border: #316ac5 1px solid;
+ padding: 2px;
+ float: left;
+ background-color: #c1d2ee;
+}
diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php
index 39b0076938d..0eb93af0b86 100644
--- a/htdocs/theme/phones/smartphone/theme/default/default.css.php
+++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php
@@ -1,532 +1,532 @@
-
- *
- * 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 2 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 .
- */
-
-/**
- * \file htdocs/theme/phones/smartphone/theme/default/default.css.php
- * \brief Fichier de style CSS du theme Smartphone default
- */
-
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url.
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
-
-session_cache_limiter(FALSE);
-
-require_once("../../../../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
-
-// Define css type
-header('Content-type: text/css');
-// Important: Avoid page request by browser and dynamic build at
-// each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
-else header('Cache-Control: no-cache');
-
-// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
-
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang')); // If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme'); // If theme was forced on URL
-$langs->load("main",0,1);
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
-
-?>
-.ui-mobile-viewport {
-/*width:600px;
-height:600px;
-min-height: 200px;
-min-width: 600px;
-overflow:scroll; */
-}
-
-.landscape, .landscape .ui-page {
-}
-
-#dol-homeheader { height: 40px; font-size: 16px; }
-
-.ui-mobile-viewport {
- margin: 0;
-}
-
-.ui-header { height: 40px; font-size: 16px; }
-
-.ui-content {
-padding-top: 1px;
-padding-right: 0;
-padding-bottom: 0px;
-padding-left: 1px;
-}
-
-.ui-content .ui-listview {
- margin-top: 0px; /* Use here negative value of ui-content top padding */
- margin-right: 0px;
- margin-bottom: 0px;
- margin-left: 0px;
- /* overflow: scroll; */
-}
-
-.ui-mobile #dol-homeheader { padding: 10px 5px 0; text-align: center }
-.ui-mobile #dol-homeheader h1 { margin: 0 0 10px; }
-.ui-mobile #dol-homeheader p { margin: 0; }
-
-.ui-li-icon {
- left:5px;
- top:0.3em;
-}
-
-.ui-li .ui-btn-inner {
- padding: 0.4em 5px 0.4em 5px;
-}
-
-input.ui-input-text, textarea.ui-input-text {
- padding: 0.2em;
-}
-
-.ui-body-b {
- background: #FFFFFF;
-}
-
-.ui-body-c {
- background: #FFFFFF;
- text-shadow: none;
-}
-
-.loginform {
- margin-left: 10px;
- margin-right: 10px;
- padding: 5px;
-}
-
-
-
-
-/* ============================================================================== */
-/* Styles de positionnement des zones */
-/* ============================================================================== */
-
-div.fiche {
- margin-: browser->phone)?'10':'2'); ?>px;
- margin-: browser->phone)?'6':''); ?>px;
-}
-
-div.fichecenter {
- width: 100%;
- clear: both; /* This is to have div fichecenter that are true rectangles */
-}
-div.fichethirdleft {
- browser->phone)) { print "float: ".$left.";\n"; } ?>
- browser->phone)) { print "width: 35%;\n"; } ?>
-}
-div.fichetwothirdright {
- browser->phone)) { print "float: ".$left.";\n"; } ?>
- browser->phone)) { print "width: 65%;\n"; } ?>
-}
-div.fichehalfleft {
- browser->phone)) { print "float: ".$left.";\n"; } ?>
- browser->phone)) { print "width: 50%;\n"; } ?>
-}
-div.fichehalfright {
- browser->phone)) { print "float: ".$left.";\n"; } ?>
- browser->phone)) { print "width: 50%;\n"; } ?>
-}
-div.ficheaddleft {
- browser->phone)) { print "padding-left: 6px;\n"; } ?>
-}
-
-
-/* ============================================================================== */
-/* Boutons actions */
-/* ============================================================================== */
-
-.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
- overflow: hidden;
- padding: 0.6em 25px;
- position: relative;
- white-space: nowrap;
-
- font-family: ;
- background: white;
- border: 1px solid #8CACBB;
- color: #436976;
- padding: 0em 0.7em;
- margin: 0em 0.5em;
- text-decoration: none;
- white-space: nowrap;
-}
-
-.butAction:hover {
- background: #dee7ec;
-}
-
-.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
- border: 1px solid #997777;
-}
-
-.butActionDelete:hover {
- background: #FFe7ec;
-}
-
-.butActionRefused {
- font-family: !important;
- font-weight: bold !important;
- background: white !important;
- border: 1px solid #AAAAAA !important;
- color: #AAAAAA !important;
- padding: 0em 0.7em !important;
- margin: 0em 0.5em !important;
- text-decoration: none !important;
- white-space: nowrap !important;
- cursor: not-allowed;
-}
-
-span.butAction, span.butActionDelete {
- cursor: pointer;
-}
-
-
-/* ============================================================================== */
-/* Tables */
-/* ============================================================================== */
-
-/*
-#undertopmenu {
-background-image: url("");
-background-repeat: repeat-x;
-}
-*/
-
-
-.nocellnopadd {
-list-style-type:none;
-margin: 0px;
-padding: 0px;
-}
-
-.notopnoleft {
-border-collapse: collapse;
-border: 0px;
-padding-top: 0px;
-padding-: 0px;
-padding-: 4px;
-padding-bottom: 4px;
-margin: 0px 0px;
-}
-.notopnoleftnoright {
-border-collapse: collapse;
-border: 0px;
-padding-top: 0px;
-padding-left: 0px;
-padding-right: 0px;
-padding-bottom: 4px;
-margin: 0px 0px 0px 0px;
-}
-
-
-table.border {
-border: 1px solid #9CACBB;
-border-collapse: collapse;
-}
-
-table.border td {
-padding: 1px 2px;
-border: 1px solid #9CACBB;
-border-collapse: collapse;
-}
-
-td.border {
-border-top: 1px solid #000000;
-border-right: 1px solid #000000;
-border-bottom: 1px solid #000000;
-border-left: 1px solid #000000;
-}
-
-
-/* Main boxes */
-
-table.noborder {
-border-collapse: collapse;
-border-top-color: #FEFEFE;
-
-border-right-width: 1px;
-border-right-color: #BBBBBB;
-border-right-style: solid;
-
-border-left-width: 1px;
-border-left-color: #BBBBBB;
-border-left-style: solid;
-
-border-bottom-width: 1px;
-border-bottom-color: #BBBBBB;
-border-bottom-style: solid;
-
-margin: 0px 0px 2px 0px;
-}
-
-table.noborder tr {
-border-top-color: #FEFEFE;
-
-border-right-width: 1px;
-border-right-color: #BBBBBB;
-border-right-style: solid;
-
-border-left-width: 1px;
-border-left-color: #BBBBBB;
-border-left-style: solid;
-height: 16px;
-}
-
-table.noborder td {
-padding: 1px 2px 0px 1px; /* t r b l */
-}
-
-table.nobordernopadding {
-border-collapse: collapse;
-border: 0px;
-}
-table.nobordernopadding tr {
-border: 0px;
-padding: 0px 0px;
-}
-table.nobordernopadding td {
-border: 0px;
-padding: 0px 0px;
-}
-
-
-
-tr.liste_titre
-{
- height: 24px;
- background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
- border: 1px solid #456F9A;
- color: #FFFFFF;
- font-family: ;
- /* border-bottom: 1px solid #FDFFFF; */
- white-space: nowrap;
-}
-th.liste_titre, td.liste_titre
-{
- background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
- border: 1px solid #456F9A;
- color: #FFFFFF;
- font-family: ;
- font-weight: normal;
- /* border-bottom: 1px solid #FDFFFF; */
- white-space: nowrap;
- text-align: ;
-}
-th.liste_titre_sel, td.liste_titre_sel
-{
- background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
- color: #FFFFFF;
- font-family: ;
- font-weight: normal;
- /* text-decoration: underline; */
- /* border-bottom: 1px solid #FDFFFF; */
- white-space: nowrap;
- text-align: ;
-}
-input.liste_titre {
-background: transparent;
-background-repeat: repeat-x;
-border: 0px;
-}
-
-tr.liste_total td {
-border-top: 1px solid #DDDDDD;
-background: #F0F0F0;
-background-repeat: repeat-x;
-color: #332266;
-font-weight: normal;
-white-space: nowrap;
-}
-
-
-.impair {
-/* background: #d0d4d7; */
-background: #eaeaea;
-font-family: ;
-border: 0px;
-}
-/*
-.impair:hover {
-background: #c0c4c7;
-border: 0px;
-}
-*/
-
-.pair {
-/* background: #e6ebed; */
-background: #f4f4f4;
-font-family: ;
-border: 0px;
-}
-/*
-.pair:hover {
-background: #c0c4c7;
-border: 0px;
-}
-*/
-
-
-
-div.titre {
- padding-top: 10px;
- font-family: ;
- font-weight: normal;
- color: #336666;
- text-decoration: none;
-}
-
-
-
-/* ============================================================================== */
-/* Onglets */
-/* ============================================================================== */
-
-div.tabs {
- top: 20px;
- margin: 1px 0px 0px 0px;
- padding: 0px 6px 0px 0px;
- text-align: ;
-}
-
-div.tabBar {
- color: #234046;
- padding-top: 10px;
- padding-left: 8px;
- padding-right: 8px;
- padding-bottom: 8px;
- margin: 0px 0px 10px 0px;
- -moz-border-radius-topleft:6px;
- -moz-border-radius-topright:6px;
- -moz-border-radius-bottomleft:6px;
- -moz-border-radius-bottomright:6px;
- border-right: 1px solid #555555;
- border-bottom: 1px solid #555555;
- border-left: 1px solid #D0D0D0;
- border-top: 1px solid #D8D8D8;
- background: #dee7ec url() repeat-x;
-}
-
-div.tabsAction {
- margin: 20px 0em 1px 0em;
- padding: 0em 0em;
- text-align: right;
-}
-
-
-a.tabTitle {
- display: none;
-}
-
-a.tab:link {
- background: #dee7ec;
- color: #436976;
- font-family: ;
- padding: 0px 6px;
- margin: 0em 0.2em;
- text-decoration: none;
- white-space: nowrap;
- -moz-border-radius-topleft:6px;
- -moz-border-radius-topright:6px;
-
- border-: 1px solid #555555;
- border-: 1px solid #D8D8D8;
- border-top: 1px solid #D8D8D8;
-}
-a.tab:visited {
- background: #dee7ec;
- color: #436976;
- font-family: ;
- padding: 0px 6px;
- margin: 0em 0.2em;
- text-decoration: none;
- white-space: nowrap;
- -moz-border-radius-topleft:6px;
- -moz-border-radius-topright:6px;
-
- border-: 1px solid #555555;
- border-: 1px solid #D8D8D8;
- border-top: 1px solid #D8D8D8;
-}
-a.tab#active {
- background: white;
- border-bottom: #dee7ec 1px solid;
- font-family: ;
- color: #436976;
- padding: 0px 6px;
- margin: 0em 0.2em;
- text-decoration: none;
- -moz-border-radius-topleft:6px;
- -moz-border-radius-topright:6px;
-
- border-: 1px solid #555555;
- border-: 1px solid #D8D8D8;
- border-top: 1px solid #D8D8D8;
- border-bottom: 1px solid white;
-}
-a.tab:hover {
- background: white;
- color: #436976;
- font-family: ;
- padding: 0px 6px;
- margin: 0em 0.2em;
- text-decoration: none;
- -moz-border-radius-topleft:6px;
- -moz-border-radius-topright:6px;
-
- border-: 1px solid #555555;
- border-: 1px solid #D8D8D8;
- border-top: 1px solid #D8D8D8;
-}
-
-a.tabimage {
- color: #436976;
- font-family: ;
- text-decoration: none;
- white-space: nowrap;
-}
-
-td.tab {
- background: #dee7ec;
-}
-
-span.tabspan {
- background: #dee7ec;
- color: #436976;
- font-family: ;
- padding: 0px 6px;
- margin: 0em 0.2em;
- text-decoration: none;
- white-space: nowrap;
- -moz-border-radius-topleft:6px;
- -moz-border-radius-topright:6px;
-
- border-: 1px solid #555555;
- border-: 1px solid #D8D8D8;
- border-top: 1px solid #D8D8D8;
-}
-
+
+ *
+ * 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 2 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 .
+ */
+
+/**
+ * \file htdocs/theme/phones/smartphone/theme/default/default.css.php
+ * \brief Fichier de style CSS du theme Smartphone default
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url.
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
+if (! defined('NOLOGIN')) define('NOLOGIN',1);
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+
+session_cache_limiter(FALSE);
+
+require_once("../../../../../main.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
+
+// Define css type
+header('Content-type: text/css');
+// Important: Avoid page request by browser and dynamic build at
+// each Dolibarr page access.
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
+
+// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
+if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
+
+if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang')); // If language was forced on URL
+if (GETPOST('theme')) $conf->theme=GETPOST('theme'); // If theme was forced on URL
+$langs->load("main",0,1);
+$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
+$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+
+?>
+.ui-mobile-viewport {
+/*width:600px;
+height:600px;
+min-height: 200px;
+min-width: 600px;
+overflow:scroll; */
+}
+
+.landscape, .landscape .ui-page {
+}
+
+#dol-homeheader { height: 40px; font-size: 16px; }
+
+.ui-mobile-viewport {
+ margin: 0;
+}
+
+.ui-header { height: 40px; font-size: 16px; }
+
+.ui-content {
+padding-top: 1px;
+padding-right: 0;
+padding-bottom: 0px;
+padding-left: 1px;
+}
+
+.ui-content .ui-listview {
+ margin-top: 0px; /* Use here negative value of ui-content top padding */
+ margin-right: 0px;
+ margin-bottom: 0px;
+ margin-left: 0px;
+ /* overflow: scroll; */
+}
+
+.ui-mobile #dol-homeheader { padding: 10px 5px 0; text-align: center }
+.ui-mobile #dol-homeheader h1 { margin: 0 0 10px; }
+.ui-mobile #dol-homeheader p { margin: 0; }
+
+.ui-li-icon {
+ left:5px;
+ top:0.3em;
+}
+
+.ui-li .ui-btn-inner {
+ padding: 0.4em 5px 0.4em 5px;
+}
+
+input.ui-input-text, textarea.ui-input-text {
+ padding: 0.2em;
+}
+
+.ui-body-b {
+ background: #FFFFFF;
+}
+
+.ui-body-c {
+ background: #FFFFFF;
+ text-shadow: none;
+}
+
+.loginform {
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 5px;
+}
+
+
+
+
+/* ============================================================================== */
+/* Styles de positionnement des zones */
+/* ============================================================================== */
+
+div.fiche {
+ margin-: browser->phone)?'10':'2'); ?>px;
+ margin-: browser->phone)?'6':''); ?>px;
+}
+
+div.fichecenter {
+ width: 100%;
+ clear: both; /* This is to have div fichecenter that are true rectangles */
+}
+div.fichethirdleft {
+ browser->phone)) { print "float: ".$left.";\n"; } ?>
+ browser->phone)) { print "width: 35%;\n"; } ?>
+}
+div.fichetwothirdright {
+ browser->phone)) { print "float: ".$left.";\n"; } ?>
+ browser->phone)) { print "width: 65%;\n"; } ?>
+}
+div.fichehalfleft {
+ browser->phone)) { print "float: ".$left.";\n"; } ?>
+ browser->phone)) { print "width: 50%;\n"; } ?>
+}
+div.fichehalfright {
+ browser->phone)) { print "float: ".$left.";\n"; } ?>
+ browser->phone)) { print "width: 50%;\n"; } ?>
+}
+div.ficheaddleft {
+ browser->phone)) { print "padding-left: 6px;\n"; } ?>
+}
+
+
+/* ============================================================================== */
+/* Boutons actions */
+/* ============================================================================== */
+
+.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
+ overflow: hidden;
+ padding: 0.6em 25px;
+ position: relative;
+ white-space: nowrap;
+
+ font-family: ;
+ background: white;
+ border: 1px solid #8CACBB;
+ color: #436976;
+ padding: 0em 0.7em;
+ margin: 0em 0.5em;
+ text-decoration: none;
+ white-space: nowrap;
+}
+
+.butAction:hover {
+ background: #dee7ec;
+}
+
+.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
+ border: 1px solid #997777;
+}
+
+.butActionDelete:hover {
+ background: #FFe7ec;
+}
+
+.butActionRefused {
+ font-family: !important;
+ font-weight: bold !important;
+ background: white !important;
+ border: 1px solid #AAAAAA !important;
+ color: #AAAAAA !important;
+ padding: 0em 0.7em !important;
+ margin: 0em 0.5em !important;
+ text-decoration: none !important;
+ white-space: nowrap !important;
+ cursor: not-allowed;
+}
+
+span.butAction, span.butActionDelete {
+ cursor: pointer;
+}
+
+
+/* ============================================================================== */
+/* Tables */
+/* ============================================================================== */
+
+/*
+#undertopmenu {
+background-image: url("");
+background-repeat: repeat-x;
+}
+*/
+
+
+.nocellnopadd {
+list-style-type:none;
+margin: 0px;
+padding: 0px;
+}
+
+.notopnoleft {
+border-collapse: collapse;
+border: 0px;
+padding-top: 0px;
+padding-: 0px;
+padding-: 4px;
+padding-bottom: 4px;
+margin: 0px 0px;
+}
+.notopnoleftnoright {
+border-collapse: collapse;
+border: 0px;
+padding-top: 0px;
+padding-left: 0px;
+padding-right: 0px;
+padding-bottom: 4px;
+margin: 0px 0px 0px 0px;
+}
+
+
+table.border {
+border: 1px solid #9CACBB;
+border-collapse: collapse;
+}
+
+table.border td {
+padding: 1px 2px;
+border: 1px solid #9CACBB;
+border-collapse: collapse;
+}
+
+td.border {
+border-top: 1px solid #000000;
+border-right: 1px solid #000000;
+border-bottom: 1px solid #000000;
+border-left: 1px solid #000000;
+}
+
+
+/* Main boxes */
+
+table.noborder {
+border-collapse: collapse;
+border-top-color: #FEFEFE;
+
+border-right-width: 1px;
+border-right-color: #BBBBBB;
+border-right-style: solid;
+
+border-left-width: 1px;
+border-left-color: #BBBBBB;
+border-left-style: solid;
+
+border-bottom-width: 1px;
+border-bottom-color: #BBBBBB;
+border-bottom-style: solid;
+
+margin: 0px 0px 2px 0px;
+}
+
+table.noborder tr {
+border-top-color: #FEFEFE;
+
+border-right-width: 1px;
+border-right-color: #BBBBBB;
+border-right-style: solid;
+
+border-left-width: 1px;
+border-left-color: #BBBBBB;
+border-left-style: solid;
+height: 16px;
+}
+
+table.noborder td {
+padding: 1px 2px 0px 1px; /* t r b l */
+}
+
+table.nobordernopadding {
+border-collapse: collapse;
+border: 0px;
+}
+table.nobordernopadding tr {
+border: 0px;
+padding: 0px 0px;
+}
+table.nobordernopadding td {
+border: 0px;
+padding: 0px 0px;
+}
+
+
+
+tr.liste_titre
+{
+ height: 24px;
+ background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
+ border: 1px solid #456F9A;
+ color: #FFFFFF;
+ font-family: ;
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+}
+th.liste_titre, td.liste_titre
+{
+ background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
+ border: 1px solid #456F9A;
+ color: #FFFFFF;
+ font-family: ;
+ font-weight: normal;
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+ text-align: ;
+}
+th.liste_titre_sel, td.liste_titre_sel
+{
+ background: -moz-linear-gradient(center top , #81A8CE, #5E87B0) repeat scroll 0 0 #5E87B0;
+ color: #FFFFFF;
+ font-family: ;
+ font-weight: normal;
+ /* text-decoration: underline; */
+ /* border-bottom: 1px solid #FDFFFF; */
+ white-space: nowrap;
+ text-align: ;
+}
+input.liste_titre {
+background: transparent;
+background-repeat: repeat-x;
+border: 0px;
+}
+
+tr.liste_total td {
+border-top: 1px solid #DDDDDD;
+background: #F0F0F0;
+background-repeat: repeat-x;
+color: #332266;
+font-weight: normal;
+white-space: nowrap;
+}
+
+
+.impair {
+/* background: #d0d4d7; */
+background: #eaeaea;
+font-family: ;
+border: 0px;
+}
+/*
+.impair:hover {
+background: #c0c4c7;
+border: 0px;
+}
+*/
+
+.pair {
+/* background: #e6ebed; */
+background: #f4f4f4;
+font-family: ;
+border: 0px;
+}
+/*
+.pair:hover {
+background: #c0c4c7;
+border: 0px;
+}
+*/
+
+
+
+div.titre {
+ padding-top: 10px;
+ font-family: ;
+ font-weight: normal;
+ color: #336666;
+ text-decoration: none;
+}
+
+
+
+/* ============================================================================== */
+/* Onglets */
+/* ============================================================================== */
+
+div.tabs {
+ top: 20px;
+ margin: 1px 0px 0px 0px;
+ padding: 0px 6px 0px 0px;
+ text-align: ;
+}
+
+div.tabBar {
+ color: #234046;
+ padding-top: 10px;
+ padding-left: 8px;
+ padding-right: 8px;
+ padding-bottom: 8px;
+ margin: 0px 0px 10px 0px;
+ -moz-border-radius-topleft:6px;
+ -moz-border-radius-topright:6px;
+ -moz-border-radius-bottomleft:6px;
+ -moz-border-radius-bottomright:6px;
+ border-right: 1px solid #555555;
+ border-bottom: 1px solid #555555;
+ border-left: 1px solid #D0D0D0;
+ border-top: 1px solid #D8D8D8;
+ background: #dee7ec url() repeat-x;
+}
+
+div.tabsAction {
+ margin: 20px 0em 1px 0em;
+ padding: 0em 0em;
+ text-align: right;
+}
+
+
+a.tabTitle {
+ display: none;
+}
+
+a.tab:link {
+ background: #dee7ec;
+ color: #436976;
+ font-family: ;
+ padding: 0px 6px;
+ margin: 0em 0.2em;
+ text-decoration: none;
+ white-space: nowrap;
+ -moz-border-radius-topleft:6px;
+ -moz-border-radius-topright:6px;
+
+ border-: 1px solid #555555;
+ border-: 1px solid #D8D8D8;
+ border-top: 1px solid #D8D8D8;
+}
+a.tab:visited {
+ background: #dee7ec;
+ color: #436976;
+ font-family: ;
+ padding: 0px 6px;
+ margin: 0em 0.2em;
+ text-decoration: none;
+ white-space: nowrap;
+ -moz-border-radius-topleft:6px;
+ -moz-border-radius-topright:6px;
+
+ border-: 1px solid #555555;
+ border-: 1px solid #D8D8D8;
+ border-top: 1px solid #D8D8D8;
+}
+a.tab#active {
+ background: white;
+ border-bottom: #dee7ec 1px solid;
+ font-family: ;
+ color: #436976;
+ padding: 0px 6px;
+ margin: 0em 0.2em;
+ text-decoration: none;
+ -moz-border-radius-topleft:6px;
+ -moz-border-radius-topright:6px;
+
+ border-: 1px solid #555555;
+ border-: 1px solid #D8D8D8;
+ border-top: 1px solid #D8D8D8;
+ border-bottom: 1px solid white;
+}
+a.tab:hover {
+ background: white;
+ color: #436976;
+ font-family: ;
+ padding: 0px 6px;
+ margin: 0em 0.2em;
+ text-decoration: none;
+ -moz-border-radius-topleft:6px;
+ -moz-border-radius-topright:6px;
+
+ border-: 1px solid #555555;
+ border-: 1px solid #D8D8D8;
+ border-top: 1px solid #D8D8D8;
+}
+
+a.tabimage {
+ color: #436976;
+ font-family: ;
+ text-decoration: none;
+ white-space: nowrap;
+}
+
+td.tab {
+ background: #dee7ec;
+}
+
+span.tabspan {
+ background: #dee7ec;
+ color: #436976;
+ font-family: ;
+ padding: 0px 6px;
+ margin: 0em 0.2em;
+ text-decoration: none;
+ white-space: nowrap;
+ -moz-border-radius-topleft:6px;
+ -moz-border-radius-topright:6px;
+
+ border-: 1px solid #555555;
+ border-: 1px solid #D8D8D8;
+ border-top: 1px solid #D8D8D8;
+}
+
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 4a203ae5b4f..c42ff64e79a 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -422,7 +422,7 @@ else // Open and return file
$original_file_osencoded=dol_osencode($original_file);
// This test if file exists should be useless. We keep it to find bug more easily
- if (! dol_is_file($original_file_osencoded))
+ if (! dol_is_file($original_file_osencoded))
{
$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';
dol_print_error(0,$error);
|