/trunk/jrest/services/InventoryImportExcel.php |
---|
78,8 → 78,6 |
$pairs['utilisateur']=$_POST['identifiant']; |
session_start(); |
$this->controleUtilisateur($pairs['utilisateur']); |
348,7 → 346,7 |
$this->dernier_ordre++; |
list($jour,$mois,$annee)=split("/",$info_dateobs); |
list($jour,$mois,$annee)=explode("/",$info_dateobs); |
$info_dateobs=$annee."-".$mois."-".$jour." 0:0:0"; |
$query = "INSERT INTO cel_inventory (identifiant,ordre,nom_sel,num_nom_sel,nom_ret,num_nom_ret,num_taxon,famille,location,id_location,date_observation,lieudit,station, milieu, commentaire, transmission, date_creation,date_modification,coord_x,coord_y) " . |
" VALUES('".$DB->escapeSimple($utilisateur)."','". |
/trunk/jrest/services/InventoryKeyWordImageLink.php |
---|
29,7 → 29,6 |
public function createElement($pairs) { |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($pairs['ce_utilisateur']); |
if (!isset($pairs['mots_cles']) || !isset($pairs['images']) || !isset($pairs['ce_utilisateur'])) { |
55,7 → 54,6 |
$retour = false; |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[0]) || !isset($uid[1]) || !isset($uid[2]) || !$this->estUnIdentifiantMotCle($uid[2])) { |
/trunk/jrest/services/InventoryKeyWordObsLink.php |
---|
29,7 → 29,6 |
public function createElement($pairs) { |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($pairs['ce_utilisateur']); |
if (!isset($pairs['mots_cles']) || !isset($pairs['observations']) || !isset($pairs['ce_utilisateur'])) { |
52,7 → 51,6 |
$retour = false; |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[0]) || !isset($uid[1]) || !isset($uid[2]) || !$this->estUnIdentifiantMotCle($uid[2])) { |
/trunk/jrest/services/InventoryPDF.php |
---|
57,7 → 57,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[1]) || $uid[1]=="" || $uid[1]=="all" ) { |
141,8 → 140,8 |
} |
if ($obs['date_observation']!="0000-00-00 00:00:00") { |
list($year,$month,$day)= split ('-',$obs['date_observation']); |
list($day)= split (' ',$day); |
list($year,$month,$day)= explode('-',$obs['date_observation']); |
list($day)= explode(' ',$day); |
$obs['date_observation']=$day."/".$month."/".$year; |
} |
else { |
176,7 → 175,7 |
} |
if ($url_miniature!='') { |
list($debut,$ext)=split("\.",basename($url_miniature)); |
list($debut,$ext)=explode("\.",basename($url_miniature)); |
$temp = fopen($tempfn, "w"); |
$buf=file_get_contents($url_miniature); |
fwrite($temp,$buf); |
/trunk/jrest/services/InventoryImport.php |
---|
30,7 → 30,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$id_session_temporaire = session_id(); |
/trunk/jrest/services/InventoryUserList.php |
---|
25,7 → 25,6 |
function getElement($uid){ |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$requete_utilisateurs ='SELECT DISTINCT id_utilisateur, courriel FROM cel_utilisateurs' ; |
/trunk/jrest/services/InventoryImageList.php |
---|
32,7 → 32,6 |
{ |
//TODO : remplacer le contenu du $uid[1] par le tableau $_GET; |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$chercheur_images = new RechercheImage($this->config); |
80,7 → 79,6 |
function deleteElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[1]) || !$this->EstUneSuiteIdentifiantsImage($uid[1])) { |
/trunk/jrest/services/InventoryExport.php |
---|
36,7 → 36,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$criteres = array(); |
/trunk/jrest/services/InventoryImage.php |
---|
30,7 → 30,6 |
public function getElement($uid) |
{ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if(!isset($uid[0]) || !isset($uid[1])) { |
87,7 → 86,6 |
function createElement($pairs) |
{ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($pairs['ce_utilisateur']); |
foreach ($_FILES as $file) { |
125,7 → 123,6 |
function deleteElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[1]) || !$this->EstUneSuiteIdentifiantsImage($uid[1])) { |
/trunk/jrest/services/InventoryMaintenance.php |
---|
189,7 → 189,7 |
$id_fichier = "$id.jpg"; |
$niveauDossier = split('_', $id); |
$niveauDossier = explode('_', $id); |
$dossierNiveau1 = $niveauDossier[0]; |
$dossierNiveau2 = $niveauDossier[1]; |
/trunk/jrest/services/InventoryImageCount.php |
---|
31,7 → 31,6 |
{ |
//TODO : remplacer le contenu du $uid[1] par le tableau $_GET; |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$chercheur_images = new RechercheImage($this->config); |
/trunk/jrest/services/ImageDateList.php |
---|
32,7 → 32,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if(!is_numeric($uid[0])) { |
67,7 → 66,7 |
if($date['id'] == null || trim($date['id']) == '' || $date['id'] == 'null') { |
$date = '0000-00-00'; |
} else { |
$date_heures = split(' ',$date['id']); |
$date_heures = explode(' ',$date['id']); |
if(count($date_heures) > 1) { |
$date = $date_heures[0]; |
} else { |
/trunk/jrest/services/InventoryImageLink.php |
---|
29,7 → 29,6 |
function createElement($pairs) |
{ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($pairs['ce_utilisateur']); |
$ids_images = $pairs['id_image'] ; |
75,7 → 74,6 |
function getElement($uid) |
{ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if($uid) { |
82,7 → 80,7 |
$param = $uid[1] ; |
$tab_param = split('=',$param) ; |
$tab_param = explode('=',$param) ; |
$field = $tab_param[0] ; |
$value = $tab_param[1] ; |
137,7 → 135,6 |
function deleteElement($uid) |
{ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$id_img = $uid[1] ; |
/trunk/jrest/services/ImageRDF.php |
---|
64,7 → 64,7 |
$id_fichier = $id.".jpg" ; |
$niveauDossier = split("_", $id) ; |
$niveauDossier = explode("_", $id) ; |
$dossierNiveau1 = $niveauDossier[0] ; |
$dossierNiveau2 = $niveauDossier[1] ; |
84,8 → 84,8 |
$xml .= ' dcterms:spatial="'.utf8_decode($picture['zone_geo'])." (".$picture['ce_zone_geo'].")".'"'."\n"; |
if ($picture['date_observation'] != '0000-00-00 00:00:00') { |
list($year,$month,$day) = split ('-',$picture['date_observation']); |
list($day) = split (' ',$day); |
list($year,$month,$day) = explode('-',$picture['date_observation']); |
list($day) = explode(' ',$day); |
$created = $day.'/'.$month.'/'.$year; |
$xml .= ' dcterms:created="'.$created.'"'."\n"; |
} |
/trunk/jrest/services/User.php |
---|
46,7 → 46,6 |
$temps_expiration = 60*60*24*100; // 100 jours |
session_set_cookie_params($temps_expiration); |
session_start(); |
$utilisateur = $this->getUtilisateurAnonyme(); |
62,7 → 61,6 |
function getElement($uid){ |
session_start(); |
$utilisateur = $this->getUtilisateurAnonyme(); |
if ($this->identificationEstDemandee($uid)) { |
/trunk/jrest/services/InventoryTransmit.php |
---|
26,7 → 26,6 |
function updateElement($uid,$pairs) { |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (isset($uid[1]) && $this->estUneSuiteIdentifiantsObservation($uid[1])) { |
/trunk/jrest/services/SelfRefList.php |
---|
21,7 → 21,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!$this->paramObligatoiresSontPresents($uid)) { |
/trunk/jrest/services/InventoryLocationList.php |
---|
23,7 → 23,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$retour = array(); |
/trunk/jrest/services/ImageContribution.php |
---|
72,7 → 72,7 |
$id_fichier = $id.".jpg" ; |
$niveauDossier = split("_", $id) ; |
$niveauDossier = explode("_", $id) ; |
$dossierNiveau1 = $niveauDossier[0] ; |
$dossierNiveau2 = $niveauDossier[1] ; |
/trunk/jrest/services/InventoryDateList.php |
---|
32,7 → 32,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$condition_requete = $this->traiterParametresEtConstruireRequete($uid); |
59,7 → 58,7 |
} |
foreach($liste_dates as &$date) { |
$date_heures = split(' ',$date['id']); |
$date_heures = explode(' ',$date['id']); |
if(count($date_heures) > 1) { |
$date = $date_heures[0]; |
} |
/trunk/jrest/services/Inventory.php |
---|
30,7 → 30,6 |
function getElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$value=array(); |
61,8 → 60,8 |
private function formaterObservationVersTableauSequentiel($observation) { |
if ($observation['date_observation']!="0000-00-00 00:00:00") { |
list($year,$month,$day)= split ('-',$observation['date_observation']); |
list($day)= split (' ',$day); |
list($year,$month,$day)= explode('-',$observation['date_observation']); |
list($day)= explode(' ',$day); |
$observation['date_observation']=$day."/".$month."/".$year; |
} |
81,7 → 80,6 |
function updateElement($uid,$pairs) { |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[1])) { |
101,7 → 99,6 |
function createElement($pairs){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($pairs['ce_utilisateur']); |
$gestionnaire_observation = new GestionObservation($this->config); |
119,7 → 116,6 |
function deleteElement($uid){ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[1])) { |
/trunk/jrest/services/InventoryKeyWordList.php |
---|
24,7 → 24,6 |
public function getElement($uid) { |
// Controle detournement utilisateur |
session_start(); |
$this->suffix = '_'.$uid[0]; |
$id_utilisateur = $uid[1] ; |
$this->controleUtilisateur($uid[1]); |
50,7 → 49,6 |
} |
public function updateElement($uid, $pairs) { |
session_start(); |
$this->suffix = '_'.$uid[0]; |
$id_utilisateur = $uid[1]; |
$this->controleUtilisateur($uid[1]); |
120,7 → 118,6 |
public function createElement($pairs) { |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($pairs['ce_utilisateur']); |
$this->suffix = '_'.$pairs['mode']; |
166,7 → 163,6 |
} |
public function deleteElement($uid) { |
session_start(); |
$this->suffix = '_'.$uid[0]; |
$id_utilisateur = $uid[1]; |
/trunk/jrest/services/LocationSearch.php |
---|
72,7 → 72,7 |
$lieu = $params; |
$lieu=ltrim($lieu); |
$lieu=ereg_replace('\*+','%',$lieu); |
$lieu=preg_replace('/\*+/','%',$lieu); |
return $lieu; |
} |
/trunk/jrest/services/Resume.php |
---|
75,7 → 75,7 |
$id_fichier = $id.".jpg" ; |
$niveauDossier = split("_", $id) ; |
$niveauDossier = explode("_", $id) ; |
$dossierNiveau1 = $niveauDossier[0] ; |
$dossierNiveau2 = $niveauDossier[1] ; |
/trunk/jrest/services/InventoryImageExport.php |
---|
119,7 → 119,7 |
$id = sprintf('%09s', $id) ; |
$id = wordwrap($id, 3 , '_', true) ; |
$niveauDossier = split("_", $id) ; |
$niveauDossier = explode("_", $id) ; |
$dossierNiveau1 = $niveauDossier[0] ; |
$dossierNiveau2 = $niveauDossier[1] ; |
280,7 → 280,7 |
$id_fichier = $id.".jpg" ; |
$niveauDossier = split("_", $id) ; |
$niveauDossier = explode("_", $id) ; |
$dossierNiveau1 = $niveauDossier[0] ; |
$dossierNiveau2 = $niveauDossier[1] ; |
/trunk/jrest/services/Cel.php |
---|
31,6 → 31,8 |
protected $debug = array(); |
public function __construct($config) { |
@session_start(); |
// Tableau contenant la config de Jrest |
$this->config = $config; |
361,7 → 363,7 |
public function isAdmin($id) { |
$admins = $this->config['jrest_admin']['admin']; |
$admin_tab = split(',',$admins); |
$admin_tab = explode(',',$admins); |
if (in_array($id,$admin_tab)) { |
return true; |
371,10 → 373,11 |
} |
public function controleUtilisateur($id) { |
if ($_SESSION['user']['name'] == '') { |
if (isset($_SESSION['user']) && isset($_SESSION['user']['name']) && $_SESSION['user']['name'] == '') { |
//cas de la session temporaire, on ne fait rien de particulier |
} else { |
if (!$this->isAdmin($_SESSION['user']['name']) && $_SESSION['user']['name'] != $id) { |
if (isset($_SESSION['user']) && isset($_SESSION['user']['name']) && !$this->isAdmin($_SESSION['user']['name']) && $_SESSION['user']['name'] != $id) { |
// cas d'usurpation d'identité |
print 'Accès interdit'; |
exit(); |
758,4 → 761,6 |
$contenu = preg_replace("/;*\s*\?>/", "; ?>", $contenu); |
return $contenu; |
} |
} |
} |
?> |
/trunk/jrest/services/InventoryObservationList.php |
---|
42,7 → 42,6 |
function getElement($uid) |
{ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
$chercheur_observations = new RechercheObservation($this->config); |
84,7 → 83,6 |
function updateElement($uid,$pairs) { |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[1])) { |
109,7 → 107,6 |
function deleteElement($uid) |
{ |
// Controle detournement utilisateur |
session_start(); |
$this->controleUtilisateur($uid[0]); |
if (!isset($uid[1])) { |
/trunk/jrest/services/InventoryByDept.php |
---|
91,8 → 91,8 |
} |
if ($obs['date_observation']!="0000-00-00 00:00:00") { |
list($year,$month,$day)= split ('-',$obs['date_observation']); |
list($day)= split (' ',$day); |
list($year,$month,$day)= explode('-',$obs['date_observation']); |
list($day)= explode(' ',$day); |
$obs['date_observation']=$day."/".$month."/".$year; |
} |
else { |
/trunk/jrest/lib/ExcelReader/excel_reader2.php |
---|
77,7 → 77,7 |
// http://uk.php.net/manual/en/function.getdate.php |
function gmgetdate($ts = null){ |
$k = array('seconds','minutes','hours','mday','wday','mon','year','yday','weekday','month',0); |
return(array_comb($k,split(":",gmdate('s:i:G:j:w:n:Y:z:l:F:U',is_null($ts)?time():$ts)))); |
return(array_comb($k,explode(":",gmdate('s:i:G:j:w:n:Y:z:l:F:U',is_null($ts)?time():$ts)))); |
} |
// Added for PHP4 compatibility |
842,7 → 842,7 |
// Custom pattern can be POSITIVE;NEGATIVE;ZERO |
// The "text" option as 4th parameter is not handled |
$parts = split(";",$format); |
$parts = explode(";",$format); |
$pattern = $parts[0]; |
// Negative pattern |
if (count($parts)>2 && $num==0) { |
/trunk/jrest/lib/Spreadsheet/Excel/Writer/Worksheet.php |
---|
1187,7 → 1187,7 |
$row = $match[2]; |
// Convert base26 column string to number |
$chars = split('', $col); |
$chars = explode('', $col); |
$expn = 0; |
$col = 0; |
1830,13 → 1830,13 |
// Determine if the link contains a sheet reference and change some of the |
// parameters accordingly. |
// Split the dir name and sheet name (if it exists) |
list($dir_long , $sheet) = split('/\#/', $url); |
list($dir_long , $sheet) = explode('/\#/', $url); |
$link_type = 0x01 | $absolute; |
if (isset($sheet)) { |
$link_type |= 0x08; |
$sheet_len = pack("V", strlen($sheet) + 0x01); |
$sheet = join("\0", split('', $sheet)); |
$sheet = join("\0", explode('', $sheet)); |
$sheet .= "\0\0\0"; |
} |
else { |
1855,7 → 1855,7 |
$dir_short = preg_replace('/\.\.\\/', '', $dir_long) . "\0"; |
// Store the long dir name as a wchar string (non-null terminated) |
$dir_long = join("\0", split('', $dir_long)); |
$dir_long = join("\0", explode('', $dir_long)); |
$dir_long = $dir_long . "\0"; |
// Pack the lengths of the dir strings |
/trunk/jrest/lib/Spreadsheet/Excel/Writer/Parser.php |
---|
646,10 → 646,10 |
// Split the range into 2 cell refs |
if(preg_match("/^([A-I]?[A-Z])(\d+)\:([A-I]?[A-Z])(\d+)$/",$range)) { |
list($cell1, $cell2) = split(':', $range); |
list($cell1, $cell2) = explode(':', $range); |
} |
elseif(preg_match("/^([A-I]?[A-Z])(\d+)\.\.([A-I]?[A-Z])(\d+)$/",$range)) { |
list($cell1, $cell2) = split('\.\.', $range); |
list($cell1, $cell2) = explode('\.\.', $range); |
} |
else { |
698,7 → 698,7 |
$class = 2; // as far as I know, this is magick. |
// Split the ref at the ! symbol |
list($ext_ref, $range) = split('!', $token); |
list($ext_ref, $range) = explode('!', $token); |
// Convert the external reference part |
$ext_ref = $this->_packExtRef($ext_ref); |
707,7 → 707,7 |
} |
// Split the range into 2 cell refs |
list($cell1, $cell2) = split(':', $range); |
list($cell1, $cell2) = explode(':', $range); |
// Convert the cell references |
if (preg_match("/^(\$)?[A-I]?[A-Z](\$)?(\d+)$/", $cell1)) |
796,7 → 796,7 |
$class = 2; // as far as I know, this is magick. |
// Split the ref at the ! symbol |
list($ext_ref, $cell) = split('!', $cell); |
list($ext_ref, $cell) = explode('!', $cell); |
// Convert the external reference part |
$ext_ref = $this->_packExtRef($ext_ref); |
840,7 → 840,7 |
// Check if there is a sheet range eg., Sheet1:Sheet2. |
if (preg_match("/:/", $ext_ref)) |
{ |
list($sheet_name1, $sheet_name2) = split(':', $ext_ref); |
list($sheet_name1, $sheet_name2) = explode(':', $ext_ref); |
$sheet1 = $this->_getSheetIndex($sheet_name1); |
if ($sheet1 == -1) { |