/trunk/jrest/services/InventoryExport.php |
---|
82,6 → 82,11 |
$limite = isset($criteres['limite']) ? $criteres['limite'] : 0; |
$observations = $chercheur_observations->rechercherObservations($uid[0], $criteres, $numero_page, $limite)->get(); |
if(!$observations) { |
header('HTTP/1.0 204 No Content'); |
exit; |
} |
$ids_obs = array(); |
$indices_lignes_obs = array(); |
/trunk/jrest/services/ExportXLS.php |
---|
84,7 → 84,7 |
$parametres['debut'] = isset($params['debut']) ? intval($params['debut']) : 0; |
$parametres['limite'] = isset($params['limite']) ? intval($params['limite']) : 0; |
$parametres['id_utilisateur'] = $this->traiterIdUtilisateur($uid); |
$parametres['groupe_champs'] = isset($criteres['colonnes']) ? $criteres['colonnes'] : 'standard,avance'; |
$parametres['groupe_champs'] = isset($params['colonnes']) ? $params['colonnes'] : 'standard,avance'; |
return $parametres; |
} |
190,7 → 190,7 |
$no_colonne = 0; |
foreach($colonnes as $abbrev => $colonne) { |
$valeur = null; |
if($colonne['extra'] == 2) continue; |
if($colonne['extra'] == 2 || ! is_null($colonne['dyna'])) continue; |
// valeur direct depuis cel_obs ? |
if(isset($obs[$abbrev])) $valeur = $obs[$abbrev]; |
/trunk/jrest/services/CelWidgetExport.php |
---|
154,6 → 154,7 |
$criteres['transmission'] = 1; |
if($this->doitEtPeutExporterObsPrivees($criteres)) { |
unset($criteres['transmission']); |
$this->id_utilisateur = $criteres['ce_utilisateur']; |
} |
$chercheur_observations = new RechercheObservation($this->config); |
/trunk/jrest/lib/RechercheObservation.php |
---|
131,7 → 131,7 |
$id_obs = $this->proteger($id_obs); |
$requete = "SELECT courriel_utilisateur FROM cel_obs WHERE id_observation = $id_obs"; |
$utilisateur_courriel = $this->executerRequete($requete); |
$utilisateur_courriel = $this->executerRequete($requete . ' -- ' . __FILE__ . ':' . __LINE__); |
$retour = false; |
if (!empty($utilisateur_courriel) && isset($utilisateur_courriel[0]['courriel_utilisateur'])) { |
/trunk/jrest/lib/GestionImage.php |
---|
276,7 → 276,7 |
$manipulateur_image = new ImageRecreation($this->config); |
$tableau_ids_image = explode(',',$ids_images); |
$tableau_ids_image = explode(',',$chaine_ids_images); |
foreach($tableau_ids_image as $id_image_a_detruire) { |
$destruction_fichier_image = $manipulateur_image->detruireImageSurDisque($id_image_a_detruire); |
/trunk/jrest/lib/ImageRecreation.php |
---|
482,6 → 482,19 |
return $destruction_formats_fichier; |
} |
// recopie de Cel->logger() (pas d'extends pour ça) |
public function logger($index,$chaine) { |
if(!class_exists('Log')) { |
Log::getInstance(); |
} |
Log::setCheminLog($this->config['log']['cheminlog']); |
Log::setTimeZone($this->config['log']['timezone']); |
Log::setTailleMax($this->config['log']['taillemax']); |
Log::ajouterEntree($index,$chaine); |
} |
/* |
* edge-maximizing crop |
* determines center-of-edginess, then tries different-sized crops around it. |
/trunk/jrest/lib/Cel.php |
---|
396,7 → 396,7 |
return true; |
} |
public function logger($index,$chaine) { |
public function logger($index,$chaine = 'err') { |
if(!class_exists('Log')) { |
Log::getInstance(); |
} |