| /branches/v1.8-narince/jrest/services/CoelImport.php |
|---|
| 19,7 → 19,7 |
| /** |
| * Méthode appelée avec une requête de type GET. |
| */ |
| public function getElement($params = array()) { |
| public function getElement($params = array()) { |
| if(!empty($_SESSION['coel']['import_stat'])) { |
| header('Content-type : application/json'); |
| echo json_encode($_SESSION['coel']['import_stat']); |
| 106,8 → 106,14 |
| private function importerPublications($nom_fichier) { |
| $utilisateur = array('id' => '', 'session' => session_id(), 'ip' => $_SERVER['REMOTE_ADDR']); |
| if(!empty($utilisateur_connecte = $this->getUtilisateur())) { |
| $utilisateur['id'] = $utilisateur_connecte['id']; |
| } |
| $retour = false; |
| $script = sprintf($this->chemin_script, $nom_fichier); |
| $script = sprintf($this->chemin_script, $nom_fichier, "'".json_encode($utilisateur)."'"); |
| exec($script, $retour); |
| return array_pop($retour); |
| } |
| /branches/v1.8-narince/jrest/jrest.ini.php.defaut |
|---|
| 22,6 → 22,6 |
| correctionMdp = |
| dossier_import_tmp = "/home/utilisateur/web/tmp/coel/" |
| chemin_script_import = "/opt/lampp/bin/php-5.5.9 /home/utilisateur/web/coel/scripts/cli.php import -a import -n %s" |
| chemin_script_import = "/opt/lampp/bin/php-5.5.9 /home/utilisateur/web/coel/scripts/cli.php import -a import -n %s -u %s" |
| ;*/?> |
| /branches/v1.8-narince/src/org/tela_botanica/client/Modele.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/Modele.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/Mediateur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/Mediateur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/ComposantClass.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/ComposantClass.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client:r1882 |