PluginProbe
HAL / 2.3
HAL v2.3
trunk 1.0 1.1 1.2 1.3 1.4 1.4.2 1.4.3 1.4.4 2.0 2.0.1 2.0.10 2.0.2 2.0.6 2.0.7 2.0.8 2.0.9 2.1.0 2.1.1 2.2 2.3 2.4 2.4.1 2.4.2 2.5 All 30 releases
← All changes | wp-hal.php +653 -419 2.0 → 2.3 View file →
@@ -2,10 +2,10 @@
2 2 /**
3 3 * Plugin Name: HAL
4 4 * Plugin URI: http://www.ccsd.cnrs.fr
5 5 * Description: Crée une page qui remonte les publications d'un auteur ou d'une structure en relation avec HAL et un widget des dernières publications d'un auteur ou d'une structure.
6 - * Version: 2.0
7 - * Author: Baptiste Blondelle
6 + * Version: 2.3
7 + * Author: CCSD
8 8 * Author URI: http://www.ccsd.cnrs.fr
9 9 * Text Domain: wp-hal
10 10 * Domain Path: /lang/
11 11 */
@@ -17,28 +17,38 @@
17 17 //Récupère les constantes
18 18 require_once("constantes.php");
19 19
20 20
21 -if (locale == 'fr_FR') {
22 - define('lang', 'fr');
23 -} elseif (locale == 'es_ES') {
24 - define('lang', 'es');
21 +if (wphal_locale == 'fr_FR') {
22 + define('wphal_lang', 'fr');
23 +} elseif (wphal_locale == 'es_ES') {
24 + define('wphal_lang', 'es');
25 25 } else {
26 - define('lang', 'en');
26 + define('wphal_lang', 'en');
27 27 }
28 28
29 +function wphal_is_curl_installed() {
30 + $loaded_extentions = get_loaded_extensions();
31 + if (in_array ('curl', $loaded_extentions)) {
32 + return true;
33 + }
34 + else {
35 + return false;
36 + }
37 +}
38 +
29 39 // Création du shortcode ('nom du shortcode', 'fonction appelée')
30 -add_shortcode( 'cv-hal', 'cv_hal' );
31 -add_shortcode( 'nb-doc', 'nb_doc' );
40 +add_shortcode( 'cv-hal', 'wphal_cv_hal' );
41 +add_shortcode( 'nb-doc', 'wphal_nb_doc' );
32 42
33 43
34 -function charger_languages() {
44 +function wphal_charger_languages() {
35 45 load_plugin_textdomain('wp-hal', false, dirname(plugin_basename(__FILE__)) . '/lang/');
36 46 }
37 47
38 -add_action('plugins_loaded', 'charger_languages');
48 +add_action('plugins_loaded', 'wphal_charger_languages');
39 49
40 -function hal_plugin_action_links( $links, $file ) {
50 +function wphal_action_links( $links, $file ) {
41 51 if ( $file != plugin_basename( __FILE__ ))
42 52 return $links;
43 53
44 54 $settings_link = '<a href="admin.php?page=wp-hal.php">' . __( 'Paramètres', 'wp-hal' ) . '</a>';
@@ -47,18 +57,77 @@
47 57
48 58 return $links;
49 59 }
50 60
61 +add_filter( 'query_vars', 'wphal_query_vars' );
62 +function wphal_query_vars( $query_vars ) {
63 + $query_vars[] = 'hal_page';
64 + return $query_vars;
65 +}
51 66
52 -add_filter( 'plugin_action_links', 'hal_plugin_action_links',10,2);
67 +add_filter( 'plugin_action_links', 'wphal_action_links',10,2);
68 +/**
69 + * @param $url
70 + * @return object
71 + */
72 +function wphal_do_common_curl_call($url) {
73 + $response = wp_remote_get($url, [
74 + 'timeout'=>20,
75 + 'user-agent'=>"HAL Plugin Wordpress " . wphal_version,
76 + 'headers' => ['Content-type'=> 'application/json']
77 + ]);
78 + // we could ve parsed the response but if in general if no results then we get empty content
79 + $body = wp_remote_retrieve_body($response);
80 + // Récupération du résultat JSON
81 + $json = json_decode($body);
82 + return $json;
83 +}
53 84
85 +function wphal_clear_transients()
86 +{
87 + global $wpdb;
88 + // delete all "hal namespace" transients
89 + $sql = "
90 + DELETE
91 + FROM {$wpdb->options}
92 + WHERE option_name like '\_transient\_hal\_%'
93 + OR option_name like '\_transient\_timeout\_hal\_%'
94 + ";
54 95
55 -/***********************************************************************************************************************
96 + $wpdb->query($sql);
97 +}
98 +
99 +/**
100 + * fetches data from cache or download data from HAL API
101 + * @param $url
102 + * @return object
103 + */
104 +function wphal_do_get_data($url) {
105 + $transient_id = 'hal_'.md5($url);
106 + if(!empty(get_option('option_erase_cache'))){
107 + // we reset cache transient for hal namespace
108 + wphal_clear_transients();
109 + update_option('option_erase_cache', '');
110 + }
111 + $cache_expiration = empty(get_option('option_cache_timeout')) ? 1 * DAY_IN_SECONDS : intval(get_option('option_cache_timeout')) * MINUTE_IN_SECONDS;
112 + if ( false === ( $value = get_transient( $transient_id ) ) ) {
113 + $json = wphal_do_common_curl_call($url);
114 + if($json)
115 + set_transient( $transient_id, $json, $cache_expiration);
116 + return $json;
117 + } else{
118 + return $value;
119 + }
120 +}
121 +
122 +/**
56 123 * PLUGIN SHORTCODE ND-DOC
57 - **********************************************************************************************************************/
58 -function nb_doc($param)
124 + * @param $param
125 + * @return int
126 +*/
127 +function wphal_nb_doc($param)
59 128 {
60 - $idhal = verifSolr(get_option('option_idhal'));
129 + $idhal = wphal_verifSolr(get_option('option_idhal'));
61 130 extract(shortcode_atts(array(
62 131 'type' => get_option('option_type'),
63 132 'id' => $idhal
64 133 ),
@@ -63,126 +132,123 @@
63 132 'id' => $idhal
64 133 ),
65 134 $param
66 135 ));
67 - $id = verifSolr($id);
136 + /**
137 + * @var $id : defined by extract
138 + * @var string $type : defined by extract
139 + */
140 + $id = wphal_verifSolr($id);
68 141
69 - $url = api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&rows=0&wt=json';
70 - $ch = curl_init($url);
71 - // Options
72 - $options = array(
73 - CURLOPT_RETURNTRANSFER => true,
74 - CURLOPT_HTTPHEADER => array('Content-type: application/json'),
75 - CURLOPT_TIMEOUT => 10,
76 - CURLOPT_USERAGENT => "HAL Plugin Wordpress " . version
77 - );
142 + $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&rows=0&wt=json';
78 143
79 - // Bind des options et de l'objet cURL que l'on va utiliser
80 - curl_setopt_array($ch, $options);
81 - // Récupération du résultat JSON
82 - $json = json_decode(curl_exec($ch));
83 - curl_close($ch);
84 -
144 + $json =wphal_do_get_data($url);
85 145 return $json->response->numFound;
86 146 }
87 -/***********************************************************************************************************************
147 +/**
88 148 * PLUGIN SHORTCODE CV-HAL
89 - **********************************************************************************************************************/
90 -function cv_hal($param){
91 - if ( !function_exists('curl_init' ) ) {
92 - echo 'Please check the';?> <a href="https://wordpress.org/plugins/hal/faq/" target="_blank" id="curl">FAQ</a><?php echo ' with the code : CURL';
149 + * @param $param
150 + * @return string
151 + */
152 +function wphal_cv_hal($param){
153 + $content = '';
154 + if ( !wphal_is_curl_installed() ) {
155 + $content = 'CURL not installed, please check the <a href="https://wordpress.org/plugins/hal/faq/" target="_blank" id="curl">FAQ</a> with the code : CURL';
93 156 } else {
94 - if (get_option('option_idhal') != '') {
95 - $idhal = verifSolr(get_option('option_idhal'));
96 - extract(shortcode_atts(array(
97 - 'type' => get_option('option_type'),
98 - 'id' => $idhal,
99 - 'contact' => get_option('option_infocontact')
100 - ),
101 - $param
102 - ));
103 - $id = verifSolr($id);
157 + $possible_ids = ["authIdHal_s", "structId_i", "authStructId_i", "anrProjectId_i", "europeanProjectId_i", "collCode_s"];
158 + $option_choix = !empty(get_option('option_choix')) ? get_option('option_choix') : [];
159 + if(in_array('disciplines', $option_choix)){ //Lance les scripts pour le Graphique
160 + wp_enqueue_style('wp-hal-style2');
104 161
162 + wp_enqueue_script('wp-hal-script1');
163 + wp_enqueue_script('wp-hal-script2');
164 + wp_enqueue_script('wp-hal-script3');
165 + }
166 + $facetdomain = null;
167 +
168 + // those parameters are configured from plusing settings
169 + $default_id = wphal_verifSolr(get_option('option_idhal'));
170 + $default_type = get_option('option_type');
171 + $default_contact = get_option('option_infocontact');
172 + // here we merge with shortcode parameters
173 + extract(shortcode_atts(array(
174 + 'type' => $default_type,
175 + 'id' => $default_id,
176 + 'contact' => $default_contact
177 + ),
178 + $param
179 + ));
180 +
181 + /** @var $id : defined by extract
182 + * @var string $type : defined by extract
183 + * @var string $contact : defined by extract
184 + */
185 + if (!empty($id) && in_array($type, $possible_ids)) {
186 + $id = wphal_verifSolr($id);
187 +
105 188 if (get_option('option_groupe') == 'grouper') {
106 189 //cURL sur l'API pour récupérer les données
107 - $url = api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&group=true&group.field=docType_s&group.limit=1000&fl=docid,citationFull_s&facet.field=' . lang . '_domainAllCodeLabel_fs&facet.field=keyword_s&facet.field=journalIdTitle_fs&facet.field=producedDateY_i&facet.field=authIdLastNameFirstName_fs&facet.field=instStructIdName_fs&facet.field=labStructIdName_fs&facet.field=deptStructIdName_fs&facet.field=rteamStructIdName_fs&facet.mincount=1&facet=true&sort=' . producedDateY . '&wt=json&json.nl=arrarr';
190 + $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&group=true&group.field=docType_s&group.limit=1000&fl=docid,citationFull_s&facet.field=' . wphal_lang . '_domainAllCodeLabel_fs&facet.field=keyword_s&facet.field=journalIdTitle_fs&facet.field=producedDateY_i&facet.field=authIdLastNameFirstName_fs&facet.field=instStructIdName_fs&facet.field=labStructIdName_fs&facet.field=deptStructIdName_fs&facet.field=rteamStructIdName_fs&facet.mincount=1&facet=true&sort=' . wphal_producedDateY . '&wt=json&json.nl=arrarr';
108 191 } elseif (get_option('option_groupe') == 'paginer') {
109 - $url = api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&fl=docid,citationFull_s&facet.field=' . lang . '_domainAllCodeLabel_fs&facet.field=keyword_s&facet.field=journalIdTitle_fs&facet.field=producedDateY_i&facet.field=authIdLastNameFirstName_fs&facet.field=instStructIdName_fs&facet.field=labStructIdName_fs&facet.field=deptStructIdName_fs&facet.field=rteamStructIdName_fs&facet.mincount=1&facet=true&sort=' . producedDateY . '&wt=json&json.nl=arrarr';
192 + $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&fl=docid,citationFull_s&facet.field=' . wphal_lang . '_domainAllCodeLabel_fs&facet.field=keyword_s&facet.field=journalIdTitle_fs&facet.field=producedDateY_i&facet.field=authIdLastNameFirstName_fs&facet.field=instStructIdName_fs&facet.field=labStructIdName_fs&facet.field=deptStructIdName_fs&facet.field=rteamStructIdName_fs&facet.mincount=1&facet=true&sort=' . wphal_producedDateY . '&wt=json&json.nl=arrarr';
110 193 }
111 194
112 - $ch = curl_init($url);
113 - // Options
114 - $options = array(
115 - CURLOPT_RETURNTRANSFER => true,
116 - CURLOPT_HTTPHEADER => array('Content-type: application/json'),
117 - CURLOPT_TIMEOUT => 10,
118 - CURLOPT_USERAGENT => "HAL Plugin Wordpress " . version
119 - );
195 + $json = wphal_do_get_data($url);
196 + $hal_page = (get_query_var('hal_page')) ? get_query_var('hal_page') : 1;
120 197
121 - // Bind des options et de l'objet cURL que l'on va utiliser
122 - curl_setopt_array($ch, $options);
123 - // Récupération du résultat JSON
124 - $json = json_decode(curl_exec($ch));
125 - curl_close($ch);
198 + $content = '<div id="wphal-content">';
199 + if (is_array($option_choix) && !empty($option_choix)){
200 + $content .= '<ul id="wphal-menu">';
201 + $content .= '<li><a href="#publications" onclick="displayElem(\'publications\'); return false;" style="font-size:18px; text-decoration: none;">' . __('Publications', 'wp-hal') . '</a></li>';
126 202
127 - $paged = (get_query_var('paged')) ? get_query_var('paged') : 1;
128 -
129 - $choix = 0;
130 - for ($i = 1; $i < 10; $i++) {
131 - if (get_option('option_choix')[$i] != null) {
132 - $choix = $choix + 1;
133 - }
134 - }
135 -
136 - $content = '<div id="wphal-content">
137 - <ul id="wphal-menu">';
138 - $content .= '<li><a href="#publications" onclick="displayElem(\'publications\'); return false;" style="font-size:18px; text-decoration: none;">' . __('Publications', 'wp-hal') . '</a></li>';
139 - if ($choix != 0) {
140 203 $content .= '<li><a href="#filtres" onclick="return false;" style="font-size:18px; text-decoration: none; cursor:default;">' . __('Filtres', 'wp-hal') . '</a>';
141 204 $content .= '<ul id="wphal-filtres">';
142 - if (get_option('option_choix')[1] == 'contact') {
143 - $content .= '<li><a href="#contact" onclick="displayElem(\'wphal-contact\'); return false;" style="margin:1px; text-decoration: none;">' . __('Contact', 'wp-hal');
144 - $content .= '</a></li>';
205 + foreach ($option_choix as $option) {
206 + if ($option == 'contact') {
207 + $content .= '<li><a href="#contact" onclick="displayElem(\'wphal-contact\'); return false;" style="margin:1px; text-decoration: none;">' . __('Contact', 'wp-hal');
208 + $content .= '</a></li>';
209 + }
210 + if ($option == 'disciplines') {
211 + $content .= '<li><a href="#disciplines" onclick="displayElem(\'wphal-disciplines\'); return false;" style="margin:1px; text-decoration: none;">' . __('Disciplines', 'wp-hal');
212 + $content .= '</a></li>';
213 + }
214 + if ($option == 'mots-clefs') {
215 + $content .= '<li><a href="#keywords" onclick="displayElem(\'wphal-keywords\'); return false;" style="margin:1px; text-decoration: none;">' . __('Mots-clefs', 'wp-hal');
216 + $content .= '</a></li>';
217 + }
218 + if ($option == 'auteurs') {
219 + $content .= '<li><a href="#auteurs" onclick="displayElem(\'wphal-auteurs\'); return false;" style="margin:1px; text-decoration: none;">' . __('Auteurs', 'wp-hal');
220 + $content .= '</a></li>';
221 + }
222 + if ($option == 'revues') {
223 + $content .= '<li><a href="#revues" onclick="displayElem(\'wphal-revues\'); return false;" style="margin:1px; text-decoration: none;">' . __('Revues', 'wp-hal');
224 + $content .= '</a></li>';
225 + }
226 + if ($option == 'annee') {
227 + $content .= '<li><a href="#annees" onclick="displayElem(\'wphal-annees\'); return false;" style="margin:1px; text-decoration: none;">' . __('Année de production', 'wp-hal');
228 + $content .= '</a></li>';
229 + }
230 + if ($option == 'institution') {
231 + $content .= '<li><a href="#insts" onclick="displayElem(\'wphal-insts\'); return false;" style="margin:1px; text-decoration: none;">' . __('Institutions', 'wp-hal');
232 + $content .= '</a></li>';
233 + }
234 + if ($option == 'laboratoire') {
235 + $content .= '<li><a href="#labs" onclick="displayElem(\'wphal-labs\'); return false;" style="margin:1px; text-decoration: none;">' . __('Laboratoires', 'wp-hal');
236 + $content .= '</a></li>';
237 + }
238 + if ($option == 'departement') {
239 + $content .= '<li><a href="#depts" onclick="displayElem(\'wphal-depts\'); return false;" style="margin:1px; text-decoration: none;">' . __('Départements', 'wp-hal');
240 + $content .= '</a></li>';
241 + }
242 + if ($option == 'equipe') {
243 + $content .= '<li><a href="#equipes" onclick="displayElem(\'wphal-equipes\'); return false;" style="margin:1px; text-decoration: none;">' . __('Équipes de recherche', 'wp-hal');
244 + $content .= '</a></li>';
245 + }
145 246 }
146 - if (get_option('option_choix')[2] == 'disciplines') {
147 - $content .= '<li><a href="#disciplines" onclick="displayElem(\'wphal-disciplines\'); return false;" style="margin:1px; text-decoration: none;">' . __('Disciplines', 'wp-hal');
148 - $content .= '</a></li>';
149 - }
150 - if (get_option('option_choix')[3] == 'mots-clefs') {
151 - $content .= '<li><a href="#keywords" onclick="displayElem(\'wphal-keywords\'); return false;" style="margin:1px; text-decoration: none;">' . __('Mots-clefs', 'wp-hal');
152 - $content .= '</a></li>';
153 - }
154 - if (get_option('option_choix')[4] == 'auteurs') {
155 - $content .= '<li><a href="#auteurs" onclick="displayElem(\'wphal-auteurs\'); return false;" style="margin:1px; text-decoration: none;">' . __('Auteurs', 'wp-hal');
156 - $content .= '</a></li>';
157 - }
158 - if (get_option('option_choix')[5] == 'revues') {
159 - $content .= '<li><a href="#revues" onclick="displayElem(\'wphal-revues\'); return false;" style="margin:1px; text-decoration: none;">' . __('Revues', 'wp-hal');
160 - $content .= '</a></li>';
161 - }
162 - if (get_option('option_choix')[6] == 'annee') {
163 - $content .= '<li><a href="#annees" onclick="displayElem(\'wphal-annees\'); return false;" style="margin:1px; text-decoration: none;">' . __('Année de production', 'wp-hal');
164 - $content .= '</a></li>';
165 - }
166 - if (get_option('option_choix')[7] == 'institution') {
167 - $content .= '<li><a href="#insts" onclick="displayElem(\'wphal-insts\'); return false;" style="margin:1px; text-decoration: none;">' . __('Institutions', 'wp-hal');
168 - $content .= '</a></li>';
169 - }
170 - if (get_option('option_choix')[8] == 'laboratoire') {
171 - $content .= '<li><a href="#labs" onclick="displayElem(\'wphal-labs\'); return false;" style="margin:1px; text-decoration: none;">' . __('Laboratoires', 'wp-hal');
172 - $content .= '</a></li>';
173 - }
174 - if (get_option('option_choix')[9] == 'departement') {
175 - $content .= '<li><a href="#depts" onclick="displayElem(\'wphal-depts\'); return false;" style="margin:1px; text-decoration: none;">' . __('Départements', 'wp-hal');
176 - $content .= '</a></li>';
177 - }
178 - if (get_option('option_choix')[10] == 'equipe') {
179 - $content .= '<li><a href="#equipes" onclick="displayElem(\'wphal-equipes\'); return false;" style="margin:1px; text-decoration: none;">' . __('Équipes de recherche', 'wp-hal');
180 - $content .= '</a></li>';
181 - }
182 247 $content .= '</ul></li>';
248 +
249 + $content .= '</ul><br/><hr>';
183 250 }
184 - $content .= '</ul><br/><hr>';
185 251
186 252 $content .= '<div id="meta">
187 253 <div class="display" id="wphal-contact" style="display: none;">
188 254 <h3 class="wphal-titre">' . __('Contact', 'wp-hal');
@@ -190,24 +256,11 @@
190 256
191 257 <ul id="wphal-cont" style="list-style-type: none;">';
192 258
193 259 if ($contact == 'yes' && $type == 'authIdHal_s') {
194 - $urlauthor = urlauthor.'?indent=true&fq=valid_s:VALID&fl=idref_s,url_s,email_s,fullName_s,arxiv_s,idHal_s,viaf_s,isni_s,orcid_s,hasCV_bool&q=idHal_s:'.urlencode($id);
195 - $ch = curl_init($urlauthor);
196 - // Options
197 - $options = array(
198 - CURLOPT_RETURNTRANSFER => true,
199 - CURLOPT_HTTPHEADER => array('Content-type: application/json'),
200 - CURLOPT_TIMEOUT => 10,
201 - CURLOPT_USERAGENT => "HAL Plugin Wordpress " . version
202 - );
260 + $urlauthor = wphal_urlauthor.'?indent=true&fq=valid_s:VALID&fl=idref_s,url_s,email_s,fullName_s,arxiv_s,idHal_s,viaf_s,isni_s,orcid_s,hasCV_bool&q=idHal_s:'.urlencode($id);
261 + $jsonauthor = wphal_do_get_data($urlauthor);
203 262
204 - // Bind des options et de l'objet cURL que l'on va utiliser
205 - curl_setopt_array($ch, $options);
206 - // Récupération du résultat JSON
207 - $jsonauthor = json_decode(curl_exec($ch));
208 - curl_close($ch);
209 -
210 263 for ($i = 0; $jsonauthor->response->docs[$i] != ''; $i++) {
211 264 $content .= '<div class="wphal-infocontact" id="wphal-infocontact'.$i.'">';
212 265 if ($jsonauthor->response->docs[$i]->fullName_s != '') {
213 266 $content .= '<li class="wphal-fullname"><span>Nom : </span><span>'. $jsonauthor->response->docs[$i]->fullName_s .'</span></li>';
@@ -212,51 +265,55 @@
212 265 if ($jsonauthor->response->docs[$i]->fullName_s != '') {
213 266 $content .= '<li class="wphal-fullname"><span>Nom : </span><span>'. $jsonauthor->response->docs[$i]->fullName_s .'</span></li>';
214 267 }
215 268 if ($jsonauthor->response->docs[$i]->email_s != '') {
216 - $content .= '<li class="wphal-email"><span>Email : </span><span><a href="mailto:'. $jsonauthor->response->docs[$i]->email_s .'">' . $jsonauthor->response->docs[$i]->email_s . '</a></span></li>';
269 + $content .= '<li class="wphal-email"><span>Email : </span><span><a href="'.esc_url('mailto:'. $jsonauthor->response->docs[$i]->email_s) .'">' . $jsonauthor->response->docs[$i]->email_s . '</a></span></li>';
217 270 }
218 271 if ($jsonauthor->response->docs[$i]->idHal_s != '') {
219 272 $content .= '<li class="wphal-idhal"><span>IdHAL : </span><span>' . $jsonauthor->response->docs[$i]->idHal_s . '</span></li>';
220 273 }
221 274 if ($jsonauthor->response->docs[$i]->hasCV_bool == true){
222 - $content .= '<li class="wphal-cvhal"><span>CV HAL : </span><a href="'.cvhal. $jsonauthor->response->docs[$i]->idHal_s.'" target="_blank">CV de '.$jsonauthor->response->docs[$i]->fullName_s.'</a></li>';
275 + $content .= '<li class="wphal-cvhal"><span>CV HAL : </span><a href="'.esc_url(cvhal. $jsonauthor->response->docs[$i]->idHal_s).'" target="_blank">CV de '.$jsonauthor->response->docs[$i]->fullName_s.'</a></li>';
223 276 }
224 277 if ($jsonauthor->response->docs[$i]->arxiv_s != '') {
225 - $content .= '<li class="wphal-"><span>arXiv : </span><span><a href="' . $jsonauthor->response->docs[$i]->arxiv_s . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->arxiv_s, "/"), 1) . '</a></span></li>';
278 + $content .= '<li class="wphal-"><span>arXiv : </span><span><a href="' . esc_url($jsonauthor->response->docs[$i]->arxiv_s) . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->arxiv_s, "/"), 1) . '</a></span></li>';
226 279 }
227 280 if ($jsonauthor->response->docs[$i]->idref_s != '') {
228 - $content .= '<li class="wphal-"><span>IdRef : </span><span><a href="' . $jsonauthor->response->docs[$i]->idref_s . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->idref_s, "/"), 1) . '</a></span></li>';
281 + $content .= '<li class="wphal-"><span>IdRef : </span><span><a href="' . esc_url($jsonauthor->response->docs[$i]->idref_s) . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->idref_s, "/"), 1) . '</a></span></li>';
229 282 }
230 283 if ($jsonauthor->response->docs[$i]->orcid_s != '') {
231 - $content .= '<li class="wphal-"><span>ORCID : </span><span><a href="' . $jsonauthor->response->docs[$i]->orcid_s . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->orcid_s, "/"), 1) . '</a></span></li>';
284 + $content .= '<li class="wphal-"><span>ORCID : </span><span><a href="' . esc_url($jsonauthor->response->docs[$i]->orcid_s) . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->orcid_s, "/"), 1) . '</a></span></li>';
232 285 }
233 286 if ($jsonauthor->response->docs[$i]->viaf_s != '') {
234 - $content .= '<li class="wphal-"><span>VIAF : </span><span><a href="' . $jsonauthor->response->docs[$i]->viaf_s . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->viaf_s, "/"), 1) . '</a></span></li>';
287 + $content .= '<li class="wphal-"><span>VIAF : </span><span><a href="' . esc_url($jsonauthor->response->docs[$i]->viaf_s) . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->viaf_s, "/"), 1) . '</a></span></li>';
235 288 }
236 289 if ($jsonauthor->response->docs[$i]->isni_s != '') {
237 - $content .= '<li class="wphal-"><span>ISNI : </span><span><a href="' . $jsonauthor->response->docs[$i]->isni_s . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->isni_s, "/"), 1) . '</a></span></li>';
290 + $content .= '<li class="wphal-"><span>ISNI : </span><span><a href="' . esc_url($jsonauthor->response->docs[$i]->isni_s) . '" target="_blank">' . substr(strrchr($jsonauthor->response->docs[$i]->isni_s, "/"), 1) . '</a></span></li>';
238 291 }
239 292 $content .= '</div>';
240 293 }
241 294 }
242 295 if (get_option('option_email') != '') {
243 - $content .= '<li><img alt="mail" src=" ' . plugin_dir_url(__FILE__) . 'img/mail.svg" style=" width:16px; margin-left:2px; margin-right:2px;"/><a href="mailto:' . get_option('option_email') . '" target="_blank">' . get_option('option_email') . '</a></li>';
296 + $content .= '<li><img alt="mail" src=" ' . esc_url(plugin_dir_url(__FILE__) . 'img/mail.svg').' " style=" width:16px; margin-left:2px; margin-right:2px;"/><a href="'.esc_url('mailto:' . get_option('option_email')) . '" target="_blank">' . get_option('option_email') . '</a></li>';
244 297 }
245 298 if (get_option('option_tel') != '') {
246 - $content .= '<li><img alt="phone" src=" ' . plugin_dir_url(__FILE__) . 'img/phone.svg" style="width:16px; margin-left:2px; margin-right:2px;"/>' . get_option('option_tel') . '</li>';
299 + $content .= '<li><img alt="phone" src=" ' . esc_url(plugin_dir_url(__FILE__) . 'img/phone.svg'). '" style="width:16px; margin-left:2px; margin-right:2px;"/>' . get_option('option_tel') . '</li>';
247 300 }
248 301 if (get_option('option_social0') != '') {
249 - $content .= '<li><a href="http://www.facebook.com/' . get_option('option_social0') . '" target="_blank"><img src=" ' . plugin_dir_url(__FILE__) . 'img/facebook.svg" style="width:32px; margin:4px;"/></a></li>';
302 + $content .= '<li><a href="'.esc_url('http://www.facebook.com/' . get_option('option_social0')) . '" target="_blank"><img
303 + alt="Facebook" src=" ' . esc_url(plugin_dir_url(__FILE__) . 'img/facebook.svg').'" style="width:32px; margin:4px;"/></a></li>';
250 304 }
251 305 if (get_option('option_social1') != '') {
252 - $content .= '<li><a href="http://www.twitter.com/' . get_option('option_social1') . '" target="_blank"><img src=" ' . plugin_dir_url(__FILE__) . 'img/twitter.svg" style="width:32px; margin:4px;"/></a></li>';
306 + $content .= '<li><a href="'.esc_url('http://www.twitter.com/' . get_option('option_social1')) . '" target="_blank"><img
307 + alt="Twitter" src=" ' . esc_url(plugin_dir_url(__FILE__) . 'img/twitter.svg').'" style="width:32px; margin:4px;"/></a></li>';
253 308 }
254 309 if (get_option('option_social2') != '') {
255 - $content .= '<li><a href="https://plus.google.com/u/0/+' . get_option('option_social2') . '" target="_blank"><img src=" ' . plugin_dir_url(__FILE__) . 'img/google-plus.svg" style="width:32px; margin:4px;"/></a></li>';
310 + $content .= '<li><a href="'.esc_url('https://plus.google.com/u/0/+' . get_option('option_social2')) . '" target="_blank"><img
311 + alt="Google+" src=" ' . esc_url(plugin_dir_url(__FILE__) . 'img/google-plus.svg').'" style="width:32px; margin:4px;"/></a></li>';
256 312 }
257 313 if (get_option('option_social3') != '') {
258 - $content .= '<li><a href="https://www.linkedin.com/in/' . get_option('option_social3') . '" target="_blank"><img src=" ' . plugin_dir_url(__FILE__) . 'img/linkedin.svg" style="width:32px; margin:4px;"/></a></li>';
314 + $content .= '<li><a href="'.esc_url('https://www.linkedin.com/in/' . get_option('option_social3')) . '" target="_blank"><img
315 + alt="LinkedIn" src=" ' . esc_url(plugin_dir_url(__FILE__) . 'img/linkedin.svg').'" style="width:32px; margin:4px;"/></a></li>';
259 316 }
260 317 $content .= '</ul>
261 318 </div>
262 319 <div class="display" id="wphal-disciplines" style="display: none;">
@@ -261,11 +318,11 @@
261 318 </div>
262 319 <div class="display" id="wphal-disciplines" style="display: none;">
263 320 <h3 class="wphal-titre">' . __('Disciplines', 'wp-hal') . '</h3>';
264 321
265 - if (locale == 'fr_FR') {
322 + if (wphal_locale == 'fr_FR') {
266 323 $facetdomain = $json->facet_counts->facet_fields->fr_domainAllCodeLabel_fs;
267 - } elseif (locale == 'es_ES') {
324 + } elseif (wphal_locale == 'es_ES') {
268 325 $facetdomain = $json->facet_counts->facet_fields->es_domainAllCodeLabel_fs;
269 326 } else {
270 327 $facetdomain = $json->facet_counts->facet_fields->en_domainAllCodeLabel_fs;
271 328 }
@@ -270,18 +327,17 @@
270 327 $facetdomain = $json->facet_counts->facet_fields->en_domainAllCodeLabel_fs;
271 328 }
272 329
273 330 if (!is_null($facetdomain) && !empty($facetdomain)) {
274 -
275 331 $content .= '<div id="listdisci">';
276 332 $content .= '<span id="tridisciplines">';
277 - $content .= '<button type="button" class="trial" href="" id="tridisci" onclick="toggleSort(this, true, \'wphal-discipline\', \'wphal-discipline\', \'tridisci\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
278 - $content .= '<button type="button" class="trioc" href="" id="trinbdisci" onclick="toggleSort(this, false, \'wphal-discipline\', \'wphal-discipline\', \'trinbdisci\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
333 + $content .= '<button type="button" class="trial" id="tridisci" onclick="toggleSort(this, true, \'wphal-discipline\', \'wphal-discipline\', \'tridisci\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
334 + $content .= '<button type="button" class="trioc" id="trinbdisci" onclick="toggleSort(this, false, \'wphal-discipline\', \'wphal-discipline\', \'trinbdisci\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
279 335 $content .= '</span>';
280 336 $content .= '<ul id="wphal-discipline" class="wphal-discipline">';
281 337 foreach ($facetdomain as $res) {
282 - $name = explode(delimiter, $res[0]);
283 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=domainAllCode_s:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
338 + $name = explode(wphal_delimiter, $res[0]);
339 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=domainAllCode_s:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
284 340 }
285 341 $content .= '</ul>';
286 342 $content .= '</div>';
287 343
@@ -287,15 +343,15 @@
287 343
288 344 $content .= '<div id="wphal-graph" style="display:none;">';
289 345 $content .= '<div id="wphal-piedisci"></div>';
290 346 $content .= '</div>';
291 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-disci" onclick="visibilitedisci(\'listdisci\',\'wphal-graph\',\'tridisciplines\'); return false;" >' . __('Graphique', 'wp-hal');
347 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-disci" onclick="visibilitedisci(\'listdisci\',\'wphal-graph\',\'tridisciplines\'); return false;" >' . __('Graphique', 'wp-hal');
292 348 $content .= '</button>';
293 349 }
294 350 $content .= '</div>
295 351 <div class="display" id="wphal-keywords" style="display: none;">
296 352 <h3 class="wphal-titre">' . __('Mots-clefs', 'wp-hal') . '</h3>';
297 - if (!is_null($json->facet_counts->facet_fields->keyword_s) && !empty($json->facet_counts->facet_fields->keyword_s)) {
353 + if (!is_null($json->facet_counts->facet_fields->keyword_s) && !empty($json->facet_counts->facet_fields->keyword_s)) {
298 354 $content .= '<div id="wphal-keys">';
299 355 $r = 0;
300 356 // CSS Nuage de mots
301 357 $maxsize = 25;
@@ -301,8 +357,10 @@
301 357 $maxsize = 25;
302 358 $minsize = 10;
303 359 $maxval = max(array_values($json->facet_counts->facet_fields->keyword_s[1]));
304 360 $minval = min(array_values($json->facet_counts->facet_fields->keyword_s[1]));
361 + if(!is_numeric($minval)) {$minval = 0;}
362 + if(!is_numeric($maxval)) {$maxval = 0;}
305 363 $spread = ($maxval - $minval);
306 364 $step = ($maxsize - $minsize) / $spread;
307 365 $tab = array();
308 366 foreach ($json->facet_counts->facet_fields->keyword_s as $res) {
@@ -314,25 +372,25 @@
314 372 }
315 373 asort($tab); // Tri du tableau par ordre alphabétique
316 374 foreach ($tab as $res) {
317 375 $size = round($minsize + (($res[1] - $minval) * $step));
318 - $content .= '<a style="display: inline-block; font-size:' . $size . 'px" href="' . halv3 . '?q=keyword_s:' . urlencode('"' . $res[0] . '"') . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $res[0] . '</a>&nbsp;';
376 + $content .= '<a style="display: inline-block; font-size:' . $size . 'px" href="' . esc_url(halv3 . '?q=keyword_s:' . urlencode('"' . $res[0] . '"') . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $res[0] . '</a>&nbsp;';
319 377 }
320 378 $content .= '</div>';
321 379 $content .= '<div id="keysuite" style="display:none;">';
322 380 $content .= '<span id="trikeywords">';
323 - $content .= '<button type="button" class="trial" href="" id="trikey" onclick="toggleSort(this, true, \'wphal-keyw\', \'wphal-keyword\', \'trikey\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
324 - $content .= '<button type="button" class="trioc" href="" id="trinbkey" onclick="toggleSort(this, false, \'wphal-keyw\', \'wphal-keyword\', \'trinbkey\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
381 + $content .= '<button type="button" class="trial" id="trikey" onclick="toggleSort(this, true, \'wphal-keyw\', \'wphal-keyword\', \'trikey\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
382 + $content .= '<button type="button" class="trioc" id="trinbkey" onclick="toggleSort(this, false, \'wphal-keyw\', \'wphal-keyword\', \'trinbkey\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
325 383 $content .= '</span>';
326 384 $content .= '<ul class="wphal-keyword">';
327 385 $content .= '<div id="wphal-keyw">';
328 386 foreach ($json->facet_counts->facet_fields->keyword_s as $res) {
329 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=keyword_s:' . urlencode('"' . $res[0] . '"') . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $res[0] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
387 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=keyword_s:' . urlencode('"' . $res[0] . '"') . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $res[0] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
330 388 }
331 389 $content .= '</div>';
332 390 $content .= '</ul>';
333 391 $content .= '</div>';
334 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-key" onclick="visibilitekey(\'wphal-keys\',\'keysuite\', \'trikeywords\'); return false;" >' . __('Liste complète', 'wp-hal');
392 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-key" onclick="visibilitekey(\'wphal-keys\',\'keysuite\', \'trikeywords\'); return false;" >' . __('Liste complète', 'wp-hal');
335 393 $content .= '</button>';
336 394 }
337 395 $content .= '</div>
338 396 <div class="display" id="wphal-auteurs" style="display: none;">
@@ -338,10 +396,10 @@
338 396 <div class="display" id="wphal-auteurs" style="display: none;">
339 397 <h3 class="wphal-titre">' . __('Auteurs', 'wp-hal') . '</h3>';
340 398 if (!is_null($json->facet_counts->facet_fields->authIdLastNameFirstName_fs) && !empty($json->facet_counts->facet_fields->authIdLastNameFirstName_fs)) {
341 399 $content .= '<span id="triauteurs">';
342 - $content .= '<button type="button" class="trial" href="" id="triaut" onclick="toggleSort(this, true, \'wphal-aut\', \'auteursuite\', \'triaut\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
343 - $content .= '<button type="button" class="trioc" href="" id="trinbaut" onclick="toggleSort(this, false, \'wphal-aut\', \'auteursuite\', \'trinbaut\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
400 + $content .= '<button type="button" class="trial" id="triaut" onclick="toggleSort(this, true, \'wphal-aut\', \'auteursuite\', \'triaut\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
401 + $content .= '<button type="button" class="trioc" id="trinbaut" onclick="toggleSort(this, false, \'wphal-aut\', \'auteursuite\', \'trinbaut\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
344 402 $content .= '</span>';
345 403 $content .= '<ul class="wphal-auteurs" style="list-style-type: none;">';
346 404 $content .= '<div id="wphal-aut">';
347 405 $r = 0;
@@ -349,10 +407,15 @@
349 407 $r = $r + 1;
350 408 if ($r > 10) {
351 409 break;
352 410 }
353 - $name = explode(delimiter, $res[0]);
354 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><img alt="user" src=" ' . plugin_dir_url(__FILE__) . '/img/user.svg" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . halv3 . '?q=authId_i:' . $name[0] . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
411 + $name = explode(wphal_delimiter, $res[0]);
412 + if($name[0] == 0){
413 + $q = 'authLastNameFirstName_s:'.urlencode("\"".$name[1]."\"");
414 + }else{
415 + $q = "authIdPerson_i:$name[0]";
416 + }
417 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><img alt="user" src=" ' . esc_url(plugin_dir_url(__FILE__) . '/img/user.svg').'" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . esc_url(halv3 . '?q='. $q . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
355 418 }
356 419 $i = 1;
357 420 $content .= '<div id="auteursuite" style="display:none;">';
358 421 foreach ($json->facet_counts->facet_fields->authIdLastNameFirstName_fs as $res) {
@@ -361,10 +424,15 @@
361 424 }
362 425 if ($i < $r) {
363 426 $i = $i + 1;
364 427 } else {
365 - $name = explode(delimiter, $res[0]);
366 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><img alt="user" src=" ' . plugin_dir_url(__FILE__) . '/img/user.svg" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . halv3 . '?q=authId_i:' . $name[0] . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
428 + $name = explode(wphal_delimiter, $res[0]);
429 + if($name[0] == 0){
430 + $q = 'authLastNameFirstName_s:'.urlencode("\"".$name[1]."\"");
431 + }else{
432 + $q = "authIdPerson_i:$name[0]";
433 + }
434 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><img alt="user" src=" ' . esc_url(plugin_dir_url(__FILE__) . '/img/user.svg').'" style="width:16px; margin-left:2px; margin-right:2px;"/><a href="' . esc_url(halv3 . '?q='. $q . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
367 435 }
368 436 }
369 437 $content .= '</div>';
370 438 $content .= '</div>';
@@ -369,9 +437,9 @@
369 437 $content .= '</div>';
370 438 $content .= '</div>';
371 439 $content .= '</ul>';
372 440 if ($r > 10) {
373 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-auteur" onclick="visibilite(\'auteursuite\'); return false;" >' . __('Liste complète', 'wp-hal');
441 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-auteur" onclick="visibilite(\'auteursuite\'); return false;" >' . __('Liste complète', 'wp-hal');
374 442 $content .= '</button>';
375 443 }
376 444 }
377 445 $content .= '</div>
@@ -378,10 +446,10 @@
378 446 <div class="display" id="wphal-revues" style="display: none;">
379 447 <h3 class="wphal-titre">' . __('Revues', 'wp-hal') . '</h3>';
380 448 if (!is_null($json->facet_counts->facet_fields->journalIdTitle_fs) && !empty($json->facet_counts->facet_fields->journalIdTitle_fs)) {
381 449 $content .= '<span id="trirevues">';
382 - $content .= '<button type="button" class="trial" href="" id="trirev" onclick="toggleSort(this, true, \'wphal-rev\', \'revuesuite\', \'trirev\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
383 - $content .= '<button type="button" class="trioc" href="" id="trinbrev" onclick="toggleSort(this, false, \'wphal-rev\', \'revuesuite\', \'trinbrev\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
450 + $content .= '<button type="button" class="trial" id="trirev" onclick="toggleSort(this, true, \'wphal-rev\', \'revuesuite\', \'trirev\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
451 + $content .= '<button type="button" class="trioc" id="trinbrev" onclick="toggleSort(this, false, \'wphal-rev\', \'revuesuite\', \'trinbrev\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
384 452 $content .= '</span>';
385 453 $content .= '<ul class="wphal-revues">';
386 454 $content .= '<div id="wphal-rev">';
387 455 $r = 0;
@@ -389,10 +457,10 @@
389 457 $r = $r + 1;
390 458 if ($r > 10) {
391 459 break;
392 460 }
393 - $name = explode(delimiter, $res[0]);
394 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=journalId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
461 + $name = explode(wphal_delimiter, $res[0]);
462 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=journalId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
395 463 }
396 464 $i = 1;
397 465 $content .= '<div id="revuesuite" style="display:none;">';
398 466 foreach ($json->facet_counts->facet_fields->journalIdTitle_fs as $res) {
@@ -401,10 +469,10 @@
401 469 }
402 470 if ($i < $r) {
403 471 $i = $i + 1;
404 472 } else {
405 - $name = explode(delimiter, $res[0]);
406 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=journalId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
473 + $name = explode(wphal_delimiter, $res[0]);
474 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=journalId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
407 475 }
408 476 }
409 477 $content .= '</div>';
410 478 $content .= '</div>';
@@ -409,9 +477,9 @@
409 477 $content .= '</div>';
410 478 $content .= '</div>';
411 479 $content .= '</ul>';
412 480 if ($r > 10) {
413 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-revue" onclick="visibiliterevues(\'revuesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
481 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-revue" onclick="visibiliterevues(\'revuesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
414 482 $content .= '</button>';
415 483 }
416 484 }
417 485 $content .= '</div>
@@ -418,10 +486,10 @@
418 486 <div class="display" id="wphal-annees" style="display: none;">
419 487 <h3 class="wphal-titre">' . __('Année de production', 'wp-hal') . '</h3>';
420 488 if (!is_null($json->facet_counts->facet_fields->producedDateY_i) && !empty($json->facet_counts->facet_fields->producedDateY_i)) {
421 489 $content .= '<span id="triannees">';
422 - $content .= '<button type="button" class="trial" href="" id="trian" onclick="toggleSort(this, true, \'wphal-an\', \'anneesuite\', \'trian\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
423 - $content .= '<button type="button" class="trioc" href="" id="trinban" onclick="toggleSort(this, false, \'wphal-an\', \'anneesuite\', \'trinban\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
490 + $content .= '<button type="button" class="trial" id="trian" onclick="toggleSort(this, true, \'wphal-an\', \'anneesuite\', \'trian\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
491 + $content .= '<button type="button" class="trioc" id="trinban" onclick="toggleSort(this, false, \'wphal-an\', \'anneesuite\', \'trinban\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
424 492 $content .= '</span>';
425 493 $content .= '<ul class="wphal-annees">';
426 494 $content .= '<div id="wphal-an">';
427 495
@@ -431,9 +499,9 @@
431 499 $r = $r + 1;
432 500 if ($r > 10) {
433 501 break;
434 502 }
435 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=producedDateY_i:' . urlencode($res[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $res[0] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
503 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=producedDateY_i:' . urlencode($res[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $res[0] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
436 504 }
437 505 $i = 1;
438 506 $content .= '<div id="anneesuite" style="display:none;">';
439 507 foreach ($json->facet_counts->facet_fields->producedDateY_i as $res) {
@@ -442,9 +510,9 @@
442 510 }
443 511 if ($i < $r) {
444 512 $i = $i + 1;
445 513 } else {
446 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=producedDateY_i:' . urlencode($res[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $res[0] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
514 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=producedDateY_i:' . urlencode($res[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $res[0] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
447 515 }
448 516 }
449 517 $content .= '</div>';
450 518 $content .= '</div>';
@@ -449,9 +517,9 @@
449 517 $content .= '</div>';
450 518 $content .= '</div>';
451 519 $content .= '</ul>';
452 520 if ($r > 10) {
453 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-annee" onclick="visibiliteannee(\'anneesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
521 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-annee" onclick="visibiliteannee(\'anneesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
454 522 $content .= '</button>';
455 523 }
456 524 }
457 525 $content .= '</div>
@@ -458,10 +526,10 @@
458 526 <div class="display" id="wphal-insts" style="display: none;">
459 527 <h3 class="wphal-titre">' . __('Institutions', 'wp-hal') . '</h3>';
460 528 if (!is_null($json->facet_counts->facet_fields->instStructIdName_fs) && !empty($json->facet_counts->facet_fields->instStructIdName_fs)) {
461 529 $content .= '<span id="triinsts">';
462 - $content .= '<button type="button" class="trial" href="" id="triinst" onclick="toggleSort(this, true, \'wphal-institu\', \'instsuite\', \'triinst\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
463 - $content .= '<button type="button" class="trioc" href="" id="trinbinst" onclick="toggleSort(this, false, \'wphal-institu\', \'instsuite\', \'trinbinst\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
530 + $content .= '<button type="button" class="trial" id="triinst" onclick="toggleSort(this, true, \'wphal-institu\', \'instsuite\', \'triinst\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
531 + $content .= '<button type="button" class="trioc" id="trinbinst" onclick="toggleSort(this, false, \'wphal-institu\', \'instsuite\', \'trinbinst\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
464 532 $content .= '</span>';
465 533 $content .= '<ul class="wphal-insts">';
466 534 $content .= '<div id="wphal-institu">';
467 535 $r = 0;
@@ -469,10 +537,10 @@
469 537 $r = $r + 1;
470 538 if ($r > 10) {
471 539 break;
472 540 }
473 - $name = explode(delimiter, $res[0]);
474 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=instStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
541 + $name = explode(wphal_delimiter, $res[0]);
542 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=instStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
475 543 }
476 544 $i = 1;
477 545 $content .= '<div id="instsuite" style="display:none;">';
478 546 foreach ($json->facet_counts->facet_fields->instStructIdName_fs as $res) {
@@ -481,10 +549,10 @@
481 549 }
482 550 if ($i < $r) {
483 551 $i = $i + 1;
484 552 } else {
485 - $name = explode(delimiter, $res[0]);
486 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=instStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
553 + $name = explode(wphal_delimiter, $res[0]);
554 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=instStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
487 555 }
488 556 }
489 557 $content .= '</div>';
490 558 $content .= '</div>';
@@ -489,9 +557,9 @@
489 557 $content .= '</div>';
490 558 $content .= '</div>';
491 559 $content .= '</ul>';
492 560 if ($r > 10) {
493 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-inst" onclick="visibiliteinst(\'instsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
561 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-inst" onclick="visibiliteinst(\'instsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
494 562 $content .= '</button>';
495 563 }
496 564 }
497 565 $content .= '</div>
@@ -498,10 +566,10 @@
498 566 <div class="display" id="wphal-labs" style="display: none;">
499 567 <h3 class="wphal-titre">' . __('Laboratoires', 'wp-hal') . '</h3>';
500 568 if (!is_null($json->facet_counts->facet_fields->labStructIdName_fs) && !empty($json->facet_counts->facet_fields->labStructIdName_fs)) {
501 569 $content .= '<span id="trilabs">';
502 - $content .= '<button type="button" class="trial" href="" id="trilab" onclick="toggleSort(this, true, \'wphal-labo\', \'labsuite\', \'trilab\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
503 - $content .= '<button type="button" class="trioc" href="" id="trinblab" onclick="toggleSort(this, false, \'wphal-labo\', \'labsuite\', \'trinblab\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
570 + $content .= '<button type="button" class="trial" id="trilab" onclick="toggleSort(this, true, \'wphal-labo\', \'labsuite\', \'trilab\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
571 + $content .= '<button type="button" class="trioc" id="trinblab" onclick="toggleSort(this, false, \'wphal-labo\', \'labsuite\', \'trinblab\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
504 572 $content .= '</span>';
505 573 $content .= '<ul class="wphal-labs">';
506 574 $content .= '<div id="wphal-labo">';
507 575
@@ -510,10 +578,10 @@
510 578 $r = $r + 1;
511 579 if ($r > 10) {
512 580 break;
513 581 }
514 - $name = explode(delimiter, $res[0]);
515 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=labStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
582 + $name = explode(wphal_delimiter, $res[0]);
583 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=labStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
516 584 }
517 585 $i = 1;
518 586 $content .= '<div id="labsuite" style="display:none;">';
519 587 foreach ($json->facet_counts->facet_fields->labStructIdName_fs as $res) {
@@ -522,10 +590,10 @@
522 590 }
523 591 if ($i < $r) {
524 592 $i = $i + 1;
525 593 } else {
526 - $name = explode(delimiter, $res[0]);
527 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=labStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
594 + $name = explode(wphal_delimiter, $res[0]);
595 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=labStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
528 596 }
529 597 }
530 598 $content .= '</div>';
531 599 $content .= '</div>';
@@ -530,9 +598,9 @@
530 598 $content .= '</div>';
531 599 $content .= '</div>';
532 600 $content .= '</ul>';
533 601 if ($r > 10) {
534 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-lab" onclick="visibilitelab(\'labsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
602 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-lab" onclick="visibilitelab(\'labsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
535 603 $content .= '</button>';
536 604 }
537 605 }
538 606 $content .= '</div>
@@ -539,10 +607,10 @@
539 607 <div class="display" id="wphal-depts" style="display: none;">
540 608 <h3 class="wphal-titre">' . __('Départements', 'wp-hal') . '</h3>';
541 609 if (!is_null($json->facet_counts->facet_fields->deptStructIdName_fs) && !empty($json->facet_counts->facet_fields->deptStructIdName_fs)) {
542 610 $content .= '<span id="tridept">';
543 - $content .= '<button type="button" class="trial" href="" id="tridept" onclick="toggleSort(this, true, \'wphal-dpt\', \'deptsuite\', \'tridept\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
544 - $content .= '<button type="button" class="trioc" href="" id="trinbdept" onclick="toggleSort(this, false, \'wphal-dpt\', \'deptsuite\', \'trinbdept\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
611 + $content .= '<button type="button" class="trial" id="tridept" onclick="toggleSort(this, true, \'wphal-dpt\', \'deptsuite\', \'tridept\'); return false;" style="font-size:16px; text-decoration: none;" >Tri Alphabétique</button>';
612 + $content .= '<button type="button" class="trioc" id="trinbdept" onclick="toggleSort(this, false, \'wphal-dpt\', \'deptsuite\', \'trinbdept\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
545 613 $content .= '</span>';
546 614 $content .= '<ul class="wphal-depts">';
547 615 $content .= '<div id="wphal-dpt">';
548 616 $r = 0;
@@ -550,10 +618,10 @@
550 618 $r = $r + 1;
551 619 if ($r > 10) {
552 620 break;
553 621 }
554 - $name = explode(delimiter, $res[0]);
555 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=deptStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
622 + $name = explode(wphal_delimiter, $res[0]);
623 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=deptStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
556 624 }
557 625 $i = 1;
558 626 $content .= '<div id="deptsuite" style="display:none;">';
559 627 foreach ($json->facet_counts->facet_fields->deptStructIdName_fs as $res) {
@@ -562,10 +630,10 @@
562 630 }
563 631 if ($i < $r) {
564 632 $i = $i + 1;
565 633 } else {
566 - $name = explode(delimiter, $res[0]);
567 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=deptStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
634 + $name = explode(wphal_delimiter, $res[0]);
635 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=deptStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
568 636 }
569 637 }
570 638 $content .= '</div>';
571 639 $content .= '</div>';
@@ -570,9 +638,9 @@
570 638 $content .= '</div>';
571 639 $content .= '</div>';
572 640 $content .= '</ul>';
573 641 if ($r > 10) {
574 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-dept" onclick="visibilitedept(\'deptsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
642 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-dept" onclick="visibilitedept(\'deptsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
575 643 $content .= '</button>';
576 644 }
577 645 }
578 646 $content .= '</div>
@@ -579,22 +647,23 @@
579 647 <div class="display" id="wphal-equipes" style="display: none;">
580 648 <h3 class="wphal-titre">' . __('Équipes de recherche', 'wp-hal') . '</h3>';
581 649 if (!is_null($json->facet_counts->facet_fields->rteamStructIdName_fs) && !empty($json->facet_counts->facet_fields->rteamStructIdName_fs)) {
582 650 $content .= '<span id="triequipe">';
583 - $content .= '<button type="button" class="trial" href="" id="triequipe" onclick="toggleSort(this, true, \'wphal-rteam\', \'equipesuite\', \'triequipe\'); return false;" style="font-size:16px;text-decoration: none;" >Tri Alphabétique</button>';
584 - $content .= '<button type="button" class="trioc" href="" id="trinbequipe" onclick="toggleSort(this, false, \'wphal-rteam\', \'equipesuite\', \'trinbequipe\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
651 + $content .= '<button type="button" class="trial" id="triequipe" onclick="toggleSort(this, true, \'wphal-rteam\', \'equipesuite\', \'triequipe\'); return false;" style="font-size:16px;text-decoration: none;" >Tri Alphabétique</button>';
652 + $content .= '<button type="button" class="trioc" id="trinbequipe" onclick="toggleSort(this, false, \'wphal-rteam\', \'equipesuite\', \'trinbequipe\'); return false;" style="font-size:16px; text-decoration: none;">Tri Occurrence</button>';
585 653 $content .= '</span>';
586 654 $content .= '<ul class="wphal-equipes">';
587 655 $content .= '<div id="wphal-rteam">';
588 656
589 657 $r = 0;
658 + $name=[];
590 659 foreach ($json->facet_counts->facet_fields->rteamStructIdName_fs as $res) {
591 660 $r = $r + 1;
592 661 if ($r > 10) {
593 662 break;
594 663 }
595 - $name = explode(delimiter, $res[0]);
596 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=rteamStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
664 + $name = explode(wphal_delimiter, $res[0]);
665 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=rteamStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
597 666 }
598 667 $i = 1;
599 668 $content .= '<div id="equipesuite" style="display:none;">';
600 669 foreach ($json->facet_counts->facet_fields->rteamStructIdName_fs as $res) {
@@ -603,9 +672,10 @@
603 672 }
604 673 if ($i < $r) {
605 674 $i = $i + 1;
606 675 } else {
607 - $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . halv3 . '?q=rteamStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
676 + $name = explode(wphal_delimiter, $res[0]);
677 + $content .= '<li class="metadata" data-percentage="' . $res[1] . '"><a href="' . esc_url(halv3 . '?q=rteamStructId_i:' . urlencode($name[0]) . "+AND+" . $type . ':(' . $id . ')').'" target="_blank">' . $name[1] . '</a><span class="wphal-nbmetadata">' . $res[1] . '</span></li>';
608 678 }
609 679 }
610 680 $content .= '</div>';
611 681 $content .= '</div>';
@@ -610,9 +680,9 @@
610 680 $content .= '</div>';
611 681 $content .= '</div>';
612 682 $content .= '</ul>';
613 683 if ($r > 10) {
614 - $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-equipe" onclick="visibiliteequipe(\'equipesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
684 + $content .= '<button type="button" style="text-decoration: none;" id="wphal-equipe" onclick="visibiliteequipe(\'equipesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
615 685 $content .= '</button>';
616 686 }
617 687 }
618 688 $content .= '</div>
@@ -617,9 +687,9 @@
617 687 }
618 688 $content .= '</div>
619 689 <div class="display" id="publications">';
620 690 if (get_option('option_groupe') == 'grouper') {
621 - $doctype = file_get_contents(plugin_dir_path( __FILE__ ).'json'. DIRECTORY_SEPARATOR .'doctype_'.lang.'.json');
691 + $doctype = file_get_contents(plugin_dir_path( __FILE__ ).'json'. DIRECTORY_SEPARATOR .'doctype_fr.json');
622 692 $jsontype = json_decode($doctype);
623 693
624 694 //LISTE DES DOCUMENTS PAR GROUPE
625 695
@@ -624,14 +694,13 @@
624 694 //LISTE DES DOCUMENTS PAR GROUPE
625 695
626 696 $content .= '<div class="counter-doc"><span class="wphal-nbtot">' . $json->grouped->docType_s->matches . ' </span>';
627 697 $content .= __('documents', 'wp-hal'). '</div><br>';
628 - $content .= '<ul style="list-style-type: none;">';
629 - for ($i = 0; $jsontype->response->result->doc[$i] != null; $i++) {
630 - for ($d = 0; $json->grouped->docType_s->groups[$d] != null; $d++) {
698 + for ($i = 0; !empty($jsontype->response->result->doc[$i]); $i++) {
699 + for ($d = 0; !empty($json->grouped->docType_s->groups[$d]); $d++) {
631 700 if ($json->grouped->docType_s->groups[$d]->groupValue == $jsontype->response->result->doc[$i]->str[0]){
632 701 $titre = $jsontype->response->result->doc[$i]->str[1];
633 - $content .= '<li><div class="grp-div-'. $jsontype->response->result->doc[$i]->str[0] .'"><h3 class="wphal-titre-groupe">' . $titre . '<span class="wphal-nbmetadata" style="margin-left:10px;">' . $json->grouped->docType_s->groups[$d]->doclist->numFound . ' ' . _n('document', 'documents', $json->grouped->docType_s->groups[$d]->doclist->numFound, 'wp-hal') . '</span></h3>';
702 + $content .= '<div class="grp-div"><h3 class="wphal-titre-groupe">' . __($titre, 'wp-hal') . '<span class="wphal-nbmetadata" style="margin-left:10px;">' . $json->grouped->docType_s->groups[$d]->doclist->numFound . ' ' . _n('document', 'documents', $json->grouped->docType_s->groups[$d]->doclist->numFound, 'wp-hal') . '</span></h3>';
634 703 $content .= '<div class="grp-content">';
635 704 $content .= '<ul>';
636 705 foreach ($json->grouped->docType_s->groups[$d]->doclist->docs as $result) {
637 706 $content .= '<li>' . $result->citationFull_s . '</li>';
@@ -636,14 +705,13 @@
636 705 foreach ($json->grouped->docType_s->groups[$d]->doclist->docs as $result) {
637 706 $content .= '<li>' . $result->citationFull_s . '</li>';
638 707 }
639 708 $content .= '</ul></div>';
640 - $content .= '</div></li><br>';
709 + $content .= '</div><br>';
641 710 break;
642 711 }
643 712 }
644 713 }
645 - $content .= '</ul>';
646 714 } elseif (get_option('option_groupe') == 'paginer') {
647 715
648 716 //LISTE DES DOCUMENTS AVEC PAGINATION
649 717 $content .= '<div class="counter-doc"><span class="wphal-nbtot">' . $json->response->numFound . ' </span>';
@@ -655,10 +723,10 @@
655 723 $total = $json->response->numFound;
656 724
657 725 $nombreDePages = ceil($total / $messagesParPage);
658 726
659 - if (isset($paged)) {
660 - $pageActuelle = intval($paged);
727 + if (isset($hal_page)) {
728 + $pageActuelle = intval($hal_page);
661 729
662 730 if ($pageActuelle > $nombreDePages) {
663 731 $pageActuelle = $nombreDePages;
664 732 }
@@ -666,124 +734,196 @@
666 734 $pageActuelle = 1;
667 735 }
668 736 $premiereEntree = ($pageActuelle - 1) * $messagesParPage;
669 737
670 - $url = api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&fl=docid,citationFull_s,keyword_s,bookTitle_s,producedDate_s,authFullName_s&start=' . $premiereEntree . '&rows=' . $messagesParPage . '&sort=' . producedDateY . '&wt=json';
671 - $ch = curl_init($url);
672 -// Options
673 - $options = array(
674 - CURLOPT_RETURNTRANSFER => true,
675 - CURLOPT_HTTPHEADER => array('Content-type: application/json'),
676 - CURLOPT_TIMEOUT => 10,
677 - CURLOPT_USERAGENT => "HAL Plugin Wordpress " . version
678 - );
738 + $url = wphal_api . '?q=*:*&fq=' . $type . ':(' . urlencode($id) . ')&fl=docid,citationFull_s,keyword_s,bookTitle_s,producedDate_s,authFullName_s&start=' . $premiereEntree . '&rows=' . $messagesParPage . '&sort=' . wphal_producedDateY . '&wt=json';
739 + $json = wphal_do_get_data($url);
679 740
680 -// Bind des options et de l'objet cURL que l'on va utiliser
681 - curl_setopt_array($ch, $options);
682 -// Récupération du résultat JSON
683 - $json = json_decode(curl_exec($ch));
684 - curl_close($ch);
685 -
686 741 //--MODULE PAGINATION--//
687 -
688 - $content .= '<ul>';
689 - for ($i = 0; $json->response->docs[$i] != ''; $i++) {
690 - $content .= '<li>' . $json->response->docs[$i]->citationFull_s . '</li>';
742 + $count_results = count($json->response->docs);
743 + if($count_results>0) {
744 + $content .= '<ul>';
745 + for ( $i = 0; $i <= $count_results - 1; $i ++ ) {
746 + $content .= '<li>' . $json->response->docs[ $i ]->citationFull_s . '</li>';
747 + }
748 + $content .= '</ul>';
749 + } else {
750 + $content = '<div> no results !</div>';
691 751 }
692 - $content .= '</ul>';
752 + if($total> $messagesParPage) {
753 + $base_url = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on' ? 'https' : 'http' ) . '://' . $_SERVER['HTTP_HOST'];
754 + $url = $base_url . $_SERVER["REQUEST_URI"];
755 + $explodedURL= explode('?', $url);
756 + $queryString = $explodedURL[1];
757 + $pagedHref = $explodedURL[0];
758 + if(!empty($queryString)){
759 + $parsedQueryString = [];
760 + parse_str($queryString, $parsedQueryString);
761 + if(isset($parsedQueryString["hal_page"])){
762 + unset($parsedQueryString["hal_page"]);
763 + }
764 + $pagedHref .= '?';
765 + foreach($parsedQueryString as $name => $value){
766 + $pagedHref .= $name.'='.$value.'&';
767 + }
768 + // we add it back..
769 + $pagedHref .= 'hal_page=';
770 + }else {
771 + $pagedHref .= '?hal_page=';
772 + }
693 773
694 -//--AFFICHAGE PAGINATION--//
695 - $precedents = $pageActuelle - 2;
696 - $suivants = $pageActuelle + 2;
697 - $precedent = $pageActuelle - 1;
698 - $suivant = $pageActuelle + 1;
699 - $penultimate = $nombreDePages - 1;
774 + //--AFFICHAGE PAGINATION--//
775 + $precedents = $pageActuelle - 2;
776 + $suivants = $pageActuelle + 2;
777 + $precedent = $pageActuelle - 1;
778 + $suivant = $pageActuelle + 1;
779 + $penultimate = $nombreDePages - 1;
700 780
701 - $content .= '<ul class="wphal-pagination">';
702 -//--BOUTON PRECEDENT--//
703 - if ($pageActuelle == 1) {
704 - $content .= '<li class="disabled"><a href="#">&laquo;</a></li>';
705 - } else {
706 - $content .= '<li><a href="?paged=' . $precedent . '">&laquo;</a></li>';
707 - }
708 - if ($nombreDePages <= 6) {// Cas 1 : 6 pages ou moins - Pas de troncature
709 - for ($i = 1; $i <= $nombreDePages; $i++) {
710 - if ($i == $pageActuelle) {
711 - $content .= '<li class="active"><a href="#">' . $i . '</a></li>';
712 - } else {
713 - $content .= ' <li><a href="?paged=' . $i . '">' . $i . '</a></li> ';
714 - }
781 + $content .= '<ul class="wphal-pagination">';
782 + //--BOUTON PRECEDENT--//
783 + if ( $pageActuelle != 1 ) {
784 + $content .= '<li><a href="'. $pagedHref . $precedent . '">&laquo;</a></li>';
715 785 }
716 - } elseif ($nombreDePages >= 7) {// Cas 2 : 7 pages ou plus - Troncature
717 - if ($pageActuelle <= 3) {// Lorsque l'on est sur les trois premières pages
718 - for ($i = 1; $i <= 4; $i++) {
719 - if ($i == $pageActuelle) {
786 + if ( $nombreDePages <= 6 ) {// Cas 1 : 6 pages ou moins - Pas de troncature
787 + for ( $i = 1; $i <= $nombreDePages; $i ++ ) {
788 + if ( $i == $pageActuelle ) {
720 789 $content .= '<li class="active"><a href="#">' . $i . '</a></li>';
721 790 } else {
722 - $content .= '<li><a href="?paged=' . $i . '">' . $i . '</a></li>';
791 + $content .= ' <li><a href="'. $pagedHref . $i . '">' . $i . '</a></li> ';
723 792 }
724 793 }
725 - $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
726 - $content .= '<li><a href="?paged=' . $penultimate . '">' . $penultimate . '</a></li>';
727 - $content .= '<li><a href="?paged=' . $nombreDePages . '">' . $nombreDePages . '</a></li>';
728 - }
729 - if ($pageActuelle >= 4 && $pageActuelle <= $penultimate - 2) {//Lorsque l'on arrive sur la quatrième page
730 - $content .= '<li><a href="?paged=">1</a></li>';
731 - $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
732 - $content .= '<li><a href="?paged=' . $precedents . '">' . $precedents . '</a></li>';
733 - $content .= '<li><a href="?paged=' . $precedent . '">' . $precedent . '</a></li>';
734 - $content .= '<li class="active"><a href="#">' . $pageActuelle . '</a></li>';
735 - $content .= '<li><a href="?paged=' . $suivant . '">' . $suivant . '</a></li>';
736 - $content .= '<li><a href="?paged=' . $suivants . '">' . $suivants . '</a></li>';
737 - $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
738 - $content .= '<li><a href="?paged=' . $nombreDePages . '">' . $nombreDePages . '</a></li>';
739 - }
740 - if ($pageActuelle >= $penultimate - 1) {
741 - $content .= '<li><a href="?paged=1">1</a></li>';
742 - $content .= '<li><a href="?paged=2">2</a></li>';
743 - $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
744 - for ($i = $penultimate - 2; $i <= $nombreDePages; $i++) {
745 - if ($i == $pageActuelle) {
746 - $content .= '<li class="active"><a href="#">' . $i . '</a></li>';
747 - } else {
748 - $content .= '<li><a href="?paged=' . $i . '">' . $i . '</a></li>';
794 + } elseif ( $nombreDePages >= 7 ) {// Cas 2 : 7 pages ou plus - Troncature
795 + if ( $pageActuelle <= 3 ) {// Lorsque l'on est sur les trois premières pages
796 + for ( $i = 1; $i <= 4; $i ++ ) {
797 + if ( $i == $pageActuelle ) {
798 + $content .= '<li class="active"><a href="#">' . $i . '</a></li>';
799 + } else {
800 + $content .= '<li><a href="'. $pagedHref . $i . '">' . $i . '</a></li>';
801 + }
749 802 }
803 + $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
804 + $content .= '<li><a href="'. $pagedHref . $penultimate . '">' . $penultimate . '</a></li>';
805 + $content .= '<li><a href="'. $pagedHref . $nombreDePages . '">' . $nombreDePages . '</a></li>';
750 806 }
807 + if ( $pageActuelle >= 4 && $pageActuelle <= $penultimate - 2 ) {//Lorsque l'on arrive sur la quatrième page
808 + $content .= '<li><a href="'.$pagedHref.'1">1</a></li>';
809 + $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
810 + $content .= '<li><a href="'. $pagedHref . $precedents . '">' . $precedents . '</a></li>';
811 + $content .= '<li><a href="'. $pagedHref . $precedent . '">' . $precedent . '</a></li>';
812 + $content .= '<li class="active"><a href="#">' . $pageActuelle . '</a></li>';
813 + $content .= '<li><a href="'. $pagedHref . $suivant . '">' . $suivant . '</a></li>';
814 + $content .= '<li><a href="'. $pagedHref . $suivants . '">' . $suivants . '</a></li>';
815 + $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
816 + $content .= '<li><a href="'. $pagedHref . $nombreDePages . '">' . $nombreDePages . '</a></li>';
817 + }
818 + if ( $pageActuelle >= $penultimate - 1 ) {
819 + $content .= '<li><a href="'.$pagedHref.'1">1</a></li>';
820 + $content .= '<li><a href="'.$pagedHref.'2">2</a></li>';
821 + $content .= '<li class="disabled"><a href="#">&hellip;</a></li>';
822 + for ( $i = $penultimate - 2; $i <= $nombreDePages; $i ++ ) {
823 + if ( $i == $pageActuelle ) {
824 + $content .= '<li class="active"><a href="#">' . $i . '</a></li>';
825 + } else {
826 + $content .= '<li><a href="'. $pagedHref . $i . '">' . $i . '</a></li>';
827 + }
828 + }
829 + }
751 830 }
831 + //--BOUTON SUIVANT--//
832 + if ( $pageActuelle < $nombreDePages ) {
833 + $content .= '<li><a href="'. $pagedHref . $suivant . '">&raquo;</a></li>';
834 + }
835 + $content .= '</ul>';
836 + //--AFFICHAGE PAGINATION--//
752 837 }
753 -//--BOUTON SUIVANT--//
754 - if ($pageActuelle < $nombreDePages) {
755 - $content .= '<li><a href="?paged=' . $suivant . '">&raquo;</a></li>';
756 - } else {
757 - $content .= '<li class="disabled"><a href="#">&raquo;</a></li>';
758 - }
759 - $content .= '</ul>';
760 -//--AFFICHAGE PAGINATION--//
761 838 }
762 839 $content .= '</div>
763 840 </div>
764 841 </div>';
842 + }else{
843 + $content = 'Plugin is not configured correctly or shortcode parameters are not valid, please check the <a href="https://doc.archives-ouvertes.fr/afficher-une-liste-de-publications-dans-wordpress/" target="_blank" id="wrong_params">documentation</a>';
765 844 }
766 845 $content .= '<div class="wphal-footer">';
767 - $content .= '<p style="color:#B3B2B0">' . __("Documents récupérés de l'archive ouverte HAL", 'wp-hal') . '&nbsp;<a href="' . site . '" target="_blank"><img alt="logo" src=" ' . plugin_dir_url(__FILE__) . 'img/logo-hal.svg" style="width:32px;"></a></p>';
846 + $content .= '<p style="color:#B3B2B0">' . __("Documents récupérés de l'archive ouverte HAL", 'wp-hal') . '&nbsp;<a href="' . wphal_site . '" target="_blank"><img alt="logo" src=" ' . esc_url(plugin_dir_url(__FILE__) . 'img/logo-hal.png').'" style="width:90px;"></a></p>';
768 847 $content .= '</div>';
769 848
770 849 //--AFFICHAGE GRAPHIQUE DOMAINE--//
771 850 if (!is_null($facetdomain)) {
772 851 foreach ($facetdomain as $res) {
773 - $name = explode(delimiter, $res[0])[1];
852 + $name = explode(wphal_delimiter, $res[0])[1];
774 853 $value = $res[1];
775 854 $array[] = array($name, $value);
776 855 }
856 + wp_localize_script('wp-hal-script4', 'WPWallSettings', $array);
777 857 }
778 - wp_localize_script('wp-hal-script4', 'WPWallSettings', json_encode($array));
779 858 $translation = array('liste' => __('Liste', 'wp-hal'), 'compl' => __('Liste complète', 'wp-hal'), 'princ' => __('Liste principale', 'wp-hal'), 'graph' => __('Graphique', 'wp-hal'), 'nuage' => __('Nuage de mots', 'wp-hal'));
780 859 wp_localize_script('wp-hal-script4', 'translate', $translation);
781 860 }
782 - return $content;
861 + // tags other that those will be stripped
862 + $allowed_html_tags = array(
863 + 'div' => array(
864 + 'class' => array(),
865 + 'id' => array(),
866 + 'style' => array(),
867 + ),
868 + "span"=> array(
869 + 'class' => array(),
870 + 'id' => array(),
871 + 'style' => array(),
872 + ),
873 + "img"=> array(
874 + 'alt' => array(),
875 + 'src' => array(),
876 + 'style' => array(),
877 +
878 + ),
879 + 'p' => array(
880 + 'style' => array(),
881 + 'id' => array(),
882 + ),
883 + 'h3' => array(
884 + 'id' => array(),
885 + 'class' => array(),
886 + 'style' => array()
887 + ),
888 + 'a' => array(
889 + 'href' => array(),
890 + 'target' => array(),
891 + 'title' => array(),
892 + 'id' => array(),
893 + 'class' => array(),
894 + 'style' => array(),
895 + 'onclick' => array(),
896 + ),
897 + 'ul' => array(
898 + 'class' => array(),
899 + 'id' => array(),
900 + 'style' => array(),
901 + ),
902 + 'li' => array(
903 + 'class' => array(),
904 + 'id' => array(),
905 + 'data-percentage' => array()
906 + ),
907 + 'button' => array(
908 + 'class' => array(),
909 + 'id' => array(),
910 + 'type' => array(),
911 + 'style' => array(),
912 + 'onclick' => array()
913 + )
914 + ,'br' => array()
915 + ,'hr' => array()
916 + ,'i' => array(),
917 + );
918 + add_filter( 'safe_style_css', function( $styles ) {
919 + $styles[] = 'display';
920 + return $styles;
921 + } );
922 + return wp_kses($content, $allowed_html_tags);
783 923 }
784 924
785 -function verifSolr($values){
925 +function wphal_verifSolr($values){
786 926 $verifsolr = explode(',',$values);
787 927 $numverif = count($verifsolr);
788 928 $solrsql = '';
789 929 if ($numverif<1024){
@@ -802,17 +942,16 @@
802 942
803 943 return $solrsql;
804 944 }
805 945
806 -function wp_adding_style() {
946 +function wphal_adding_style() {
807 947 wp_register_style('wp-hal-style1', plugins_url('/css/style.css', __FILE__));
808 948 wp_register_style('wp-hal-style2', plugins_url('/css/jquery.jqplot.css', __FILE__));
809 949
810 950 wp_enqueue_style('wp-hal-style1');
811 - wp_enqueue_style('wp-hal-style2');
812 951 }
813 952
814 -function wp_adding_script() {
953 +function wphal_adding_script() {
815 954 wp_register_script('wp-hal-script1',plugins_url('/js/jquery.jqplot.js', __FILE__));
816 955 wp_register_script('wp-hal-script2',plugins_url('/js/jqplot.highlighter.js', __FILE__));
817 956 wp_register_script('wp-hal-script3',plugins_url('/js/jqplot.pieRenderer.js', __FILE__));
818 957 wp_register_script('wp-hal-script4',plugins_url('/js/cv-hal.js', __FILE__));
@@ -818,11 +957,8 @@
818 957 wp_register_script('wp-hal-script4',plugins_url('/js/cv-hal.js', __FILE__));
819 958
820 959
821 960 wp_enqueue_script("jquery");
822 - wp_enqueue_script('wp-hal-script1');
823 - wp_enqueue_script('wp-hal-script2');
824 - wp_enqueue_script('wp-hal-script3');
825 961 wp_enqueue_script('wp-hal-script4', false, array(), false, true);
826 962 }
827 963
828 964 /**
@@ -827,17 +963,17 @@
827 963
828 964 /**
829 965 * Récupère les fichiers css et js
830 966 */
831 -if ( function_exists('curl_init' ) ) {
832 - add_action('wp_enqueue_scripts', 'wp_adding_style');
833 - add_action('wp_enqueue_scripts', 'wp_adding_script');
967 +if ( wphal_is_curl_installed() ) {
968 + add_action('wp_enqueue_scripts', 'wphal_adding_style');
969 + add_action('wp_enqueue_scripts', 'wphal_adding_script');
834 970 }
835 971
836 972 /**
837 973 * Charge lorsque le plugin est désactivé
838 974 */
839 -register_deactivation_hook( __FILE__, 'reset_option' );
975 +register_deactivation_hook( __FILE__, 'wphal_reset_option' );
840 976
841 977 /**
842 978 * Ajoute le widget wphal à l'initialisation des widgets
843 979 */
@@ -853,9 +989,9 @@
853 989 */
854 990 function wphal_menu() {
855 991 add_menu_page( 'Options', 'Hal', 'manage_options', 'wp-hal.php', 'wphal_option' , '', 21);
856 992
857 - add_action( 'admin_init', 'register_settings' );
993 + add_action( 'admin_init', 'wphal_register_settings' );
858 994 }
859 995
860 996
861 997 /**
@@ -873,14 +1009,12 @@
873 1009 * Classe du widget wphal
874 1010 */
875 1011
876 1012 class wphal_widget extends WP_widget{
877 -
878 -
879 1013 /**
880 1014 * Défini les propriétés du widget
881 1015 */
882 - function wphal_widget(){
1016 + function __construct(){
883 1017 $options = array(
884 1018 "classname" => "wphal-publications",
885 1019 "description" => __("Afficher les dernières publications d'un auteur ou d'une structure.", 'wp-hal')
886 1020 );
@@ -886,9 +1020,9 @@
886 1020 );
887 1021
888 1022 parent::__construct(
889 1023 'hal-publications',
890 - __("Publications récentes", 'wp-hal'),
1024 + __("Publications HAL", 'wp-hal'),
891 1025 $options
892 1026 );
893 1027 }
894 1028
@@ -897,51 +1031,71 @@
897 1031 * @param $args
898 1032 * @param $instance
899 1033 */
900 1034 function widget($args, $instance){
901 - if ( !function_exists('curl_init' ) ) {
902 - $content = 'Please check the <a href="https://wordpress.org/plugins/hal/faq/" target="_blank" id="FAQ">FAQ</a> with the code : CURL';
1035 + if(isset($instance['idhal']) && !empty($instance['idhal'])) {
1036 + $content = '';
903 1037 extract($args);
904 - echo $before_widget;
905 - echo $before_title . $instance['titre'] . $after_title;
906 - echo $content;
907 - echo $after_widget;
908 - } else {
909 - $instance['idhal'] = verifSolr($instance['idhal']);
1038 + /**
1039 + * @var $before_widget : defined by extract
1040 + * @var $before_title : defined by extract
1041 + * @var $after_title : defined by extract
1042 + * @var $after_widget : defined by extract
1043 + */
1044 + if (!wphal_is_curl_installed()) {
1045 + $content = 'Please check the <a href="https://wordpress.org/plugins/hal/faq/" target="_blank" id="FAQ">FAQ</a> with the code : CURL';
910 1046
911 - $url = api . '?q=*:*&fq=' . $instance['select'] . ':' . urlencode($instance['idhal']) . '&fl=uri_s,'. $instance['typetext'] .'&sort=' . producedDateY . '&rows=' . $instance['nbdoc'] . '&wt=json';
1047 + } else {
1048 + $instance['idhal'] = wphal_verifSolr($instance['idhal']);
912 1049
913 - $ch = curl_init($url);
914 - // Options
915 - $options = array(
916 - CURLOPT_RETURNTRANSFER => true,
917 - CURLOPT_HTTPHEADER => array('Content-type: application/json'),
918 - CURLOPT_TIMEOUT => 10,
919 - CURLOPT_USERAGENT => "HAL Plugin Wordpress " . version
920 - );
1050 + $url = wphal_api . '?q=*:*&fq=' . $instance['select'] . ':' . urlencode($instance['idhal']) . '&fl=uri_s,' . $instance['typetext'] . '&sort=' . wphal_producedDateY . '&rows=' . $instance['nbdoc'] . '&wt=json';
1051 + $json = wphal_do_get_data($url);
921 1052
922 - // Bind des options et de l'objet cURL que l'on va utiliser
923 - curl_setopt_array($ch, $options);
924 - // Récupération du résultat JSON
925 - $json = json_decode(curl_exec($ch));
926 - curl_close($ch);
927 -
928 - $content = '<ul class="widhal-ul">';
929 - for ($i = 0; $i < $instance['nbdoc']; $i++) {
930 - if ($instance['typetext']=='citationRef_s') {
931 - $typetext = $json->response->docs[$i]->citationRef_s;
1053 + $count_results = count($json->response->docs);
1054 + if ($count_results > 0) {
1055 + $content = '<ul class="widhal-ul">';
1056 + for ($i = 0; $i < $count_results - 1; $i++) {
1057 + if ($instance['typetext'] == 'citationRef_s') {
1058 + $typetext = $json->response->docs[$i]->citationRef_s;
1059 + } else {
1060 + $typetext = $json->response->docs[$i]->title_s[0];
1061 + }
1062 + $content .= '<li class="widhal-li"><a href="' . esc_url($json->response->docs[$i]->uri_s) . '" target="_blank">' . $typetext . '</a></li>';
1063 + }
1064 + $content .= '</ul>';
932 1065 } else {
933 - $typetext = $json->response->docs[$i]->title_s[0];
1066 + $content = '<div> no results !</div>';
934 1067 }
935 - $content .= '<li class="widhal-li"><a href="' . $json->response->docs[$i]->uri_s . '" target="_blank">' . $typetext . '</a></li>';
936 1068 }
937 - $content .= '</ul>';
938 -
939 - extract($args);
940 - echo $before_widget;
941 - echo $before_title . $instance['titre'] . $after_title;
942 - echo $content;
943 - echo $after_widget;
1069 + // tags other that those will be stripped
1070 + $allowed_html_tags = array(
1071 + 'div' => array(
1072 + 'class' => array(),
1073 + 'id' => array(),
1074 + ),
1075 + 'h2' => array(),
1076 + 'section' => array(),
1077 + 'a' => array(
1078 + 'href' => array(),
1079 + 'target' => array(),
1080 + 'title' => array(),
1081 + 'id' => array(),
1082 + 'class' => array(),
1083 + ),
1084 + 'ul' => array(
1085 + 'class' => array(),
1086 + 'id' => array(),
1087 + ),
1088 + 'li' => array(
1089 + 'class' => array(),
1090 + 'id' => array(),
1091 + )
1092 + );
1093 + $widget_block = $before_widget;
1094 + $widget_block .= $before_title . $instance['titre'] . $after_title;
1095 + $widget_block .= $content;
1096 + $widget_block .= $after_widget;
1097 + echo wp_kses($widget_block, $allowed_html_tags);
944 1098 }
945 1099 }
946 1100
947 1101 /**
@@ -949,9 +1103,15 @@
949 1103 * @param $new
950 1104 * @param $old
951 1105 */
952 1106 function update($new, $old){
953 - return $new;
1107 + //the id must be provided
1108 + if(isset($new['idhal']) && !empty($new['idhal'])) {
1109 + $new['idhal'] = wphal_sanitize_username($new['idhal']);
1110 + $new['nbdoc'] = wphal_sanitize_id($new['nbdoc']);
1111 + return $new;
1112 + }else
1113 + return false;
954 1114 }
955 1115
956 1116 /**
957 1117 * Formulaire du widget
@@ -959,43 +1119,45 @@
959 1119 */
960 1120 function form($instance){
961 1121
962 1122 $defaut = array(
963 - 'titre' => __("Publications récentes", 'wp-hal'),
1123 + 'titre' => __("Publications Hal", 'wp-hal'),
964 1124 'select' => "authIdHal_s",
965 1125 'typetext' => "title_s",
1126 + 'idhal' => "",
966 1127 'nbdoc' => 5
967 1128 );
968 1129 $instance = wp_parse_args($instance,$defaut);
969 1130 ?>
970 1131 <p>
971 - <label for="<?php echo $this->get_field_id("titre");?>"><?php echo __('Titre','wp-hal') .' :'?></label>
972 - <input value="<?php echo $instance['titre'];?>" name="<?php echo $this->get_field_name("titre");?>" id="<?php echo $this->get_field_id("titre");?>" class="widefat" type="text"/>
1132 + <label for="<?php echo esc_attr($this->get_field_id("titre"));?>"><?php echo esc_html(__('Titre','wp-hal')) .' :'?></label>
1133 + <input value="<?php echo esc_js($instance['titre']);?>" name="<?php echo esc_attr($this->get_field_name("titre"));?>" id="<?php echo esc_attr($this->get_field_id("titre"));?>" class="widefat" type="text"/>
973 1134 </p>
974 1135 <p>
975 - <label for="<?php echo $this->get_field_id("nbdoc");?>"><?php echo __("Nombre de documents affichés",'wp-hal') .' :'?></label>
976 - <input class="tiny-text" id="<?php echo $this->get_field_id("nbdoc");?>" name="<?php echo $this->get_field_name("nbdoc");?>" type="number" step="1" min="1" max="10" value="<?php echo $instance['nbdoc'];?>" size="3">
1136 + <label for="<?php echo esc_attr($this->get_field_id("nbdoc"));?>"><?php echo esc_html(__("Nombre de documents affichés",'wp-hal')) .' :'?></label>
1137 + <input class="tiny-text" id="<?php echo esc_attr($this->get_field_id("nbdoc"));?>" name="<?php echo esc_attr($this->get_field_name("nbdoc"));?>" type="number" step="1" min="1" max="10" value="<?php echo esc_js($instance['nbdoc']);?>" size="3">
977 1138 </p>
978 1139 <p>
979 - <label for="<?php echo $this->get_field_id("typetext");?>"><?php echo __("Type d'affichage",'wp-hal') .' :'?></label>
980 - <select id="<?php echo $this->get_field_id("typetext");?>" name="<?php echo $this->get_field_name("typetext");?>">
981 - <option id="<?php echo $this->get_field_id("Title");?>" value="title_s" <?php echo ($instance["typetext"] == "title_s")?'selected':''; ?>><label for="<?php echo $this->get_field_id("Title");?>"><?php echo __("Titre", 'wp-hal')?></label></option>
982 - <option id="<?php echo $this->get_field_id("Citation");?>" value="citationRef_s" <?php echo ($instance["typetext"] == "citationRef_s")?'selected':''; ?>><label for="<?php echo $this->get_field_id("Citation");?>"><?php echo __("Citation", 'wp-hal')?></label></option>
1140 + <label for="<?php echo esc_attr($this->get_field_id("typetext"));?>"><?php echo esc_html(__("Type d'affichage",'wp-hal')) .' :'?></label>
1141 + <select id="<?php echo esc_attr($this->get_field_id("typetext"));?>" name="<?php echo esc_attr($this->get_field_name("typetext"));?>">
1142 + <option id="<?php echo esc_attr($this->get_field_id("Title"));?>" value="title_s" <?php echo esc_attr(($instance["typetext"] == "title_s")?'selected':''); ?>><label for="<?php echo wp_kses($this->get_field_id("Title"), []);?>"><?php echo esc_html(__("Titre", 'wp-hal'))?></label></option>
1143 + <option id="<?php echo esc_attr($this->get_field_id("Citation"));?>" value="citationRef_s" <?php echo esc_attr(($instance["typetext"] == "citationRef_s")?'selected':''); ?>><label for="<?php echo esc_attr($this->get_field_id("Citation"));?>"><?php echo esc_html(__("Citation", 'wp-hal'), [])?></label></option>
983 1144 </select>
984 1145 </p>
985 1146 <p>
986 - <label for="<?php echo $this->get_field_id("select");?>"><?php echo __("Type d'Id",'wp-hal') .' :'?></label>
987 - <select id="<?php echo $this->get_field_id("select");?>" name="<?php echo $this->get_field_name("select");?>">
988 - <option id="<?php echo $this->get_field_id("Idhal");?>" value="authIdHal_s" <?php echo ($instance["select"] == "authIdHal_s")?'selected':''; ?>><label for="<?php echo $this->get_field_id("Idhal");?>">Id Hal</label><span style="font-style: italic;"> <?php echo __('(Exemple : laurent-capelli)','wp-hal');?></span></option>
989 - <option id="<?php echo $this->get_field_id("Structid");?>" value="authStructId_i" <?php echo ($instance["select"] == "authStructId_i")?'selected':''; ?>><label for="<?php echo $this->get_field_id("Structid");?>">Struct Id</label><span style="font-style: italic;"> <?php echo __('(Exemple : 129)','wp-hal');?></span></option>
990 - <option id="<?php echo $this->get_field_id("Anrproject");?>" value="anrProjectId_i" <?php echo ($instance["select"] == "anrProjectId_i")?'selected':''; ?>><label for="<?php echo $this->get_field_id("Anrproject");?>">anrProject Id</label><span style="font-style: italic;"> <?php echo __('(Exemple : 1646)','wp-hal');?></span></option>
991 - <option id="<?php echo $this->get_field_id("Europeanproject");?>" value="europeanProjectId_i" <?php echo ($instance["select"] == "europeanProjectId_i")?'selected':''; ?>><label for="<?php echo $this->get_field_id("Europeanproject");?>">europeanProject Id</label><span style="font-style: italic;"> <?php echo __('(Exemple : 17877)','wp-hal');?></span></option>
992 - <option id="<?php echo $this->get_field_id("Collection");?>" value="collCode_s" <?php echo ($instance["select"] == "collCode_s")?'selected':''; ?>><label for="<?php echo $this->get_field_id("Collection");?>">Collection</label><span style="font-style: italic;"> <?php echo __('(Exemple : TICE2014)','wp-hal');?></span></option>
1147 + <label for="<?php echo esc_attr($this->get_field_id("select"));?>"><?php echo esc_html(__("Type d'Id",'wp-hal') .' :')?></label>
1148 + <select id="<?php echo esc_attr($this->get_field_id("select"));?>" name="<?php echo esc_attr($this->get_field_name("select"));?>">
1149 + <option id="<?php echo esc_attr($this->get_field_id("Idhal"));?>" value="authIdHal_s" <?php echo esc_attr(($instance["select"] == "authIdHal_s")?'selected':''); ?>><label for="<?php echo esc_attr($this->get_field_id("Idhal"));?>">Id Hal</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : laurent-capelli)','wp-hal'));?></span></option>
1150 + <option id="<?php echo esc_attr($this->get_field_id("StructId"));?>" value="structId_i" <?php echo esc_attr(($instance["select"] == "structId_i")?'selected':''); ?>><label for="<?php echo esc_attr($this->get_field_id("StructId"));?>">Struct Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 413106)','wp-hal'));?></span></option>
1151 + <option id="<?php echo esc_attr($this->get_field_id("AuthorStructId"));?>" value="authStructId_i" <?php echo esc_attr(($instance["select"] == "authStructId_i")?'selected':''); ?>><label for="<?php echo esc_attr($this->get_field_id("AuthorStructId"));?>">AuthorStruct Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 413106)','wp-hal'));?></span></option>
1152 + <option id="<?php echo esc_attr($this->get_field_id("Anrproject"));?>" value="anrProjectId_i" <?php echo esc_attr(($instance["select"] == "anrProjectId_i")?'selected':''); ?>><label for="<?php echo esc_attr($this->get_field_id("Anrproject"));?>">anrProject Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 1646)','wp-hal'));?></span></option>
1153 + <option id="<?php echo esc_attr($this->get_field_id("Europeanproject"));?>" value="europeanProjectId_i" <?php echo esc_attr(($instance["select"] == "europeanProjectId_i")?'selected':''); ?>><label for="<?php echo esc_attr($this->get_field_id("Europeanproject"));?>">europeanProject Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 17877)','wp-hal'));?></span></option>
1154 + <option id="<?php echo esc_attr($this->get_field_id("Collection"));?>" value="collCode_s" <?php echo esc_attr(($instance["select"] == "collCode_s")?'selected':''); ?>><label for="<?php echo esc_attr($this->get_field_id("Collection"));?>">Collection</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : TICE2014)','wp-hal'));?></span></option>
993 1155 </select>
994 1156 </p>
995 1157 <p>
996 - <label for="<?php echo $this->get_field_id("idhal");?>"><?php echo __("Id",'wp-hal') .' :'?></label>
997 - <input value="<?php echo $instance['idhal'];?>" name="<?php echo $this->get_field_name("idhal");?>" id="<?php echo $this->get_field_id("idhal");?>" type="text"/>
1158 + <label for="<?php echo esc_attr($this->get_field_id("idhal"));?>"><?php echo esc_html(__("Id",'wp-hal')) .' :'?></label>
1159 + <input value="<?php echo esc_js($instance['idhal']);?>" name="<?php echo esc_attr($this->get_field_name("idhal"));?>" id="<?php echo esc_attr($this->get_field_id("idhal"));?>" type="text"/>
998 1160 </p>
999 1161 <?php
1000 1162 }
1001 1163 }
@@ -1000,21 +1162,79 @@
1000 1162 }
1001 1163 }
1002 1164
1003 1165
1004 -function register_settings() {
1166 +function wphal_sanitize_id( $input ){
1167 + if(is_numeric($input)){
1168 + return $input;
1169 + }
1170 +}
1171 +
1172 +function wphal_sanitize_username($input)
1173 +{
1174 + $allowed = array(".", "-", "_"); // you can add here more value, you want to allow.
1175 + if(ctype_alnum(str_replace($allowed, '', $input ))) {
1176 + return $input;
1177 + }
1178 +}
1179 +
1180 +function wphal_sanitize_phone( $input ){
1181 + $phone_num = $input;
1182 + $phone_num = preg_replace('/[^0-9]/', '', $phone_num);
1183 + if(strlen($phone_num) === 10) {
1184 + //Phone is 10 characters in length
1185 + return $input;
1186 + }
1187 +}
1188 +
1189 +
1190 +function wphal_register_settings() {
1005 1191 register_setting( 'wphal_option', 'option_choix' );
1006 1192 register_setting( 'wphal_option', 'option_type' );
1007 1193 register_setting( 'wphal_option', 'option_groupe' );
1008 - register_setting( 'wphal_option', 'option_idhal' );
1194 + register_setting( 'wphal_option', 'option_idhal' , array(
1195 + 'type' => 'string',
1196 + 'sanitize_callback' => 'wphal_sanitize_username',
1197 + 'default' => NULL,
1198 + ));
1009 1199 register_setting( 'wphal_option', 'option_lang' );
1010 1200 register_setting( 'wphal_option', 'option_infocontact' );
1011 - register_setting( 'wphal_option', 'option_email' );
1012 - register_setting( 'wphal_option', 'option_tel' );
1013 - register_setting( 'wphal_option', 'option_social0' );
1014 - register_setting( 'wphal_option', 'option_social1' );
1015 - register_setting( 'wphal_option', 'option_social2' );
1016 - register_setting( 'wphal_option', 'option_social3' );
1201 + register_setting( 'wphal_option', 'option_email' , array(
1202 + 'type' => 'string',
1203 + 'sanitize_callback' => 'sanitize_email',
1204 + 'default' => NULL,
1205 + ));
1206 + register_setting( 'wphal_option', 'option_tel' , array(
1207 + 'type' => 'string',
1208 + 'sanitize_callback' => 'wphal_sanitize_phone',
1209 + 'default' => NULL,
1210 + ));
1211 + register_setting( 'wphal_option', 'option_social0' , array(
1212 + 'type' => 'string',
1213 + 'sanitize_callback' => 'wphal_sanitize_username',
1214 + 'default' => NULL,
1215 + ));
1216 + register_setting( 'wphal_option', 'option_social1' , array(
1217 + 'type' => 'string',
1218 + 'sanitize_callback' => 'wphal_sanitize_username',
1219 + 'default' => NULL,
1220 + ));
1221 + register_setting( 'wphal_option', 'option_social2' , array(
1222 + 'type' => 'string',
1223 + 'sanitize_callback' => 'wphal_sanitize_username',
1224 + 'default' => NULL,
1225 + ));
1226 + register_setting( 'wphal_option', 'option_social3' , array(
1227 + 'type' => 'string',
1228 + 'sanitize_callback' => 'wphal_sanitize_username',
1229 + 'default' => NULL,
1230 + ));
1231 + register_setting( 'wphal_option', 'option_cache_timeout' , array(
1232 + 'type' => 'string',
1233 + 'sanitize_callback' => 'wphal_sanitize_id',
1234 + 'default' => NULL,
1235 + ));
1236 + register_setting( 'wphal_option', 'option_erase_cache' );
1017 1237 }
1018 1238
1019 1239 /**
1020 1240 * Crée le menu d'option du plugin
@@ -1028,9 +1248,9 @@
1028 1248 update_option('option_groupe', 'paginer');
1029 1249 }
1030 1250 ?>
1031 1251 <div class="wrap">
1032 - <h2><?php echo __('Plugin HAL','wp-hal');?></h2>
1252 + <h2><?php echo esc_html(__('Plugin HAL','wp-hal'));?></h2>
1033 1253 <form method="post" enctype="multipart/form-data" action="options.php">
1034 1254 <div id="poststuff">
1035 1255 <div id="post-body" class="metabox-holder columns-2">
1036 1256 <div id="post-body-content">
@@ -1036,75 +1256,86 @@
1036 1256 <div id="post-body-content">
1037 1257 <?php settings_fields( 'wphal_option' ); ?>
1038 1258 <?php do_settings_sections( 'wphal_option' ); ?>
1039 1259 <table class="form-table">
1040 - <tr valign="top">
1041 - <th scope="row" style="font-size: 18px;"><?php echo __('Paramètre de la page :','wp-hal');?></th>
1260 + <tr style="vertical-align:top;">
1261 + <th scope="row" style="font-size: 18px;"><?php echo esc_html(__('Paramètre de la page :','wp-hal'));?></th>
1042 1262 </tr>
1043 - <tr valign="top">
1044 - <th scope="row"><?php echo __('Type d\'Id','wp-hal');?></th>
1263 + <tr style="vertical-align:top;">
1264 + <th scope="row"><label for="option_type"><?php echo esc_html(__('Type d\'Id','wp-hal'));?></label></th>
1045 1265 <td><select name="option_type">
1046 - <option id="Idhal" value="authIdHal_s" <?php echo (get_option('option_type') == "authIdHal_s")?'selected':''; ?>><label for="Idhal">Id Hal</label><span style="font-style: italic;"> <?php echo __('(Exemple : laurent-capelli)','wp-hal');?></span></option>
1047 - <option id="Structid" value="authStructId_i" <?php echo (get_option('option_type') == "authStructId_i")?'selected':''; ?>><label for="Structid">Struct Id</label><span style="font-style: italic;"> <?php echo __('(Exemple : 129)','wp-hal');?></span></option>
1048 - <option id="Anrproject" value="anrProjectId_i" <?php echo (get_option('option_type') == "anrProjectId_i")?'selected':''; ?>><label for="Anrproject">anrProject Id</label><span style="font-style: italic;"> <?php echo __('(Exemple : 1646)','wp-hal');?></span></option>
1049 - <option id="Europeanproject" value="europeanProjectId_i" <?php echo (get_option('option_type') == "europeanProjectId_i")?'selected':''; ?>><label for="Europeanproject">europeanProject Id</label><span style="font-style: italic;"> <?php echo __('(Exemple : 17877)','wp-hal');?></span></option>
1050 - <option id="Collection" value="collCode_s" <?php echo (get_option('option_type') == "collCode_s")?'selected':''; ?>><label for="Collection">Collection</label><span style="font-style: italic;"> <?php echo __('(Exemple : TICE2014)','wp-hal');?></span></option>
1266 + <option id="Idhal" value="authIdHal_s" <?php echo esc_attr(((get_option('option_type') == "authIdHal_s")?'selected':'')); ?>><label for="Idhal">Id Hal</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : laurent-capelli)','wp-hal'));?></span></option>
1267 + <option id="StructId" value="structId_i" <?php echo esc_attr(((get_option('option_type') == "structId_i")?'selected':'')); ?>><label for="StructId">Struct Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 413106)','wp-hal'));?></span></option>
1268 + <option id="AuthorStructId" value="authStructId_i" <?php echo esc_attr(((get_option('option_type') == "authStructId_i")?'selected':'')); ?>><label for="AuthorStructId">AuthorStruct Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 413106)','wp-hal'));?></span></option>
1269 + <option id="Anrproject" value="anrProjectId_i" <?php echo esc_attr(((get_option('option_type') == "anrProjectId_i")?'selected':'')); ?>><label for="Anrproject">anrProject Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 1646)','wp-hal'));?></span></option>
1270 + <option id="Europeanproject" value="europeanProjectId_i" <?php echo esc_attr(((get_option('option_type') == "europeanProjectId_i")?'selected':'')); ?>><label for="Europeanproject">europeanProject Id</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : 17877)','wp-hal'));?></span></option>
1271 + <option id="Collection" value="collCode_s" <?php echo esc_attr(((get_option('option_type') == "collCode_s")?'selected':'')); ?>><label for="Collection">Collection</label><span style="font-style: italic;"> <?php echo esc_html(__('(Exemple : TICE2014)','wp-hal'));?></span></option>
1051 1272 </select>
1052 - <input type="text" name="option_idhal" id="option_idhal" value="<?php echo get_option('option_idhal'); ?>"/>
1273 + <input type="text" name="option_idhal" id="option_idhal" value="<?php echo esc_js(get_option('option_idhal')); ?>"/>
1053 1274 </td>
1054 1275 </tr>
1055 - <tr valign="top">
1056 - <th scope="row"><?php echo __('Affichage des documents','wp-hal');?></th>
1057 - <td><input type="radio" name="option_groupe" id="paginer" value="paginer" <?php echo (get_option('option_groupe') == "paginer")?'checked':''; ?>><label for="paginer"><?php echo __('Documents avec pagination','wp-hal');?></label><br>
1058 - <input type="radio" name="option_groupe" id="grouper" value="grouper" <?php echo (get_option('option_groupe') == "grouper")?'checked':''; ?>><label for="grouper"><?php echo __('Documents groupés par type','wp-hal');?></label><br>
1276 + <tr style="vertical-align:top;">
1277 + <th scope="row"><?php echo esc_html(__('Affichage des documents','wp-hal'));?></th>
1278 + <td><input type="radio" name="option_groupe" id="paginer" value="paginer" <?php echo esc_attr((get_option('option_groupe') == "paginer")?'checked':''); ?>><label for="paginer"><?php echo esc_html(__('Documents avec pagination','wp-hal'));?></label><br>
1279 + <input type="radio" name="option_groupe" id="grouper" value="grouper" <?php echo esc_js((get_option('option_groupe') == "grouper")?'checked':''); ?>><label for="grouper"><?php echo esc_html(__('Documents groupés par type','wp-hal'));?></label><br>
1059 1280 </td>
1060 1281 </tr>
1061 - <tr valign="top">
1062 - <th scope="row"><?php echo __('Choix des éléments menu','wp-hal');?></th>
1063 - <td><input type="checkbox" name="option_choix[1]" id="Contact" value="contact" <?php echo (get_option('option_choix')[1] == "contact")?'checked':''; ?>><label for="Contact"><?php echo __('Contact','wp-hal');?></label><br/>
1064 - <input type="checkbox" name="option_choix[2]" id="Disciplines" value="disciplines" <?php echo (get_option('option_choix')[2] == "disciplines")?'checked':''; ?>><label for="Disciplines"><?php echo __('Disciplines','wp-hal');?></label><br/>
1065 - <input type="checkbox" name="option_choix[3]" id="Mots-clefs" value="mots-clefs" <?php echo (get_option('option_choix')[3] == "mots-clefs")?'checked':''; ?>><label for="Mots-clefs"><?php echo __('Mots-clefs','wp-hal');?></label><br/>
1066 - <input type="checkbox" name="option_choix[4]" id="Auteurs" value="auteurs" <?php echo (get_option('option_choix')[4] == "auteurs")?'checked':''; ?>><label for="Auteurs"><?php echo __('Auteurs','wp-hal');?></label><br/>
1067 - <input type="checkbox" name="option_choix[5]" id="Revues" value="revues" <?php echo (get_option('option_choix')[5] == "revues")?'checked':''; ?>><label for="Revues"><?php echo __('Revues','wp-hal');?></label><br/>
1068 - <input type="checkbox" name="option_choix[6]" id="Annee" value="annee" <?php echo (get_option('option_choix')[6] == "annee")?'checked':''; ?>><label for="Annee"><?php echo __('Année de production','wp-hal');?></label><br/>
1069 - <input type="checkbox" name="option_choix[7]" id="Institution" value="institution" <?php echo (get_option('option_choix')[7] == "institution")?'checked':''; ?>><label for="Institution"><?php echo __('Institutions','wp-hal');?></label><br/>
1070 - <input type="checkbox" name="option_choix[8]" id="Laboratoire" value="laboratoire" <?php echo (get_option('option_choix')[8] == "laboratoire")?'checked':''; ?>><label for="Laboratoire"><?php echo __('Laboratoires','wp-hal');?></label><br/>
1071 - <input type="checkbox" name="option_choix[9]" id="Departement" value="departement" <?php echo (get_option('option_choix')[9] == "departement")?'checked':''; ?>><label for="Departement"><?php echo __('Départements','wp-hal');?></label><br/>
1072 - <input type="checkbox" name="option_choix[10]" id="Equipe" value="equipe" <?php echo (get_option('option_choix')[10] == "equipe")?'checked':''; ?>><label for="Equipe"><?php echo __('Équipes de recherche','wp-hal');?></label>
1282 + <tr style="vertical-align:top;">
1283 + <th scope="row"><?php echo esc_html(__('Choix des éléments menu','wp-hal'));?></th>
1284 + <?php $option_choix = get_option('option_choix'); ?>
1285 + <td><input type="checkbox" name="option_choix[1]" id="Contact" value="contact" <?php echo esc_attr((isset($option_choix[1]) && $option_choix[1] == "contact")?'checked':''); ?>><label for="Contact"><?php echo esc_html(__('Contact','wp-hal'));?></label><br/>
1286 + <input type="checkbox" name="option_choix[2]" id="Disciplines" value="disciplines" <?php echo esc_attr((isset($option_choix[2]) && $option_choix[2] == "disciplines")?'checked':''); ?>><label for="Disciplines"><?php echo esc_html(__('Disciplines','wp-hal'));?></label><br/>
1287 + <input type="checkbox" name="option_choix[3]" id="Mots-clefs" value="mots-clefs" <?php echo esc_attr((isset($option_choix[3]) && $option_choix[3] == "mots-clefs")?'checked':''); ?>><label for="Mots-clefs"><?php echo esc_html(__('Mots-clefs','wp-hal'));?></label><br/>
1288 + <input type="checkbox" name="option_choix[4]" id="Auteurs" value="auteurs" <?php echo esc_attr((isset($option_choix[4]) && $option_choix[4] == "auteurs")?'checked':''); ?>><label for="Auteurs"><?php echo esc_html(__('Auteurs','wp-hal'));?></label><br/>
1289 + <input type="checkbox" name="option_choix[5]" id="Revues" value="revues" <?php echo esc_attr((isset($option_choix[5]) && $option_choix[5] == "revues")?'checked':''); ?>><label for="Revues"><?php echo esc_html(__('Revues','wp-hal'));?></label><br/>
1290 + <input type="checkbox" name="option_choix[6]" id="Annee" value="annee" <?php echo esc_attr((isset($option_choix[6]) && $option_choix[6] == "annee")?'checked':''); ?>><label for="Annee"><?php echo esc_html(__('Année de production','wp-hal'));?></label><br/>
1291 + <input type="checkbox" name="option_choix[7]" id="Institution" value="institution" <?php echo esc_attr((isset($option_choix[7]) && $option_choix[7] == "institution")?'checked':''); ?>><label for="Institution"><?php echo esc_html(__('Institutions','wp-hal'));?></label><br/>
1292 + <input type="checkbox" name="option_choix[8]" id="Laboratoire" value="laboratoire" <?php echo esc_attr((isset($option_choix[8]) && $option_choix[8] == "laboratoire")?'checked':''); ?>><label for="Laboratoire"><?php echo esc_html(__('Laboratoires','wp-hal'));?></label><br/>
1293 + <input type="checkbox" name="option_choix[9]" id="Departement" value="departement" <?php echo esc_attr((isset($option_choix[9]) && $option_choix[9] == "departement")?'checked':''); ?>><label for="Departement"><?php echo esc_html(__('Départements','wp-hal'));?></label><br/>
1294 + <input type="checkbox" name="option_choix[10]" id="Equipe" value="equipe" <?php echo esc_attr((isset($option_choix[10]) && $option_choix[10] == "equipe")?'checked':''); ?>><label for="Equipe"><?php echo esc_html(__('Équipes de recherche','wp-hal'));?></label>
1073 1295 </td>
1074 1296 </tr>
1075 - <tr valign="top">
1076 - <th scope="row" style="font-size: 18px;"><?php echo __('Contact :','wp-hal');?></th>
1297 + <tr style="vertical-align:top;">
1298 + <th scope="row" style="font-size: 18px;"><?php echo esc_html(__('Contact :','wp-hal'));?></th>
1077 1299 </tr>
1078 1300 <tr>
1079 - <th scope="row"><?php echo __("Afficher les informations d'un chercheur ayant un IdHal ?",'wp-hal');?></th>
1080 - <td><input type="radio" name="option_infocontact" id="wphal-yes" value="yes" <?php echo (get_option('option_infocontact') == "yes")?'checked':''; ?>><label for="wphal-yes"><?php echo __("Oui",'wp-hal')?></label><br>
1081 - <input type="radio" name="option_infocontact" id="wphal-no" value="no" <?php echo (get_option('option_infocontact') == "no")?'checked':''; ?>><label for="wphal-no"><?php echo __("Non",'wp-hal')?></label><br>
1301 + <th scope="row"><?php echo esc_html(__("Afficher les informations d'un chercheur ayant un IdHal ?",'wp-hal'));?></th>
1302 + <td><input type="radio" name="option_infocontact" id="wphal-yes" value="yes" <?php echo esc_attr((get_option('option_infocontact') == "yes")?'checked':''); ?>><label for="wphal-yes"><?php echo esc_html(__("Oui",'wp-hal'))?></label><br>
1303 + <input type="radio" name="option_infocontact" id="wphal-no" value="no" <?php echo esc_attr((get_option('option_infocontact') == "no")?'checked':''); ?>><label for="wphal-no"><?php echo esc_html(__("Non",'wp-hal'))?></label><br>
1082 1304 </td>
1305 + </tr>
1083 1306 <tr>
1084 - <th scope="row"><?php echo __('Email','wp-hal');?></th>
1085 - <td><input type="text" style="width:300px;" placeholder="Exemple : hi@mail.com" name="option_email" id="option_email" value="<?php echo get_option('option_email'); ?>"/><img alt="email" src="<?php echo plugin_dir_url( __FILE__ ) ?>img/mail.svg" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1307 + <th scope="row"><label for="option_cache_timeout"><?php echo esc_html(__('Expiration cache (minutes)','wp-hal'));?></label></th>
1308 + <td><input type="number" min="1440" style="width:300px;" placeholder="Default(1 day) : 1440" name="option_cache_timeout" id="option_cache_timeout" value="<?php echo esc_js(get_option('option_cache_timeout')); ?>"/><img alt="cache" src="<?php echo esc_url(plugin_dir_url( __FILE__ ).'img/clock.svg'); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1086 1309 </tr>
1087 1310 <tr>
1088 - <th scope="row"><?php echo __('Téléphone','wp-hal');?></th>
1089 - <td><input type="text" style="width:300px;" placeholder="Exemple : 06-01-02-03-04" name="option_tel" id="option_tel" value="<?php echo get_option('option_tel');?>"/><img alt="phone" src="<?php echo plugin_dir_url( __FILE__ ) ?>img/phone.svg" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1311 + <th scope="row"><label for="option_erase_cache"><?php echo esc_html(__('Reinitialiser le cache','wp-hal'));?></label></th>
1312 + <td><input type="checkbox" name="option_erase_cache" id="option_erase_cache" value="1"/><img alt="option_erase_cache" src="<?php echo esc_url(plugin_dir_url( __FILE__ )."img/groom.svg"); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1090 1313 </tr>
1091 1314 <tr>
1092 - <th>Facebook (http://www.facebook.com/)</th>
1093 - <td><input type="text" style="width:300px;" placeholder="Exemple : fa.book" name="option_social0" id="option_social0" value="<?php echo get_option('option_social0'); ?>"/><img alt="facebook" src="<?php echo plugin_dir_url( __FILE__ ) ?>img/facebook.svg" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1315 + <th scope="row"><label for="option_email"><?php echo esc_html(__('Email','wp-hal'));?></label></th>
1316 + <td><input type="text" style="width:300px;" placeholder="Exemple : hi@mail.com" name="option_email" id="option_email" value="<?php echo esc_js(get_option('option_email')); ?>"/><img alt="email" src="<?php echo esc_url(plugin_dir_url( __FILE__ )."img/mail.svg"); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1094 1317 </tr>
1095 1318 <tr>
1096 - <th>Twitter (http://www.twitter.com/)</th>
1097 - <td><input type="text" style="width:300px;" placeholder="Exemple : tweet_heure" name="option_social1" id="option_social1" value="<?php echo get_option('option_social1'); ?>"/><img alt="twitter" src="<?php echo plugin_dir_url( __FILE__ ) ?>img/twitter.svg" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1319 + <th scope="row"><label for="option_tel"><?php echo esc_html(__('Téléphone','wp-hal'));?></label></th>
1320 + <td><input type="text" style="width:300px;" placeholder="Exemple : 06-01-02-03-04" name="option_tel" id="option_tel" value="<?php echo esc_js(get_option('option_tel'));?>"/><img alt="phone" src="<?php echo esc_url(plugin_dir_url( __FILE__ )."img/phone.svg"); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1098 1321 </tr>
1099 1322 <tr>
1100 - <th>Google + (https://plus.google.com/u/0/+)</th>
1101 - <td><input type="text" style="width:300px;" placeholder="Exemple : goo.plus" name="option_social2" id="option_social2" value="<?php echo get_option('option_social2'); ?>"/><img alt="google" src="<?php echo plugin_dir_url( __FILE__ ) ?>img/google-plus.svg" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1323 + <th><label for="option_social0">Facebook (http://www.facebook.com/)</label></th>
1324 + <td><input type="text" style="width:300px;" placeholder="Exemple : fa.book" name="option_social0" id="option_social0" value="<?php echo esc_js(get_option('option_social0')); ?>"/><img alt="facebook" src="<?php echo esc_url(plugin_dir_url( __FILE__ )."img/facebook.svg"); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1102 1325 </tr>
1103 1326 <tr>
1104 - <th>LinkedIn (https://www.linkedin.com/in/)</th>
1105 - <td><input type="text" style="width:300px;" placeholder="Exemple : link.dine" name="option_social3" id="option_social3" value="<?php echo get_option('option_social3'); ?>"/><img alt="linkedin" src="<?php echo plugin_dir_url( __FILE__ ) ?>img/linkedin.svg" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1327 + <th><label for="option_social1">Twitter (http://www.twitter.com/)</label></th>
1328 + <td><input type="text" style="width:300px;" placeholder="Exemple : tweet_heure" name="option_social1" id="option_social1" value="<?php echo esc_js(get_option('option_social1')); ?>"/><img alt="twitter" src="<?php echo esc_url(plugin_dir_url( __FILE__ )."img/twitter.svg"); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1106 1329 </tr>
1330 + <tr>
1331 + <th><label for="option_social2">Google + (https://plus.google.com/u/0/+)</label></th>
1332 + <td><input type="text" style="width:300px;" placeholder="Exemple : goo.plus" name="option_social2" id="option_social2" value="<?php echo esc_js(get_option('option_social2')); ?>"/><img alt="google" src="<?php echo esc_url(plugin_dir_url( __FILE__ )."img/google-plus.svg"); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1333 + </tr>
1334 + <tr>
1335 + <th><label for="option_social3">LinkedIn (https://www.linkedin.com/in/)</label></th>
1336 + <td><input type="text" style="width:300px;" placeholder="Exemple : link.dine" name="option_social3" id="option_social3" value="<?php echo esc_js(get_option('option_social3')); ?>"/><img alt="linkedin" src="<?php echo esc_url(plugin_dir_url( __FILE__ )."img/linkedin.svg"); ?>" style="vertical-align:middle; width:32px; margin-left:2px; margin-right:2px;"/></td>
1337 + </tr>
1107 1338 </table>
1108 1339 <?php
1109 1340 submit_button(__('Enregistrer','wp-hal'), 'primary large', 'submit', true); ?>
1110 1341 </div>
@@ -1124,9 +1355,9 @@
1124 1355
1125 1356 /**
1126 1357 * Reset les données Hal
1127 1358 */
1128 -function reset_option() {
1359 +function wphal_reset_option() {
1129 1360 delete_option('option_choix');
1130 1361 delete_option('option_type');
1131 1362 delete_option('option_groupe');
1132 1363 delete_option('option_idhal');
@@ -1137,6 +1368,9 @@
1137 1368 delete_option('option_social0');
1138 1369 delete_option('option_social1');
1139 1370 delete_option('option_social2');
1140 1371 delete_option('option_social3');
1372 + delete_option('option_cache_timeout');
1373 + delete_option('option_erase_cache');
1141 1374 }
1142 -?>
1375 +
1376 +?>