wp-hal.php: 2.0 vs 2.3 · HAL

← All changes | wp-hal.php +419 -653 2.3 → 2.0 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.3
7		- * Author: CCSD
	6	+ * Version: 2.0
	7	+ * Author: Baptiste Blondelle
8	8	* Author URI: http://www.ccsd.cnrs.fr
9	9	* Text Domain: wp-hal
10	10	* Domain Path: /lang/
11	11	*/
		@@ -17,38 +17,28 @@
17	17	//Récupère les constantes
18	18	require_once("constantes.php");
19	19
20	20
21		-if (wphal_locale == 'fr_FR') {
22		- define('wphal_lang', 'fr');
23		-} elseif (wphal_locale == 'es_ES') {
24		- define('wphal_lang', 'es');
	21	+if (locale == 'fr_FR') {
	22	+ define('lang', 'fr');
	23	+} elseif (locale == 'es_ES') {
	24	+ define('lang', 'es');
25	25	} else {
26		- define('wphal_lang', 'en');
	26	+ define('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		-
39	29	// Création du shortcode ('nom du shortcode', 'fonction appelée')
40		-add_shortcode( 'cv-hal', 'wphal_cv_hal' );
41		-add_shortcode( 'nb-doc', 'wphal_nb_doc' );
	30	+add_shortcode( 'cv-hal', 'cv_hal' );
	31	+add_shortcode( 'nb-doc', 'nb_doc' );
42	32
43	33
44		-function wphal_charger_languages() {
	34	+function charger_languages() {
45	35	load_plugin_textdomain('wp-hal', false, dirname(plugin_basename(__FILE__)) . '/lang/');
46	36	}
47	37
48		-add_action('plugins_loaded', 'wphal_charger_languages');
	38	+add_action('plugins_loaded', 'charger_languages');
49	39
50		-function wphal_action_links( $links, $file ) {
	40	+function hal_plugin_action_links( $links, $file ) {
51	41	if ( $file != plugin_basename( __FILE__ ))
52	42	return $links;
53	43
54	44	$settings_link = '<a href="admin.php?page=wp-hal.php">' . __( 'Paramètres', 'wp-hal' ) . '</a>';
		@@ -57,77 +47,18 @@
57	47
58	48	return $links;
59	49	}
60	50
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		-}
66	51
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		-}
	52	+add_filter( 'plugin_action_links', 'hal_plugin_action_links',10,2);
84	53
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		- ";
95	54
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		-/**
	55	+/***********************************************************************************************************************
123	56	* PLUGIN SHORTCODE ND-DOC
124		- * @param $param
125		- * @return int
126		-*/
127		-function wphal_nb_doc($param)
	57	+ **********************************************************************************************************************/
	58	+function nb_doc($param)
128	59	{
129		- $idhal = wphal_verifSolr(get_option('option_idhal'));
	60	+ $idhal = verifSolr(get_option('option_idhal'));
130	61	extract(shortcode_atts(array(
131	62	'type' => get_option('option_type'),
132	63	'id' => $idhal
133	64	),
		@@ -132,123 +63,126 @@
132	63	'id' => $idhal
133	64	),
134	65	$param
135	66	));
136		- /**
137		- * @var $id : defined by extract
138		- * @var string $type : defined by extract
139		- */
140		- $id = wphal_verifSolr($id);
	67	+ $id = verifSolr($id);
141	68
142		- $url = wphal_api . '?q=:&fq=' . $type . ':(' . urlencode($id) . ')&rows=0&wt=json';
	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	+ );
143	78
144		- $json =wphal_do_get_data($url);
	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	+
145	85	return $json->response->numFound;
146	86	}
147		-/**
	87	+/***********************************************************************************************************************
148	88	* PLUGIN SHORTCODE CV-HAL
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';
	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';
156	93	} else {
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');
	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);
161	104
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		-
188	105	if (get_option('option_groupe') == 'grouper') {
189	106	//cURL sur l'API pour récupérer les données
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';
	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';
191	108	} elseif (get_option('option_groupe') == 'paginer') {
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';
	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';
193	110	}
194	111
195		- $json = wphal_do_get_data($url);
196		- $hal_page = (get_query_var('hal_page')) ? get_query_var('hal_page') : 1;
	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	+ );
197	120
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>';
	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);
202	126
	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) {
203	140	$content .= '<li><a href="#filtres" onclick="return false;" style="font-size:18px; text-decoration: none; cursor:default;">' . __('Filtres', 'wp-hal') . '</a>';
204	141	$content .= '<ul id="wphal-filtres">';
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		- }
	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>';
246	145	}
	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	+ }
247	182	$content .= '</ul></li>';
248		-
249		- $content .= '</ul><br/><hr>';
250	183	}
	184	+ $content .= '</ul><br/><hr>';
251	185
252	186	$content .= '<div id="meta">
253	187	<div class="display" id="wphal-contact" style="display: none;">
254	188	<h3 class="wphal-titre">' . __('Contact', 'wp-hal');
		@@ -256,11 +190,24 @@
256	190
257	191	<ul id="wphal-cont" style="list-style-type: none;">';
258	192
259	193	if ($contact == 'yes' && $type == 'authIdHal_s') {
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);
	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	+ );
262	203
	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	+
263	210	for ($i = 0; $jsonauthor->response->docs[$i] != ''; $i++) {
264	211	$content .= '<div class="wphal-infocontact" id="wphal-infocontact'.$i.'">';
265	212	if ($jsonauthor->response->docs[$i]->fullName_s != '') {
266	213	$content .= '<li class="wphal-fullname"><span>Nom : </span><span>'. $jsonauthor->response->docs[$i]->fullName_s .'</span></li>';
		@@ -265,55 +212,51 @@
265	212	if ($jsonauthor->response->docs[$i]->fullName_s != '') {
266	213	$content .= '<li class="wphal-fullname"><span>Nom : </span><span>'. $jsonauthor->response->docs[$i]->fullName_s .'</span></li>';
267	214	}
268	215	if ($jsonauthor->response->docs[$i]->email_s != '') {
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>';
	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>';
270	217	}
271	218	if ($jsonauthor->response->docs[$i]->idHal_s != '') {
272	219	$content .= '<li class="wphal-idhal"><span>IdHAL : </span><span>' . $jsonauthor->response->docs[$i]->idHal_s . '</span></li>';
273	220	}
274	221	if ($jsonauthor->response->docs[$i]->hasCV_bool == true){
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>';
	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>';
276	223	}
277	224	if ($jsonauthor->response->docs[$i]->arxiv_s != '') {
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>';
	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>';
279	226	}
280	227	if ($jsonauthor->response->docs[$i]->idref_s != '') {
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>';
	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>';
282	229	}
283	230	if ($jsonauthor->response->docs[$i]->orcid_s != '') {
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>';
	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>';
285	232	}
286	233	if ($jsonauthor->response->docs[$i]->viaf_s != '') {
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>';
	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>';
288	235	}
289	236	if ($jsonauthor->response->docs[$i]->isni_s != '') {
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>';
	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>';
291	238	}
292	239	$content .= '</div>';
293	240	}
294	241	}
295	242	if (get_option('option_email') != '') {
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>';
	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>';
297	244	}
298	245	if (get_option('option_tel') != '') {
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>';
	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>';
300	247	}
301	248	if (get_option('option_social0') != '') {
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>';
	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>';
304	250	}
305	251	if (get_option('option_social1') != '') {
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>';
	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>';
308	253	}
309	254	if (get_option('option_social2') != '') {
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>';
	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>';
312	256	}
313	257	if (get_option('option_social3') != '') {
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>';
	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>';
316	259	}
317	260	$content .= '</ul>
318	261	</div>
319	262	<div class="display" id="wphal-disciplines" style="display: none;">
		@@ -318,11 +261,11 @@
318	261	</div>
319	262	<div class="display" id="wphal-disciplines" style="display: none;">
320	263	<h3 class="wphal-titre">' . __('Disciplines', 'wp-hal') . '</h3>';
321	264
322		- if (wphal_locale == 'fr_FR') {
	265	+ if (locale == 'fr_FR') {
323	266	$facetdomain = $json->facet_counts->facet_fields->fr_domainAllCodeLabel_fs;
324		- } elseif (wphal_locale == 'es_ES') {
	267	+ } elseif (locale == 'es_ES') {
325	268	$facetdomain = $json->facet_counts->facet_fields->es_domainAllCodeLabel_fs;
326	269	} else {
327	270	$facetdomain = $json->facet_counts->facet_fields->en_domainAllCodeLabel_fs;
328	271	}
		@@ -327,17 +270,18 @@
327	270	$facetdomain = $json->facet_counts->facet_fields->en_domainAllCodeLabel_fs;
328	271	}
329	272
330	273	if (!is_null($facetdomain) && !empty($facetdomain)) {
	274	+
331	275	$content .= '<div id="listdisci">';
332	276	$content .= '<span id="tridisciplines">';
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>';
	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>';
335	279	$content .= '</span>';
336	280	$content .= '<ul id="wphal-discipline" class="wphal-discipline">';
337	281	foreach ($facetdomain as $res) {
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>';
	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>';
340	284	}
341	285	$content .= '</ul>';
342	286	$content .= '</div>';
343	287
		@@ -343,15 +287,15 @@
343	287
344	288	$content .= '<div id="wphal-graph" style="display:none;">';
345	289	$content .= '<div id="wphal-piedisci"></div>';
346	290	$content .= '</div>';
347		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-disci" onclick="visibilitedisci(\'listdisci\',\'wphal-graph\',\'tridisciplines\'); return false;" >' . __('Graphique', 'wp-hal');
	291	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-disci" onclick="visibilitedisci(\'listdisci\',\'wphal-graph\',\'tridisciplines\'); return false;" >' . __('Graphique', 'wp-hal');
348	292	$content .= '</button>';
349	293	}
350	294	$content .= '</div>
351	295	<div class="display" id="wphal-keywords" style="display: none;">
352	296	<h3 class="wphal-titre">' . __('Mots-clefs', 'wp-hal') . '</h3>';
353		- if (!is_null($json->facet_counts->facet_fields->keyword_s) && !empty($json->facet_counts->facet_fields->keyword_s)) {
	297	+ if (!is_null($json->facet_counts->facet_fields->keyword_s) && !empty($json->facet_counts->facet_fields->keyword_s)) {
354	298	$content .= '<div id="wphal-keys">';
355	299	$r = 0;
356	300	// CSS Nuage de mots
357	301	$maxsize = 25;
		@@ -357,10 +301,8 @@
357	301	$maxsize = 25;
358	302	$minsize = 10;
359	303	$maxval = max(array_values($json->facet_counts->facet_fields->keyword_s[1]));
360	304	$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;}
363	305	$spread = ($maxval - $minval);
364	306	$step = ($maxsize - $minsize) / $spread;
365	307	$tab = array();
366	308	foreach ($json->facet_counts->facet_fields->keyword_s as $res) {
		@@ -372,25 +314,25 @@
372	314	}
373	315	asort($tab); // Tri du tableau par ordre alphabétique
374	316	foreach ($tab as $res) {
375	317	$size = round($minsize + (($res[1] - $minval) * $step));
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> ';
	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> ';
377	319	}
378	320	$content .= '</div>';
379	321	$content .= '<div id="keysuite" style="display:none;">';
380	322	$content .= '<span id="trikeywords">';
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>';
	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>';
383	325	$content .= '</span>';
384	326	$content .= '<ul class="wphal-keyword">';
385	327	$content .= '<div id="wphal-keyw">';
386	328	foreach ($json->facet_counts->facet_fields->keyword_s as $res) {
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>';
	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>';
388	330	}
389	331	$content .= '</div>';
390	332	$content .= '</ul>';
391	333	$content .= '</div>';
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');
	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');
393	335	$content .= '</button>';
394	336	}
395	337	$content .= '</div>
396	338	<div class="display" id="wphal-auteurs" style="display: none;">
		@@ -396,10 +338,10 @@
396	338	<div class="display" id="wphal-auteurs" style="display: none;">
397	339	<h3 class="wphal-titre">' . __('Auteurs', 'wp-hal') . '</h3>';
398	340	if (!is_null($json->facet_counts->facet_fields->authIdLastNameFirstName_fs) && !empty($json->facet_counts->facet_fields->authIdLastNameFirstName_fs)) {
399	341	$content .= '<span id="triauteurs">';
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>';
	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>';
402	344	$content .= '</span>';
403	345	$content .= '<ul class="wphal-auteurs" style="list-style-type: none;">';
404	346	$content .= '<div id="wphal-aut">';
405	347	$r = 0;
		@@ -407,15 +349,10 @@
407	349	$r = $r + 1;
408	350	if ($r > 10) {
409	351	break;
410	352	}
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>';
	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>';
418	355	}
419	356	$i = 1;
420	357	$content .= '<div id="auteursuite" style="display:none;">';
421	358	foreach ($json->facet_counts->facet_fields->authIdLastNameFirstName_fs as $res) {
		@@ -424,15 +361,10 @@
424	361	}
425	362	if ($i < $r) {
426	363	$i = $i + 1;
427	364	} else {
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>';
	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>';
435	367	}
436	368	}
437	369	$content .= '</div>';
438	370	$content .= '</div>';
		@@ -437,9 +369,9 @@
437	369	$content .= '</div>';
438	370	$content .= '</div>';
439	371	$content .= '</ul>';
440	372	if ($r > 10) {
441		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-auteur" onclick="visibilite(\'auteursuite\'); return false;" >' . __('Liste complète', 'wp-hal');
	373	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-auteur" onclick="visibilite(\'auteursuite\'); return false;" >' . __('Liste complète', 'wp-hal');
442	374	$content .= '</button>';
443	375	}
444	376	}
445	377	$content .= '</div>
		@@ -446,10 +378,10 @@
446	378	<div class="display" id="wphal-revues" style="display: none;">
447	379	<h3 class="wphal-titre">' . __('Revues', 'wp-hal') . '</h3>';
448	380	if (!is_null($json->facet_counts->facet_fields->journalIdTitle_fs) && !empty($json->facet_counts->facet_fields->journalIdTitle_fs)) {
449	381	$content .= '<span id="trirevues">';
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>';
	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>';
452	384	$content .= '</span>';
453	385	$content .= '<ul class="wphal-revues">';
454	386	$content .= '<div id="wphal-rev">';
455	387	$r = 0;
		@@ -457,10 +389,10 @@
457	389	$r = $r + 1;
458	390	if ($r > 10) {
459	391	break;
460	392	}
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>';
	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>';
463	395	}
464	396	$i = 1;
465	397	$content .= '<div id="revuesuite" style="display:none;">';
466	398	foreach ($json->facet_counts->facet_fields->journalIdTitle_fs as $res) {
		@@ -469,10 +401,10 @@
469	401	}
470	402	if ($i < $r) {
471	403	$i = $i + 1;
472	404	} else {
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>';
	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>';
475	407	}
476	408	}
477	409	$content .= '</div>';
478	410	$content .= '</div>';
		@@ -477,9 +409,9 @@
477	409	$content .= '</div>';
478	410	$content .= '</div>';
479	411	$content .= '</ul>';
480	412	if ($r > 10) {
481		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-revue" onclick="visibiliterevues(\'revuesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
	413	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-revue" onclick="visibiliterevues(\'revuesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
482	414	$content .= '</button>';
483	415	}
484	416	}
485	417	$content .= '</div>
		@@ -486,10 +418,10 @@
486	418	<div class="display" id="wphal-annees" style="display: none;">
487	419	<h3 class="wphal-titre">' . __('Année de production', 'wp-hal') . '</h3>';
488	420	if (!is_null($json->facet_counts->facet_fields->producedDateY_i) && !empty($json->facet_counts->facet_fields->producedDateY_i)) {
489	421	$content .= '<span id="triannees">';
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>';
	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>';
492	424	$content .= '</span>';
493	425	$content .= '<ul class="wphal-annees">';
494	426	$content .= '<div id="wphal-an">';
495	427
		@@ -499,9 +431,9 @@
499	431	$r = $r + 1;
500	432	if ($r > 10) {
501	433	break;
502	434	}
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>';
	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>';
504	436	}
505	437	$i = 1;
506	438	$content .= '<div id="anneesuite" style="display:none;">';
507	439	foreach ($json->facet_counts->facet_fields->producedDateY_i as $res) {
		@@ -510,9 +442,9 @@
510	442	}
511	443	if ($i < $r) {
512	444	$i = $i + 1;
513	445	} else {
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>';
	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>';
515	447	}
516	448	}
517	449	$content .= '</div>';
518	450	$content .= '</div>';
		@@ -517,9 +449,9 @@
517	449	$content .= '</div>';
518	450	$content .= '</div>';
519	451	$content .= '</ul>';
520	452	if ($r > 10) {
521		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-annee" onclick="visibiliteannee(\'anneesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
	453	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-annee" onclick="visibiliteannee(\'anneesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
522	454	$content .= '</button>';
523	455	}
524	456	}
525	457	$content .= '</div>
		@@ -526,10 +458,10 @@
526	458	<div class="display" id="wphal-insts" style="display: none;">
527	459	<h3 class="wphal-titre">' . __('Institutions', 'wp-hal') . '</h3>';
528	460	if (!is_null($json->facet_counts->facet_fields->instStructIdName_fs) && !empty($json->facet_counts->facet_fields->instStructIdName_fs)) {
529	461	$content .= '<span id="triinsts">';
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>';
	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>';
532	464	$content .= '</span>';
533	465	$content .= '<ul class="wphal-insts">';
534	466	$content .= '<div id="wphal-institu">';
535	467	$r = 0;
		@@ -537,10 +469,10 @@
537	469	$r = $r + 1;
538	470	if ($r > 10) {
539	471	break;
540	472	}
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>';
	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>';
543	475	}
544	476	$i = 1;
545	477	$content .= '<div id="instsuite" style="display:none;">';
546	478	foreach ($json->facet_counts->facet_fields->instStructIdName_fs as $res) {
		@@ -549,10 +481,10 @@
549	481	}
550	482	if ($i < $r) {
551	483	$i = $i + 1;
552	484	} else {
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>';
	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>';
555	487	}
556	488	}
557	489	$content .= '</div>';
558	490	$content .= '</div>';
		@@ -557,9 +489,9 @@
557	489	$content .= '</div>';
558	490	$content .= '</div>';
559	491	$content .= '</ul>';
560	492	if ($r > 10) {
561		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-inst" onclick="visibiliteinst(\'instsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
	493	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-inst" onclick="visibiliteinst(\'instsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
562	494	$content .= '</button>';
563	495	}
564	496	}
565	497	$content .= '</div>
		@@ -566,10 +498,10 @@
566	498	<div class="display" id="wphal-labs" style="display: none;">
567	499	<h3 class="wphal-titre">' . __('Laboratoires', 'wp-hal') . '</h3>';
568	500	if (!is_null($json->facet_counts->facet_fields->labStructIdName_fs) && !empty($json->facet_counts->facet_fields->labStructIdName_fs)) {
569	501	$content .= '<span id="trilabs">';
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>';
	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>';
572	504	$content .= '</span>';
573	505	$content .= '<ul class="wphal-labs">';
574	506	$content .= '<div id="wphal-labo">';
575	507
		@@ -578,10 +510,10 @@
578	510	$r = $r + 1;
579	511	if ($r > 10) {
580	512	break;
581	513	}
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>';
	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>';
584	516	}
585	517	$i = 1;
586	518	$content .= '<div id="labsuite" style="display:none;">';
587	519	foreach ($json->facet_counts->facet_fields->labStructIdName_fs as $res) {
		@@ -590,10 +522,10 @@
590	522	}
591	523	if ($i < $r) {
592	524	$i = $i + 1;
593	525	} else {
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>';
	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>';
596	528	}
597	529	}
598	530	$content .= '</div>';
599	531	$content .= '</div>';
		@@ -598,9 +530,9 @@
598	530	$content .= '</div>';
599	531	$content .= '</div>';
600	532	$content .= '</ul>';
601	533	if ($r > 10) {
602		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-lab" onclick="visibilitelab(\'labsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
	534	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-lab" onclick="visibilitelab(\'labsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
603	535	$content .= '</button>';
604	536	}
605	537	}
606	538	$content .= '</div>
		@@ -607,10 +539,10 @@
607	539	<div class="display" id="wphal-depts" style="display: none;">
608	540	<h3 class="wphal-titre">' . __('Départements', 'wp-hal') . '</h3>';
609	541	if (!is_null($json->facet_counts->facet_fields->deptStructIdName_fs) && !empty($json->facet_counts->facet_fields->deptStructIdName_fs)) {
610	542	$content .= '<span id="tridept">';
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>';
	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>';
613	545	$content .= '</span>';
614	546	$content .= '<ul class="wphal-depts">';
615	547	$content .= '<div id="wphal-dpt">';
616	548	$r = 0;
		@@ -618,10 +550,10 @@
618	550	$r = $r + 1;
619	551	if ($r > 10) {
620	552	break;
621	553	}
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>';
	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>';
624	556	}
625	557	$i = 1;
626	558	$content .= '<div id="deptsuite" style="display:none;">';
627	559	foreach ($json->facet_counts->facet_fields->deptStructIdName_fs as $res) {
		@@ -630,10 +562,10 @@
630	562	}
631	563	if ($i < $r) {
632	564	$i = $i + 1;
633	565	} else {
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>';
	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>';
636	568	}
637	569	}
638	570	$content .= '</div>';
639	571	$content .= '</div>';
		@@ -638,9 +570,9 @@
638	570	$content .= '</div>';
639	571	$content .= '</div>';
640	572	$content .= '</ul>';
641	573	if ($r > 10) {
642		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-dept" onclick="visibilitedept(\'deptsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
	574	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-dept" onclick="visibilitedept(\'deptsuite\'); return false;" >' . __('Liste complète', 'wp-hal');
643	575	$content .= '</button>';
644	576	}
645	577	}
646	578	$content .= '</div>
		@@ -647,23 +579,22 @@
647	579	<div class="display" id="wphal-equipes" style="display: none;">
648	580	<h3 class="wphal-titre">' . __('Équipes de recherche', 'wp-hal') . '</h3>';
649	581	if (!is_null($json->facet_counts->facet_fields->rteamStructIdName_fs) && !empty($json->facet_counts->facet_fields->rteamStructIdName_fs)) {
650	582	$content .= '<span id="triequipe">';
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>';
	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>';
653	585	$content .= '</span>';
654	586	$content .= '<ul class="wphal-equipes">';
655	587	$content .= '<div id="wphal-rteam">';
656	588
657	589	$r = 0;
658		- $name=[];
659	590	foreach ($json->facet_counts->facet_fields->rteamStructIdName_fs as $res) {
660	591	$r = $r + 1;
661	592	if ($r > 10) {
662	593	break;
663	594	}
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>';
	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>';
666	597	}
667	598	$i = 1;
668	599	$content .= '<div id="equipesuite" style="display:none;">';
669	600	foreach ($json->facet_counts->facet_fields->rteamStructIdName_fs as $res) {
		@@ -672,10 +603,9 @@
672	603	}
673	604	if ($i < $r) {
674	605	$i = $i + 1;
675	606	} else {
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>';
	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>';
678	608	}
679	609	}
680	610	$content .= '</div>';
681	611	$content .= '</div>';
		@@ -680,9 +610,9 @@
680	610	$content .= '</div>';
681	611	$content .= '</div>';
682	612	$content .= '</ul>';
683	613	if ($r > 10) {
684		- $content .= '<button type="button" style="text-decoration: none;" id="wphal-equipe" onclick="visibiliteequipe(\'equipesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
	614	+ $content .= '<button type="button" href="" style="text-decoration: none;" id="wphal-equipe" onclick="visibiliteequipe(\'equipesuite\'); return false;" >' . __('Liste complète', 'wp-hal');
685	615	$content .= '</button>';
686	616	}
687	617	}
688	618	$content .= '</div>
		@@ -687,9 +617,9 @@
687	617	}
688	618	$content .= '</div>
689	619	<div class="display" id="publications">';
690	620	if (get_option('option_groupe') == 'grouper') {
691		- $doctype = file_get_contents(plugin_dir_path( __FILE__ ).'json'. DIRECTORY_SEPARATOR .'doctype_fr.json');
	621	+ $doctype = file_get_contents(plugin_dir_path( __FILE__ ).'json'. DIRECTORY_SEPARATOR .'doctype_'.lang.'.json');
692	622	$jsontype = json_decode($doctype);
693	623
694	624	//LISTE DES DOCUMENTS PAR GROUPE
695	625
		@@ -694,13 +624,14 @@
694	624	//LISTE DES DOCUMENTS PAR GROUPE
695	625
696	626	$content .= '<div class="counter-doc"><span class="wphal-nbtot">' . $json->grouped->docType_s->matches . ' </span>';
697	627	$content .= __('documents', 'wp-hal'). '</div><br>';
698		- for ($i = 0; !empty($jsontype->response->result->doc[$i]); $i++) {
699		- for ($d = 0; !empty($json->grouped->docType_s->groups[$d]); $d++) {
	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++) {
700	631	if ($json->grouped->docType_s->groups[$d]->groupValue == $jsontype->response->result->doc[$i]->str[0]){
701	632	$titre = $jsontype->response->result->doc[$i]->str[1];
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>';
	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>';
703	634	$content .= '<div class="grp-content">';
704	635	$content .= '<ul>';
705	636	foreach ($json->grouped->docType_s->groups[$d]->doclist->docs as $result) {
706	637	$content .= '<li>' . $result->citationFull_s . '</li>';
		@@ -705,13 +636,14 @@
705	636	foreach ($json->grouped->docType_s->groups[$d]->doclist->docs as $result) {
706	637	$content .= '<li>' . $result->citationFull_s . '</li>';
707	638	}
708	639	$content .= '</ul></div>';
709		- $content .= '</div><br>';
	640	+ $content .= '</div></li><br>';
710	641	break;
711	642	}
712	643	}
713	644	}
	645	+ $content .= '</ul>';
714	646	} elseif (get_option('option_groupe') == 'paginer') {
715	647
716	648	//LISTE DES DOCUMENTS AVEC PAGINATION
717	649	$content .= '<div class="counter-doc"><span class="wphal-nbtot">' . $json->response->numFound . ' </span>';
		@@ -723,10 +655,10 @@
723	655	$total = $json->response->numFound;
724	656
725	657	$nombreDePages = ceil($total / $messagesParPage);
726	658
727		- if (isset($hal_page)) {
728		- $pageActuelle = intval($hal_page);
	659	+ if (isset($paged)) {
	660	+ $pageActuelle = intval($paged);
729	661
730	662	if ($pageActuelle > $nombreDePages) {
731	663	$pageActuelle = $nombreDePages;
732	664	}
		@@ -734,196 +666,124 @@
734	666	$pageActuelle = 1;
735	667	}
736	668	$premiereEntree = ($pageActuelle - 1) * $messagesParPage;
737	669
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);
	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	+ );
740	679
	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	+
741	686	//--MODULE PAGINATION--//
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>';
	687	+
	688	+ $content .= '<ul>';
	689	+ for ($i = 0; $json->response->docs[$i] != ''; $i++) {
	690	+ $content .= '<li>' . $json->response->docs[$i]->citationFull_s . '</li>';
	691	+ }
	692	+ $content .= '</ul>';
	693	+
	694	+//--AFFICHAGE PAGINATION--//
	695	+ $precedents = $pageActuelle - 2;
	696	+ $suivants = $pageActuelle + 2;
	697	+ $precedent = $pageActuelle - 1;
	698	+ $suivant = $pageActuelle + 1;
	699	+ $penultimate = $nombreDePages - 1;
	700	+
	701	+ $content .= '<ul class="wphal-pagination">';
	702	+//--BOUTON PRECEDENT--//
	703	+ if ($pageActuelle == 1) {
	704	+ $content .= '<li class="disabled"><a href="#">«</a></li>';
749	705	} else {
750		- $content = '<div> no results !</div>';
	706	+ $content .= '<li><a href="?paged=' . $precedent . '">«</a></li>';
751	707	}
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"]);
	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> ';
763	714	}
764		- $pagedHref .= '?';
765		- foreach($parsedQueryString as $name => $value){
766		- $pagedHref .= $name.'='.$value.'&';
	715	+ }
	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) {
	720	+ $content .= '<li class="active"><a href="#">' . $i . '</a></li>';
	721	+ } else {
	722	+ $content .= '<li><a href="?paged=' . $i . '">' . $i . '</a></li>';
	723	+ }
767	724	}
768		- // we add it back..
769		- $pagedHref .= 'hal_page=';
770		- }else {
771		- $pagedHref .= '?hal_page=';
	725	+ $content .= '<li class="disabled"><a href="#">…</a></li>';
	726	+ $content .= '<li><a href="?paged=' . $penultimate . '">' . $penultimate . '</a></li>';
	727	+ $content .= '<li><a href="?paged=' . $nombreDePages . '">' . $nombreDePages . '</a></li>';
772	728	}
773		-
774		- //--AFFICHAGE PAGINATION--//
775		- $precedents = $pageActuelle - 2;
776		- $suivants = $pageActuelle + 2;
777		- $precedent = $pageActuelle - 1;
778		- $suivant = $pageActuelle + 1;
779		- $penultimate = $nombreDePages - 1;
780		-
781		- $content .= '<ul class="wphal-pagination">';
782		- //--BOUTON PRECEDENT--//
783		- if ( $pageActuelle != 1 ) {
784		- $content .= '<li><a href="'. $pagedHref . $precedent . '">«</a></li>';
	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="#">…</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="#">…</a></li>';
	738	+ $content .= '<li><a href="?paged=' . $nombreDePages . '">' . $nombreDePages . '</a></li>';
785	739	}
786		- if ( $nombreDePages <= 6 ) {// Cas 1 : 6 pages ou moins - Pas de troncature
787		- for ( $i = 1; $i <= $nombreDePages; $i ++ ) {
788		- if ( $i == $pageActuelle ) {
	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="#">…</a></li>';
	744	+ for ($i = $penultimate - 2; $i <= $nombreDePages; $i++) {
	745	+ if ($i == $pageActuelle) {
789	746	$content .= '<li class="active"><a href="#">' . $i . '</a></li>';
790	747	} else {
791		- $content .= ' <li><a href="'. $pagedHref . $i . '">' . $i . '</a></li> ';
	748	+ $content .= '<li><a href="?paged=' . $i . '">' . $i . '</a></li>';
792	749	}
793	750	}
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		- }
802		- }
803		- $content .= '<li class="disabled"><a href="#">…</a></li>';
804		- $content .= '<li><a href="'. $pagedHref . $penultimate . '">' . $penultimate . '</a></li>';
805		- $content .= '<li><a href="'. $pagedHref . $nombreDePages . '">' . $nombreDePages . '</a></li>';
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="#">…</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="#">…</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="#">…</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		- }
830	751	}
831		- //--BOUTON SUIVANT--//
832		- if ( $pageActuelle < $nombreDePages ) {
833		- $content .= '<li><a href="'. $pagedHref . $suivant . '">»</a></li>';
834		- }
835		- $content .= '</ul>';
836		- //--AFFICHAGE PAGINATION--//
837	752	}
	753	+//--BOUTON SUIVANT--//
	754	+ if ($pageActuelle < $nombreDePages) {
	755	+ $content .= '<li><a href="?paged=' . $suivant . '">»</a></li>';
	756	+ } else {
	757	+ $content .= '<li class="disabled"><a href="#">»</a></li>';
	758	+ }
	759	+ $content .= '</ul>';
	760	+//--AFFICHAGE PAGINATION--//
838	761	}
839	762	$content .= '</div>
840	763	</div>
841	764	</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>';
844	765	}
845	766	$content .= '<div class="wphal-footer">';
846		- $content .= '<p style="color:#B3B2B0">' . __("Documents récupérés de l'archive ouverte HAL", 'wp-hal') . ' <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>';
	767	+ $content .= '<p style="color:#B3B2B0">' . __("Documents récupérés de l'archive ouverte HAL", 'wp-hal') . ' <a href="' . site . '" target="_blank"><img alt="logo" src=" ' . plugin_dir_url(__FILE__) . 'img/logo-hal.svg" style="width:32px;"></a></p>';
847	768	$content .= '</div>';
848	769
849	770	//--AFFICHAGE GRAPHIQUE DOMAINE--//
850	771	if (!is_null($facetdomain)) {
851	772	foreach ($facetdomain as $res) {
852		- $name = explode(wphal_delimiter, $res[0])[1];
	773	+ $name = explode(delimiter, $res[0])[1];
853	774	$value = $res[1];
854	775	$array[] = array($name, $value);
855	776	}
856		- wp_localize_script('wp-hal-script4', 'WPWallSettings', $array);
857	777	}
	778	+ wp_localize_script('wp-hal-script4', 'WPWallSettings', json_encode($array));
858	779	$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'));
859	780	wp_localize_script('wp-hal-script4', 'translate', $translation);
860	781	}
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);
	782	+ return $content;
923	783	}
924	784
925		-function wphal_verifSolr($values){
	785	+function verifSolr($values){
926	786	$verifsolr = explode(',',$values);
927	787	$numverif = count($verifsolr);
928	788	$solrsql = '';
929	789	if ($numverif<1024){
		@@ -942,16 +802,17 @@
942	802
943	803	return $solrsql;
944	804	}
945	805
946		-function wphal_adding_style() {
	806	+function wp_adding_style() {
947	807	wp_register_style('wp-hal-style1', plugins_url('/css/style.css', __FILE__));
948	808	wp_register_style('wp-hal-style2', plugins_url('/css/jquery.jqplot.css', __FILE__));
949	809
950	810	wp_enqueue_style('wp-hal-style1');
	811	+ wp_enqueue_style('wp-hal-style2');
951	812	}
952	813
953		-function wphal_adding_script() {
	814	+function wp_adding_script() {
954	815	wp_register_script('wp-hal-script1',plugins_url('/js/jquery.jqplot.js', __FILE__));
955	816	wp_register_script('wp-hal-script2',plugins_url('/js/jqplot.highlighter.js', __FILE__));
956	817	wp_register_script('wp-hal-script3',plugins_url('/js/jqplot.pieRenderer.js', __FILE__));
957	818	wp_register_script('wp-hal-script4',plugins_url('/js/cv-hal.js', __FILE__));
		@@ -957,8 +818,11 @@
957	818	wp_register_script('wp-hal-script4',plugins_url('/js/cv-hal.js', __FILE__));
958	819
959	820
960	821	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');
961	825	wp_enqueue_script('wp-hal-script4', false, array(), false, true);
962	826	}
963	827
964	828	/**
		@@ -963,17 +827,17 @@
963	827
964	828	/**
965	829	* Récupère les fichiers css et js
966	830	*/
967		-if ( wphal_is_curl_installed() ) {
968		- add_action('wp_enqueue_scripts', 'wphal_adding_style');
969		- add_action('wp_enqueue_scripts', 'wphal_adding_script');
	831	+if ( function_exists('curl_init' ) ) {
	832	+ add_action('wp_enqueue_scripts', 'wp_adding_style');
	833	+ add_action('wp_enqueue_scripts', 'wp_adding_script');
970	834	}
971	835
972	836	/**
973	837	* Charge lorsque le plugin est désactivé
974	838	*/
975		-register_deactivation_hook( __FILE__, 'wphal_reset_option' );
	839	+register_deactivation_hook( __FILE__, 'reset_option' );
976	840
977	841	/**
978	842	* Ajoute le widget wphal à l'initialisation des widgets
979	843	*/
		@@ -989,9 +853,9 @@
989	853	*/
990	854	function wphal_menu() {
991	855	add_menu_page( 'Options', 'Hal', 'manage_options', 'wp-hal.php', 'wphal_option' , '', 21);
992	856
993		- add_action( 'admin_init', 'wphal_register_settings' );
	857	+ add_action( 'admin_init', 'register_settings' );
994	858	}
995	859
996	860
997	861	/**
		@@ -1009,12 +873,14 @@
1009	873	* Classe du widget wphal
1010	874	*/
1011	875
1012	876	class wphal_widget extends WP_widget{
	877	+
	878	+
1013	879	/**
1014	880	* Défini les propriétés du widget
1015	881	*/
1016		- function __construct(){
	882	+ function wphal_widget(){
1017	883	$options = array(
1018	884	"classname" => "wphal-publications",
1019	885	"description" => __("Afficher les dernières publications d'un auteur ou d'une structure.", 'wp-hal')
1020	886	);
		@@ -1020,9 +886,9 @@
1020	886	);
1021	887
1022	888	parent::__construct(
1023	889	'hal-publications',
1024		- __("Publications HAL", 'wp-hal'),
	890	+ __("Publications récentes", 'wp-hal'),
1025	891	$options
1026	892	);
1027	893	}
1028	894
		@@ -1031,71 +897,51 @@
1031	897	* @param $args
1032	898	* @param $instance
1033	899	*/
1034	900	function widget($args, $instance){
1035		- if(isset($instance['idhal']) && !empty($instance['idhal'])) {
1036		- $content = '';
	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';
1037	903	extract($args);
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';
	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']);
1046	910
1047		- } else {
1048		- $instance['idhal'] = wphal_verifSolr($instance['idhal']);
	911	+ $url = api . '?q=:&fq=' . $instance['select'] . ':' . urlencode($instance['idhal']) . '&fl=uri_s,'. $instance['typetext'] .'&sort=' . producedDateY . '&rows=' . $instance['nbdoc'] . '&wt=json';
1049	912
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);
	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	+ );
1052	921
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>';
	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;
1065	932	} else {
1066		- $content = '<div> no results !</div>';
	933	+ $typetext = $json->response->docs[$i]->title_s[0];
1067	934	}
	935	+ $content .= '<li class="widhal-li"><a href="' . $json->response->docs[$i]->uri_s . '" target="_blank">' . $typetext . '</a></li>';
1068	936	}
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);
	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;
1098	944	}
1099	945	}
1100	946
1101	947	/**
		@@ -1103,15 +949,9 @@
1103	949	* @param $new
1104	950	* @param $old
1105	951	*/
1106	952	function update($new, $old){
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;
	953	+ return $new;
1114	954	}
1115	955
1116	956	/**
1117	957	* Formulaire du widget
		@@ -1119,45 +959,43 @@
1119	959	*/
1120	960	function form($instance){
1121	961
1122	962	$defaut = array(
1123		- 'titre' => __("Publications Hal", 'wp-hal'),
	963	+ 'titre' => __("Publications récentes", 'wp-hal'),
1124	964	'select' => "authIdHal_s",
1125	965	'typetext' => "title_s",
1126		- 'idhal' => "",
1127	966	'nbdoc' => 5
1128	967	);
1129	968	$instance = wp_parse_args($instance,$defaut);
1130	969	?>
1131	970	<p>
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"/>
	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"/>
1134	973	</p>
1135	974	<p>
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">
	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">
1138	977	</p>
1139	978	<p>
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>
	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>
1144	983	</select>
1145	984	</p>
1146	985	<p>
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>
	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>
1155	993	</select>
1156	994	</p>
1157	995	<p>
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"/>
	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"/>
1160	998	</p>
1161	999	<?php
1162	1000	}
1163	1001	}
		@@ -1162,79 +1000,21 @@
1162	1000	}
1163	1001	}
1164	1002
1165	1003
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() {
	1004	+function register_settings() {
1191	1005	register_setting( 'wphal_option', 'option_choix' );
1192	1006	register_setting( 'wphal_option', 'option_type' );
1193	1007	register_setting( 'wphal_option', 'option_groupe' );
1194		- register_setting( 'wphal_option', 'option_idhal' , array(
1195		- 'type' => 'string',
1196		- 'sanitize_callback' => 'wphal_sanitize_username',
1197		- 'default' => NULL,
1198		- ));
	1008	+ register_setting( 'wphal_option', 'option_idhal' );
1199	1009	register_setting( 'wphal_option', 'option_lang' );
1200	1010	register_setting( 'wphal_option', 'option_infocontact' );
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' );
	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' );
1237	1017	}
1238	1018
1239	1019	/**
1240	1020	* Crée le menu d'option du plugin
		@@ -1248,9 +1028,9 @@
1248	1028	update_option('option_groupe', 'paginer');
1249	1029	}
1250	1030	?>
1251	1031	<div class="wrap">
1252		- <h2><?php echo esc_html(__('Plugin HAL','wp-hal'));?></h2>
	1032	+ <h2><?php echo __('Plugin HAL','wp-hal');?></h2>
1253	1033	<form method="post" enctype="multipart/form-data" action="options.php">
1254	1034	<div id="poststuff">
1255	1035	<div id="post-body" class="metabox-holder columns-2">
1256	1036	<div id="post-body-content">
		@@ -1256,86 +1036,75 @@
1256	1036	<div id="post-body-content">
1257	1037	<?php settings_fields( 'wphal_option' ); ?>
1258	1038	<?php do_settings_sections( 'wphal_option' ); ?>
1259	1039	<table class="form-table">
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>
	1040	+ <tr valign="top">
	1041	+ <th scope="row" style="font-size: 18px;"><?php echo __('Paramètre de la page :','wp-hal');?></th>
1262	1042	</tr>
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>
	1043	+ <tr valign="top">
	1044	+ <th scope="row"><?php echo __('Type d\'Id','wp-hal');?></th>
1265	1045	<td><select name="option_type">
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>
	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>
1272	1051	</select>
1273		- <input type="text" name="option_idhal" id="option_idhal" value="<?php echo esc_js(get_option('option_idhal')); ?>"/>
	1052	+ <input type="text" name="option_idhal" id="option_idhal" value="<?php echo get_option('option_idhal'); ?>"/>
1274	1053	</td>
1275	1054	</tr>
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>
	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>
1280	1059	</td>
1281	1060	</tr>
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>
	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>
1295	1073	</td>
1296	1074	</tr>
1297		- <tr style="vertical-align:top;">
1298		- <th scope="row" style="font-size: 18px;"><?php echo esc_html(__('Contact :','wp-hal'));?></th>
	1075	+ <tr valign="top">
	1076	+ <th scope="row" style="font-size: 18px;"><?php echo __('Contact :','wp-hal');?></th>
1299	1077	</tr>
1300	1078	<tr>
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>
	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>
1304	1082	</td>
1305		- </tr>
1306	1083	<tr>
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>
	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>
1309	1086	</tr>
1310	1087	<tr>
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>
	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>
1313	1090	</tr>
1314	1091	<tr>
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>
	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>
1317	1094	</tr>
1318	1095	<tr>
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>
	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>
1321	1098	</tr>
1322	1099	<tr>
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>
	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>
1325	1102	</tr>
1326	1103	<tr>
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>
	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>
1329	1106	</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>
1338	1107	</table>
1339	1108	<?php
1340	1109	submit_button(__('Enregistrer','wp-hal'), 'primary large', 'submit', true); ?>
1341	1110	</div>
		@@ -1355,9 +1124,9 @@
1355	1124
1356	1125	/**
1357	1126	* Reset les données Hal
1358	1127	*/
1359		-function wphal_reset_option() {
	1128	+function reset_option() {
1360	1129	delete_option('option_choix');
1361	1130	delete_option('option_type');
1362	1131	delete_option('option_groupe');
1363	1132	delete_option('option_idhal');
		@@ -1368,9 +1137,6 @@
1368	1137	delete_option('option_social0');
1369	1138	delete_option('option_social1');
1370	1139	delete_option('option_social2');
1371	1140	delete_option('option_social3');
1372		- delete_option('option_cache_timeout');
1373		- delete_option('option_erase_cache');
1374	1141	}
1375		-
1376		-?>
	1142	+?>