4) // du Vendredi au Samedi
- $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
- else // Jeudi
- $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+ // Definition du Jeudi de la semaine
+ if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche
+ $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
+ else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi
+ $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
+ else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi
+ $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
+ else // Jeudi
+ $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
- // Definition du premier Jeudi de l'annee
- if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
- {
- $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
- }
- else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
- {
- $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
- }
- else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
- {
- $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
- }
- else // Jeudi
- {
- $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
- }
+ // Definition du premier Jeudi de l'annee
+ if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
+ {
+ $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
+ }
+ else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
+ {
+ $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
+ }
+ else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
+ {
+ $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
+ }
+ else // Jeudi
+ {
+ $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
+ }
- // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
- $numeroSemaine = (
- (
- date("z",mktime(12,0,0,date("m",$jeudiSemaine),date("d",$jeudiSemaine),date("Y",$jeudiSemaine)))
- -
- date("z",mktime(12,0,0,date("m",$premierJeudiAnnee),date("d",$premierJeudiAnnee),date("Y",$premierJeudiAnnee)))
- ) / 7
- ) + 1;
+ // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
+ $numeroSemaine = (
+ (
+ date("z",mktime(12,0,0,date("m",$jeudiSemaine),date("d",$jeudiSemaine),date("Y",$jeudiSemaine)))
+ -
+ date("z",mktime(12,0,0,date("m",$premierJeudiAnnee),date("d",$premierJeudiAnnee),date("Y",$premierJeudiAnnee)))
+ ) / 7
+ ) + 1;
- // Cas particulier de la semaine 53
- if ($numeroSemaine==53)
- {
- // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
- if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
- {
- $numeroSemaine = 53;
- }
- else
- {
- $numeroSemaine = 1;
- }
- }
+ // Cas particulier de la semaine 53
+ if ($numeroSemaine==53)
+ {
+ // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
+ if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
+ {
+ $numeroSemaine = 53;
+ }
+ else
+ {
+ $numeroSemaine = 1;
+ }
+ }
- //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."
";
+ //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."
";
- return sprintf("%02d",$numeroSemaine);
+ return sprintf("%02d",$numeroSemaine);
}
@@ -822,28 +862,28 @@ function numero_semaine($time)
*/
function weight_convert($weight,&$from_unit,$to_unit)
{
- /* Pour convertire 320 gr en Kg appeler
- * $f = -3
- * weigh_convert(320, $f, 0) retournera 0.32
- *
- */
- while ($from_unit <> $to_unit)
- {
- if ($from_unit > $to_unit)
- {
- $weight = $weight * 10;
- $from_unit = $from_unit - 1;
- $weight = weight_convert($weight,$from_unit, $to_unit);
- }
- if ($from_unit < $to_unit)
- {
- $weight = $weight / 10;
- $from_unit = $from_unit + 1;
- $weight = weight_convert($weight,$from_unit, $to_unit);
- }
- }
+ /* Pour convertire 320 gr en Kg appeler
+ * $f = -3
+ * weigh_convert(320, $f, 0) retournera 0.32
+ *
+ */
+ while ($from_unit <> $to_unit)
+ {
+ if ($from_unit > $to_unit)
+ {
+ $weight = $weight * 10;
+ $from_unit = $from_unit - 1;
+ $weight = weight_convert($weight,$from_unit, $to_unit);
+ }
+ if ($from_unit < $to_unit)
+ {
+ $weight = $weight / 10;
+ $from_unit = $from_unit + 1;
+ $weight = weight_convert($weight,$from_unit, $to_unit);
+ }
+ }
- return $weight;
+ return $weight;
}
@@ -856,58 +896,58 @@ function weight_convert($weight,&$from_unit,$to_unit)
*/
function dol_set_user_param($db, $conf, &$user, $tab)
{
- // Verification parametres
- if (sizeof($tab) < 1) return -1;
+ // Verification parametres
+ if (sizeof($tab) < 1) return -1;
- $db->begin();
+ $db->begin();
- // We remove old parameters for all keys in $tab
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
- $sql.= " WHERE fk_user = ".$user->id;
- $sql.= " AND entity = ".$conf->entity;
- $sql.= " AND param in (";
- $i=0;
- foreach ($tab as $key => $value)
- {
- if ($i > 0) $sql.=',';
- $sql.="'".$key."'";
- $i++;
- }
- $sql.= ")";
- dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
+ // We remove old parameters for all keys in $tab
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
+ $sql.= " WHERE fk_user = ".$user->id;
+ $sql.= " AND entity = ".$conf->entity;
+ $sql.= " AND param in (";
+ $i=0;
+ foreach ($tab as $key => $value)
+ {
+ if ($i > 0) $sql.=',';
+ $sql.="'".$key."'";
+ $i++;
+ }
+ $sql.= ")";
+ dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
- $resql=$db->query($sql);
- if (! $resql)
- {
- dol_print_error($db);
- $db->rollback();
- return -1;
- }
+ $resql=$db->query($sql);
+ if (! $resql)
+ {
+ dol_print_error($db);
+ $db->rollback();
+ return -1;
+ }
- foreach ($tab as $key => $value)
- {
- // Set new parameters
- if ($value && (! $url || in_array($key,array('sortfield','sortorder','begin','page'))))
- {
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
- $sql.= " VALUES (".$user->id.",".$conf->entity.",";
- $sql.= " '".$key."','".addslashes($value)."');";
- dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
+ foreach ($tab as $key => $value)
+ {
+ // Set new parameters
+ if ($value && (! $url || in_array($key,array('sortfield','sortorder','begin','page'))))
+ {
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
+ $sql.= " VALUES (".$user->id.",".$conf->entity.",";
+ $sql.= " '".$key."','".addslashes($value)."');";
+ dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
- $result=$db->query($sql);
- if (! $result)
- {
- dol_print_error($db);
- $db->rollback();
- return -1;
- }
+ $result=$db->query($sql);
+ if (! $result)
+ {
+ dol_print_error($db);
+ $db->rollback();
+ return -1;
+ }
- $user->page_param[$key] = $value;
- }
- }
+ $user->page_param[$key] = $value;
+ }
+ }
- $db->commit();
- return 1;
+ $db->commit();
+ return 1;
}
@@ -918,17 +958,17 @@ function dol_set_user_param($db, $conf, &$user, $tab)
*/
function dol_print_reduction($reduction=0,$langs)
{
- $string = '';
- if ($reduction == 100)
- {
- $string = $langs->trans("Offered");
- }
- else
- {
- $string = $reduction.'%';
- }
+ $string = '';
+ if ($reduction == 100)
+ {
+ $string = $langs->trans("Offered");
+ }
+ else
+ {
+ $string = $reduction.'%';
+ }
- return $string;
+ return $string;
}
@@ -938,14 +978,14 @@ function dol_print_reduction($reduction=0,$langs)
*/
function version_os()
{
- // Get version of OS
- ob_start();
- phpinfo();
- $chaine = ob_get_contents();
- ob_end_clean();
- preg_match('/System <\/td>([^<]*)<\/td>/i',$chaine,$reg);
- $osversion=$reg[1];
- return $osversion;
+ // Get version of OS
+ ob_start();
+ phpinfo();
+ $chaine = ob_get_contents();
+ ob_end_clean();
+ preg_match('/System <\/td> | ([^<]*)<\/td>/i',$chaine,$reg);
+ $osversion=$reg[1];
+ return $osversion;
}
/**
@@ -954,7 +994,7 @@ function version_os()
*/
function version_php()
{
- return phpversion();
+ return phpversion();
}
/**
@@ -963,7 +1003,7 @@ function version_php()
*/
function version_dolibarr()
{
- return DOL_VERSION;
+ return DOL_VERSION;
}
/**
@@ -972,7 +1012,7 @@ function version_dolibarr()
*/
function version_webserver()
{
- return $_SERVER["SERVER_SOFTWARE"];
+ return $_SERVER["SERVER_SOFTWARE"];
}
@@ -984,78 +1024,78 @@ function version_webserver()
*/
function getListOfModels($db,$type)
{
- global $conf,$langs;
- $liste=array();
- $found=0;
+ global $conf,$langs;
+ $liste=array();
+ $found=0;
- $dirtoscan='';
+ $dirtoscan='';
- $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";
- $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
- $sql.= " WHERE type = '".$type."'";
- $sql.= " AND entity = ".$conf->entity;
+ $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";
+ $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+ $sql.= " WHERE type = '".$type."'";
+ $sql.= " AND entity = ".$conf->entity;
- $resql = $db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i = 0;
- while ($i < $num)
- {
- $found=1;
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ while ($i < $num)
+ {
+ $found=1;
- $obj = $db->fetch_object($resql);
+ $obj = $db->fetch_object($resql);
- // If this generation module needs to scan a directory, then description field is filled
- // with the constant that contains list of directories to scan.
- if (! empty($obj->description)) // List of directories to scan is defined
- {
- $const=$obj->description;
- $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+ // If this generation module needs to scan a directory, then description field is filled
+ // with the constant that contains list of directories to scan.
+ if (! empty($obj->description)) // List of directories to scan is defined
+ {
+ $const=$obj->description;
+ $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
- $listoffiles=array();
+ $listoffiles=array();
- // Now we add models found in directories scanned
- $listofdir=explode(',',$dirtoscan);
- foreach($listofdir as $key=>$tmpdir)
- {
- $tmpdir=trim($tmpdir);
- $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
- if (! $tmpdir) { unset($listofdir[$key]); continue; }
- if (is_dir($tmpdir))
- {
- $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.odt');
- if (sizeof($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
- }
- }
+ // Now we add models found in directories scanned
+ $listofdir=explode(',',$dirtoscan);
+ foreach($listofdir as $key=>$tmpdir)
+ {
+ $tmpdir=trim($tmpdir);
+ $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+ if (! $tmpdir) { unset($listofdir[$key]); continue; }
+ if (is_dir($tmpdir))
+ {
+ $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.odt');
+ if (sizeof($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+ }
+ }
- if (sizeof($listoffiles))
- {
- foreach($listoffiles as $record)
- {
- $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],24,'middle');
- }
- }
- else
- {
- $liste[0]=$obj->label.': '.$langs->trans("None");
- }
- }
- else
- {
- $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
- }
- $i++;
- }
- }
- else
- {
+ if (sizeof($listoffiles))
+ {
+ foreach($listoffiles as $record)
+ {
+ $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],24,'middle');
+ }
+ }
+ else
+ {
+ $liste[0]=$obj->label.': '.$langs->trans("None");
+ }
+ }
+ else
+ {
+ $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
+ }
+ $i++;
+ }
+ }
+ else
+ {
dol_print_error($db);
- return -1;
- }
+ return -1;
+ }
- if ($found) return $liste;
- else return 0;
+ if ($found) return $liste;
+ else return 0;
}
/**
@@ -1066,12 +1106,12 @@ function getListOfModels($db,$type)
*/
function is_ip($ip)
{
- if (!preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", $ip)) return 0;
- if (sprintf("%u",ip2long($ip)) == sprintf("%u",ip2long('255.255.255.255'))) return 0;
- if (sprintf("%u",ip2long('10.0.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('10.255.255.255'))) return 2;
- if (sprintf("%u",ip2long('172.16.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('172.31.255.255'))) return 2;
- if (sprintf("%u",ip2long('192.168.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('192.168.255.255'))) return 2;
- if (sprintf("%u",ip2long('169.254.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('169.254.255.255'))) return 2;
- return 1;
+ if (!preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", $ip)) return 0;
+ if (sprintf("%u",ip2long($ip)) == sprintf("%u",ip2long('255.255.255.255'))) return 0;
+ if (sprintf("%u",ip2long('10.0.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('10.255.255.255'))) return 2;
+ if (sprintf("%u",ip2long('172.16.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('172.31.255.255'))) return 2;
+ if (sprintf("%u",ip2long('192.168.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('192.168.255.255'))) return 2;
+ if (sprintf("%u",ip2long('169.254.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('169.254.255.255'))) return 2;
+ return 1;
}
|