| 91,6 → 91,7 |
|---|
| $this->messages[] = 'La ressource demandée a retourné une valeur nulle.'; |
| } else { |
| if (isset($retour['donnees'])) { |
| $retour['donnees']['conf_mode'] = $this->config['parametres']['modeServeur']; |
| $retour['donnees']['prod'] = ($this->config['parametres']['modeServeur'] === 'prod'); |
| $retour['donnees']['bar'] = $this->bar; |
| $retour['donnees']['url_base'] = sprintf($this->config['chemins']['baseURLAbsoluDyn'], ''); |
| 100,7 → 101,11 |
|---|
| $retour['donnees']['url_ws_upload'] = sprintf($this->config['chemins']['baseURLServicesCelTpl'], self::WS_UPLOAD); |
| $retour['donnees']['authTpl'] = $this->config['manager']['authTpl'].'?projet='.$this->parametres['projet'].'&langue='.$this->parametres['langue']; |
| $retour['donnees']['mode'] = $mode; |
| $squelette = dirname(__FILE__).self::DS.'squelettes'.self::DS.$retour['squelette'].'.tpl.html'; |
| if( isset( $this->parametres['squelette'] ) ) { |
| $squelette = dirname(__FILE__).self::DS.'squelettes'.self::DS. $this->parametres['squelette'].'.tpl.html'; |
| } else { |
| $squelette = dirname(__FILE__).self::DS.'squelettes'.self::DS.$retour['squelette'].'.tpl.html'; |
| } |
| $contenu = $this->traiterSquelettePhp($squelette, $retour['donnees']); |
| } else { |
| $this->messages[] = 'Les données à transmettre au squelette sont nulles.'; |
| 222,10 → 227,8 |
|---|
| $retour = array(); |
| $referentiel = $infos_projets['referentiel']; |
| $urlWsNsTpl = $this->config['chemins']['baseURLServicesEfloreTpl']; |
| $urlWsNs = sprintf( $urlWsNsTpl, self::EFLORE_API_VERSION, $referentiel, self::WS_NOM ); |
| $urlWsNsSansRef = sprintf( $urlWsNsTpl, self::EFLORE_API_VERSION, '{referentiel}', self::WS_NOM ); |
| $retour['url_ws_autocompletion_ns'] = $urlWsNs; |
| $retour['url_ws_autocompletion_ns_tpl'] = $urlWsNsSansRef; |
| $retour['url_ws_autocompletion_ns'] = sprintf( $urlWsNsTpl, self::EFLORE_API_VERSION, $referentiel, self::WS_NOM );; |
| $retour['url_ws_autocompletion_ns_tpl'] = sprintf( $urlWsNsTpl, self::EFLORE_API_VERSION, '{referentiel}', self::WS_NOM ); |
| $retour['ns_referentiel'] = $referentiel; |
| |
| if ( isset( $infos_projets['type_especes'] ) ) { |
| 357,7 → 360,7 |
|---|
| $taxons = array(); |
| $langue_projet_url = ( isset ( $this->parametres['langue'] ) && $this->parametres['langue'] !== 'fr' ) ? '_' . $this->parametres['langue'] : ''; |
| $chemin_images = dirname(__FILE__) . self::DS . '..' . self::DS . 'manager' . self::DS . 'squelettes' . self::DS . 'img' . self::DS . 'images_projets' . self::DS; |
| $fichier_csv = $chemin_images . $this->parametres['projet'] . $langue_projet_url . self::DS . 'especes.csv'; ; |
| $fichier_csv = $chemin_images . $this->parametres['projet'] . $langue_projet_url . self::DS . 'especes.csv'; |
| |
| if ( file_exists( $fichier_csv ) && is_readable( $fichier_csv ) ) { |
| $taxons = $this->decomposerFichierCsv( $fichier_csv ); |
| 402,12 → 405,12 |
|---|
| if (is_array($value)) { |
| $dimensions[$i] = array2js($value,$show_keys); |
| if ($show_keys) { |
| $dimensions[$i] = '"'.$key.'":'.$dimensions[$i]; |
| $dimensions[$i] = '\"'.$key.'\":'.$dimensions[$i]; |
| } |
| } else { |
| $dimensions[$i] = '"'.addslashes($value).'"'; |
| $dimensions[$i] = '\"'.addslashes($value).'\"'; |
| if ($show_keys) { |
| $dimensions[$i] = '"'.$key.'":'.$dimensions[$i]; |
| $dimensions[$i] = '\"'.$key.'\":'.$dimensions[$i]; |
| } |
| } |
| if ($i == 0) { |
| 426,7 → 429,7 |
|---|
| private function remove_accents($string) { |
| if ( !preg_match('/[\x80-\xff]/', $string) ) |
| return $string; |
| |
| |
| $chars = array( |
| // Decompositions for Latin-1 Supplement |
| chr(195).chr(128) => 'A', chr(195).chr(129) => 'A', |