lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsimport

Browse Source
This commit is contained in:
Laurent Destailleur 2011-09-21 23:41:42 +00:00
commit 3a8bb27287
21 changed files with 799 additions and 1229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/doxygen/doxygen_footer.html
View File

@ -38,6 +38,7 @@ google_ad_height = 60;
<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script> <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
</center> </center>
<!-- End google adsense --> <!-- End google adsense -->
<br>
</body> </body>
</html> </html>

5
htdocs/admin/dict.php
View File

@ -35,8 +35,7 @@ $langs->load("other");
$langs->load("admin"); $langs->load("admin");
$langs->load("companies"); $langs->load("companies");
if (!$user->admin) if (!$user->admin) accessforbidden();
accessforbidden();
$acts[0] = "activate"; $acts[0] = "activate";
$acts[1] = "disable"; $acts[1] = "disable";
@ -123,7 +122,7 @@ $tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.d
$tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent"; $tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent";
//$tabsql[9] = "SELECT code, code_iso, label as libelle, symbole, active FROM ".MAIN_DB_PREFIX."c_currencies"; //$tabsql[9] = "SELECT code, code_iso, label as libelle, symbole, active FROM ".MAIN_DB_PREFIX."c_currencies";
$tabsql[9] = "SELECT code, code_iso, label as libelle, active FROM ".MAIN_DB_PREFIX."c_currencies"; $tabsql[9] = "SELECT code, code_iso, label as libelle, active FROM ".MAIN_DB_PREFIX."c_currencies";
$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1, t.localtax2, p.libelle as pays, p.code as pays_code, t.fk_pays as pays_id, t.recuperableonly, t.note, t.active,t.accountancy_code FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p WHERE t.fk_pays=p.rowid"; $tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1, t.localtax2, p.libelle as pays, p.code as pays_code, t.fk_pays as pays_id, t.recuperableonly, t.note, t.active, t.accountancy_code FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p WHERE t.fk_pays=p.rowid";
$tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t"; $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
$tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c'; $tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c';
$tabsql[13]= "SELECT id as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c"; $tabsql[13]= "SELECT id as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c";

9
htdocs/cashdesk/include/environnement.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net> /* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
* Copyright (C) 2009-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2009-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -42,12 +42,11 @@ $conf_fkaccount_cb = (! empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"]))?$_SESSIO
//var_dump($_SESSION); //var_dump($_SESSION);
// Parametres d'affichage // View parameters
$conf_taille_listes = (empty($conf->global->PRODUIT_LIMIT_SIZE)?500:$conf->global->PRODUIT_LIMIT_SIZE); // Nombre max de lignes a afficher dans les listes $conf_taille_listes = (empty($conf->global->PRODUIT_LIMIT_SIZE)?500:$conf->global->PRODUIT_LIMIT_SIZE); // Nombre max de lignes a afficher dans les listes
$conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes
// Aurélien Imhof: Force decremente stock sur validation facture, quelque soit mode configuré // Add hidden option to force decrease of stock whatever is user setup
if(!isset($conf->global->STOCK_CALCULATE_ON_BILL)) if (! empty($conf->global->CASHDESK_FORCE_STOCK_ON_BILL)) $conf->global->STOCK_CALCULATE_ON_BILL=1;
$conf->global->STOCK_CALCULATE_ON_BILL = 1 ;
?> ?>

56
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* *
@ -91,8 +91,9 @@ class ActionComm extends CommonObject
/** /**
* Add an action/event into database * Add an action/event into database
* @param user Object user making action *
* @param notrigger 1 = disable triggers, 0 = enable triggers * @param User $user Object user making action
* @param int $notrigger 1 = disable triggers, 0 = enable triggers
* @return int Id of created event, < 0 if KO * @return int Id of created event, < 0 if KO
*/ */
function add($user,$notrigger=0) function add($user,$notrigger=0)
@ -144,7 +145,7 @@ class ActionComm extends CommonObject
} }
$this->db->begin("ActionComm::add"); $this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm";
$sql.= "(datec,"; $sql.= "(datec,";
@ -188,7 +189,7 @@ class ActionComm extends CommonObject
$sql.= $conf->entity; $sql.= $conf->entity;
$sql.= ")"; $sql.= ")";
dol_syslog("ActionComm::add sql=".$sql); dol_syslog(get_class($this)."::add sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -204,13 +205,13 @@ class ActionComm extends CommonObject
// Fin appel triggers // Fin appel triggers
} }
$this->db->commit("ActionComm::add"); $this->db->commit();
return $this->id; return $this->id;
} }
else else
{ {
$this->error=$this->db->lasterror().' sql='.$sql; $this->error=$this->db->lasterror().' sql='.$sql;
$this->db->rollback("ActionComm::add"); $this->db->rollback();
return -1; return -1;
} }
@ -218,7 +219,9 @@ class ActionComm extends CommonObject
/** /**
* Charge l'objet action depuis la base * Charge l'objet action depuis la base
* @param id id de l'action a recuperer *
* @param int $id id de l'action a recuperer
* @return int <0 if KO, >0 if OK
*/ */
function fetch($id) function fetch($id)
{ {
@ -246,7 +249,7 @@ class ActionComm extends CommonObject
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
$sql.= " WHERE a.id=".$id." AND a.fk_action=c.id"; $sql.= " WHERE a.id=".$id." AND a.fk_action=c.id";
dol_syslog("ActionComm::fetch sql=".$sql); dol_syslog(get_class($this)."::fetch sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -304,14 +307,15 @@ class ActionComm extends CommonObject
/** /**
* Supprime l'action de la base * Supprime l'action de la base
* @return int <0 si ko, >0 si ok *
* @return int <0 if KO, >0 if OK
*/ */
function delete() function delete()
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm";
$sql.= " WHERE id=".$this->id; $sql.= " WHERE id=".$this->id;
dol_syslog("ActionComm::delete sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
return 1; return 1;
@ -326,7 +330,8 @@ class ActionComm extends CommonObject
/** /**
* Met a jour l'action en base. * Met a jour l'action en base.
* Si percentage = 100, on met a jour date 100% * Si percentage = 100, on met a jour date 100%
* @return int <0 si ko, >0 si ok *
* @return int <0 if KO, >0 if OK
*/ */
function update($user) function update($user)
{ {
@ -371,7 +376,7 @@ class ActionComm extends CommonObject
$sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null"); $sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null");
$sql.= " WHERE id=".$this->id; $sql.= " WHERE id=".$this->id;
dol_syslog("ActionComm::update sql=".$sql); dol_syslog(get_class($this)."::update sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
return 1; return 1;
@ -379,7 +384,7 @@ class ActionComm extends CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("ActionComm::update ".$this->error,LOG_ERR); dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
return -1; return -1;
} }
} }
@ -406,7 +411,7 @@ class ActionComm extends CommonObject
} }
if (! empty($filter)) $sql.= $filter; if (! empty($filter)) $sql.= $filter;
dol_syslog("ActionComm::getActions sql=".$sql); dol_syslog(get_class($this)."::getActions sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -475,7 +480,9 @@ class ActionComm extends CommonObject
/** /**
* Charge les informations d'ordre info dans l'objet facture * Charge les informations d'ordre info dans l'objet facture
* @param id Id de la facture a charger *
* @param int $id Id de la facture a charger
* @return void
*/ */
function info($id) function info($id)
{ {
@ -488,7 +495,7 @@ class ActionComm extends CommonObject
$sql.= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a'; $sql.= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
$sql.= ' WHERE a.id = '.$id; $sql.= ' WHERE a.id = '.$id;
dol_syslog("ActionComm::info sql=".$sql); dol_syslog(get_class($this)."::info sql=".$sql);
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) if ($result)
{ {
@ -523,6 +530,7 @@ class ActionComm extends CommonObject
/** /**
* Return label of status * Return label of status
*
* @param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @param hidenastatus 1=Show nothing if status is "Not applicable" * @param hidenastatus 1=Show nothing if status is "Not applicable"
* @return string String with status * @return string String with status
@ -534,6 +542,7 @@ class ActionComm extends CommonObject
/** /**
* Return label of action status * Return label of action status
*
* @param percent Percent * @param percent Percent
* @param mode 0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Very short label+Picto * @param mode 0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Very short label+Picto
* @param hidenastatus 1=Show nothing if status is "Not applicable" * @param hidenastatus 1=Show nothing if status is "Not applicable"
@ -644,6 +653,7 @@ class ActionComm extends CommonObject
/** /**
* Export events from database into a cal file. * Export events from database into a cal file.
*
* @param format 'vcal', 'ical/ics', 'rss' * @param format 'vcal', 'ical/ics', 'rss'
* @param type 'event' or 'journal' * @param type 'event' or 'journal'
* @param cachedelay Do not rebuild file if date older than cachedelay seconds * @param cachedelay Do not rebuild file if date older than cachedelay seconds
@ -658,7 +668,7 @@ class ActionComm extends CommonObject
require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php"); require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php");
require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php"); require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php");
dol_syslog("ActionComm::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG); dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
// Check parameters // Check parameters
if (empty($format)) return -1; if (empty($format)) return -1;
@ -688,7 +698,7 @@ class ActionComm extends CommonObject
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
{ {
dol_syslog("ActionComm::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled"); dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
$buildfile = false; $buildfile = false;
} }
} }
@ -762,7 +772,7 @@ class ActionComm extends CommonObject
$sql.= " ORDER by datep"; $sql.= " ORDER by datep";
//print $sql;exit; //print $sql;exit;
dol_syslog("ActionComm::build_exportfile select events sql=".$sql); dol_syslog(get_class($this)."::build_exportfile select events sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -808,7 +818,7 @@ class ActionComm extends CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("ActionComm::build_exportfile ".$this->db->lasterror(), LOG_ERR); dol_syslog(get_class($this)."::build_exportfile ".$this->db->lasterror(), LOG_ERR);
return -1; return -1;
} }
@ -847,14 +857,14 @@ class ActionComm extends CommonObject
if (rename($outputfiletmp,$outputfile)) $result=1; if (rename($outputfiletmp,$outputfile)) $result=1;
else else
{ {
dol_syslog("ActionComm::build_exportfile failed to rename ".$outputfiletmp." to ".$outputfile, LOG_ERR); dol_syslog(get_class($this)."::build_exportfile failed to rename ".$outputfiletmp." to ".$outputfile, LOG_ERR);
dol_delete_file($outputfiletmp,0,1); dol_delete_file($outputfiletmp,0,1);
$result=-1; $result=-1;
} }
} }
else else
{ {
dol_syslog("ActionComm::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR); dol_syslog(get_class($this)."::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
dol_delete_file($outputfiletmp,0,1); dol_delete_file($outputfiletmp,0,1);
$langs->load("errors"); $langs->load("errors");
$this->error=$langs->trans("ErrorFailToCreateFile",$outputfile); $this->error=$langs->trans("ErrorFailToCreateFile",$outputfile);

18
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -53,19 +53,19 @@ class CActionComm
} }
/** /**
* Charge l'objet type d'action depuis la base * Load action type from database
* *
* @param id id ou code du type d'action a recuperer * @param int $id id or code of action type to read
* @return int 1=ok, 0=aucune action, -1=erreur * @return int 1=ok, 0=not found, -1=error
*/ */
function fetch($id) function fetch($id)
{ {
$sql = "SELECT id, code, type, libelle, active"; $sql = "SELECT id, code, type, libelle, active";
$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm"; $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
if (is_numeric($id)) $sql.= " WHERE id=".$id; if (is_numeric($id)) $sql.= " WHERE id=".$id;
else $sql.= " WHERE code='".$id."'"; else $sql.= " WHERE code='".$id."'";
dol_syslog(get_class($this)."::fetch sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -98,7 +98,7 @@ class CActionComm
/** /**
* Return list of event types * Return list of event types
* *
* @param int $active 1 or 0 to filter on event state active or not ('' bu default = no filter) * @param int $active 1 or 0 to filter on event state active or not ('' by default = no filter)
* @param string $idorcode 'id' or 'code' * @param string $idorcode 'id' or 'code'
* @return array Array of all event types if OK, <0 if KO * @return array Array of all event types if OK, <0 if KO
*/ */
@ -118,7 +118,7 @@ class CActionComm
} }
$sql.= " ORDER BY module, position"; $sql.= " ORDER BY module, position";
dol_syslog("CActionComm::liste_array sql=".$sql); dol_syslog(get_class($this)."::liste_array sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -160,10 +160,10 @@ class CActionComm
/** /**
* Renvoie le nom sous forme d'un libelle traduit d'un type d'action * Return name of action type as a label translated
* *
* @param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Picto only
* @return string Libelle du type d'action * @return string Label of action type
*/ */
function getNomUrl($withpicto=0) function getNomUrl($withpicto=0)
{ {

2
htdocs/compta/ajaxpayment.php
View File

@ -1,4 +1,4 @@
<?php <?php
/* Copyright (C) 2011 Auguria <anthony.poiret@auguria.net> /* Copyright (C) 2011 Auguria <anthony.poiret@auguria.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

2
htdocs/includes/modules/modDocument.class.php
View File

@ -1,4 +1,4 @@
<?php <?php
/* Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *

2
htdocs/includes/modules/modExpedition.class.php
View File

@ -1,4 +1,4 @@
<?php <?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>

2
htdocs/includes/modules/modFicheinter.class.php
View File

@ -1,4 +1,4 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>

2
htdocs/includes/modules/modLabel.class.php
View File

@ -1,4 +1,4 @@
<?php <?php
/* Copyright (C) 2007-2009 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2007-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net>
* *

2
htdocs/includes/modules/modMailing.class.php
View File

@ -1,4 +1,4 @@
<?php <?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>

11
htdocs/lib/admin.lib.php
View File

@ -530,7 +530,7 @@ function listOfSessions()
$sessPath = ini_get("session.save_path").'/'; $sessPath = ini_get("session.save_path").'/';
dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath); dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
$dh = @opendir($sessPath); $dh = @opendir(dol_osencode($sessPath));
if ($dh) if ($dh)
{ {
while(($file = @readdir($dh)) !== false) while(($file = @readdir($dh)) !== false)
@ -579,7 +579,7 @@ function purgeSessions($mysessionid)
dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath); dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
$error=0; $error=0;
$dh = @opendir($sessPath); $dh = @opendir(dol_osencode($sessPath));
while(($file = @readdir($dh)) !== false) while(($file = @readdir($dh)) !== false)
{ {
if ($file != "." && $file != "..") if ($file != "." && $file != "..")
@ -640,7 +640,7 @@ function Activate($value,$withdeps=1)
if ($type == 'alt') if ($type == 'alt')
{ {
$handle=@opendir($dirroot); $handle=@opendir(dol_osencode($dirroot));
if (is_resource($handle)) if (is_resource($handle))
{ {
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
@ -755,7 +755,7 @@ function UnActivate($value, $requiredby=1)
if ($type == 'alt') if ($type == 'alt')
{ {
$handle=@opendir($dirroot); $handle=@opendir(dol_osencode($dirroot));
if (is_resource($handle)) if (is_resource($handle))
{ {
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
@ -846,9 +846,10 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
// Load modules attributes in arrays (name, numero, orders) from dir directory // Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>"; //print $dir."\n<br>";
dol_syslog("Scan directory ".$dir." for modules"); dol_syslog("Scan directory ".$dir." for modules");
$handle=@opendir($dir); $handle=@opendir(dol_osencode($dir));
if (is_resource($handle)) if (is_resource($handle))
{ {
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
//print "$i ".$file."\n<br>"; //print "$i ".$file."\n<br>";

110
htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js
View File

@ -1,110 +0,0 @@
/*
* 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);
})() ;

110
htdocs/theme/bureau2crea/fckeditor/fck_dialog_ie6.js
View File

@ -1,110 +0,0 @@
/*
* 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);
})() ;

2
htdocs/theme/cameleo/ckeditor/config.js
View File

@ -1,4 +1,4 @@
/* /*
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license For licensing, see LICENSE.html or http://ckeditor.com/license
*/ */

110
htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js
View File

@ -1,110 +0,0 @@
/*
* 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);
})() ;

110
htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js
View File

@ -1,110 +0,0 @@
/*
* 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);
})() ;

2
htdocs/theme/phones/smartphone/theme/default/default.css.php
View File

@ -1,4 +1,4 @@
<?php <?php
/* Copyright (C) 2009-2010 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2009-2010 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify