wp-hal.php: 2.0 vs trunk · HAL

← All changes | wp-hal.php +463 -879 trunk → 2.0 View file →

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