diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php index e2c529fd998e9e4d9bff17a3a4e2dfbad65b0a27..6c165fdb4d5de3a545c3b425513f9d05f090f016 100644 --- a/ecrire/exec/statistiques_visites.php +++ b/ecrire/exec/statistiques_visites.php @@ -264,7 +264,7 @@ else { } -if (!autoriser('voirstats', $id ? 'article':'', $id)) { +if (!autoriser('voirstats', $id_article ? 'article':'', $id_article)) { echo _T('avis_non_acces_page'); echo fin_gauche(), fin_page(); exit; diff --git a/ecrire/inc/actions.php b/ecrire/inc/actions.php index 7bf1661e00136893724013aaf8db87775043be6c..61cb7b54e8c7b01fb0d5c77f29a7d40fd0c7146e 100644 --- a/ecrire/inc/actions.php +++ b/ecrire/inc/actions.php @@ -88,7 +88,7 @@ function ajax_action_auteur($action, $id, $script, $args='', $corps=false, $args false); if ($args AND !$args_ajax) $args_ajax = "&$args"; - if ($GLOBALS['var_profile']) + if (isset($GLOBALS['var_profile'])) $args_ajax .= '&var_profile=1'; $ajax = redirige_action_auteur($action, diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php index 7def7f2152c44c76b52905fc530aa5d967b0423c..f1dcc76ea91c93a4d718eaf34d4e6c39b606007f 100644 --- a/ecrire/inc/filtres.php +++ b/ecrire/inc/filtres.php @@ -638,7 +638,8 @@ function recup_date($numdate){ elseif (preg_match('#([0-9]{4})-([0-9]{2})#', $numdate, $regs)){ $annee = $regs[1]; $mois = $regs[2]; - } + $jour =''; + } else $annee = $mois = $jour =''; if ($annee > 4000) $annee -= 9000; if (substr($jour, 0, 1) == '0') $jour = substr($jour, 1); diff --git a/ecrire/inc/layer.php b/ecrire/inc/layer.php index 2d8920557b0f148e2678ca990c4dd3d172980bc5..093b47286fb5cbc184cc89cee52f9d1c517e5f40 100644 --- a/ecrire/inc/layer.php +++ b/ecrire/inc/layer.php @@ -164,9 +164,9 @@ function flag_svg() { spip_setcookie('spip_svg', 'non', time() + 365 * 24 * 3600); return false; } - if ($_COOKIE['spip_svg'] == 'oui') + if (@$_COOKIE['spip_svg'] == 'oui') return true; - if ($_COOKIE['spip_svg'] == 'non') + if (@$_COOKIE['spip_svg'] == 'non') return false; // Sinon, proceder a l'autodetection diff --git a/ecrire/inc/statistiques.php b/ecrire/inc/statistiques.php index 0a9620338dd8e2d26bf6ede90f7c3c361d47f5b3..fe3d3d4d9854c900b6ac0d6968bef9cdf6ecc1ad 100644 --- a/ecrire/inc/statistiques.php +++ b/ecrire/inc/statistiques.php @@ -47,10 +47,11 @@ function stats_show_keywords($kw_referer, $kw_referer_host) { $url_site = preg_replace(",^((https?|ftp)://)?(www\.)?,", "", strtolower($url_site)); } - $url = @parse_url( $kw_referer ); - $query = $url['query']; - $host = strtolower($url['host']); - $path = $url['path']; + if ($url = @parse_url( $kw_referer )) { + $query = $url['query']; + $host = strtolower($url['host']); + $path = $url['path']; + } else $query = $host = $path =''; // Cette fonction affecte directement les variables selon la query-string ! parse_str($query); @@ -191,18 +192,20 @@ function aff_referers ($result, $limit, $plus) { if ($dom == "(email)") { $aff .= $ret . "<b>".$dom."</b>"; } - else if ((count($lesreferers[$numero]) > 1) || ((substr(supprimer_tags($lesreferers[$numero][0]),0,1) != '/') && (count($lesreferers[$numero]) > 0))) { - $rac = $lesliensracine[$numero]; + else { + $n = isset($lesreferers[$numero]) ? count($lesreferers[$numero]) : 0; + if (($n > 1) || ($n > 0 && substr(supprimer_tags($lesreferers[$numero][0]),0,1) != '/')) { + $rac = isset($lesliensracine[$numero]); $aff .= $ret . "<a href='http://".quote_amp($lesurls[$numero])."' style='font-weight: bold;'>".$dom."</a>" - . (!$rac ? '':" <span class='spip_x-small'>($rac)</span>") + . (!$rac ? '': (" <span class='spip_x-small'>(" . $lesliensracine[$numero] .")</span>")) . "\n<ul style='font-size:x-small;'><li>" . join ("</li><li>",$lesreferers[$numero]) . "</li></ul>\n" . "</li></ul>\n<ul style='font-size:small;'>\n"; } else { $aff .= $ret; - $lien = $lesreferers[$numero][0]; + $lien = $n ? $lesreferers[$numero][0] : ''; if (preg_match(",^(<a [^>]+>)([^ ]*)( \([0-9]+\))?,i", $lien, $regs)) { $lien = quote_amp($regs[1]).$dom.$regs[2]; if (!strpos($lien, '</a>')) $lien .= '</a>'; @@ -210,6 +213,7 @@ function aff_referers ($result, $limit, $plus) { $lien = "<a href='http://".$dom."'>".$dom."</a>"; $aff .= "<b>".quote_amp($lien)."</b>"; $aff .= "</li>\n"; + } } }