diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php index bc453a44718a4785ab30dbdd48d5a16e2c60f4ca..6ab249db36ecacbf7e8ab4b40bd214cb0968bccf 100644 --- a/ecrire/exec/accueil.php +++ b/ecrire/exec/accueil.php @@ -59,18 +59,17 @@ function encours_accueil() // Les forums en attente de moderation - $cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_forum WHERE statut='prop'")); - if ($cpt = $cpt['n']) { - $lien = "\n<br /><small>$cpt"; + $cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_forum WHERE statut='prop'"), SPIP_NUM); + if ($cpt = $cpt[0]) { if ($cpt>1) - $lien .= " "._T('info_liens_syndiques_3')." "._T('info_liens_syndiques_4'); + $lien = _T('info_liens_syndiques_3')." "._T('info_liens_syndiques_4'); else - $lien .= " "._T('info_liens_syndiques_5')." "._T('info_liens_syndiques_6'); - $lien .= " "._T('info_liens_syndiques_7'). "</small>"; + $lien = _T('info_liens_syndiques_5')." "._T('info_liens_syndiques_6'); + $lien = "<small>$cpt $lien " ._T('info_liens_syndiques_7'). "</small>"; if ($connect_toutes_rubriques) $lien = "<a href='" . generer_url_ecrire("controle_forum","type=prop") . "' style='color: black;'>". $lien . ".</a>"; + $res .= "\n<br />" . $lien; } - $res .= $lien; } if (!$res) return ''; diff --git a/ecrire/inc/afficher_objets.php b/ecrire/inc/afficher_objets.php index ba67489d87586ce86b443bd6db41771ed8fc8416..55abf781c5ae52565579dfc0f23ea5578a501161 100644 --- a/ecrire/inc/afficher_objets.php +++ b/ecrire/inc/afficher_objets.php @@ -229,14 +229,13 @@ function inc_afficher_objets_dist($type, $titre_table,$requete,$formater='', $fo $tmp_var = 't_' . substr(md5(join('', $requete)), 0, 4); - if ($affrub) $largeurs = array('7', '', '', '', '188', '38'); - else $largeurs = array('7','', '', '', '100', '38'); + $largeurs = array('7','', '', '', '100', '38'); $styles = array('arial11', 'arial11', 'arial1', 'arial1', 'arial1 centered', 'arial1'); - $arg = array( $afficher_langue, $affrub, $langue_defaut); + $arg = array( $afficher_langue, false, $langue_defaut); if (!function_exists($fonction_ligne = "afficher_{$type}s_boucle")){ $fonction_ligne = "afficher_objet_boucle"; - $arg = array($type,id_table_objet($type),$afficher_langue, $affrub, $langue_defaut); + $arg = array($type,id_table_objet($type),$afficher_langue, false, $langue_defaut); } return affiche_tranche_bandeau($requete, icone_table($type), NULL, NULL, $tmp_var, $titre_table, $force, $largeurs, $styles, $fonction_ligne, $arg); } diff --git a/ecrire/inc/commencer_page.php b/ecrire/inc/commencer_page.php index bff9e163d85518ec3612189679c9fdfbc5823b78..03ca574fd0f19304dccd2e7305900d0ad52eb735 100644 --- a/ecrire/inc/commencer_page.php +++ b/ecrire/inc/commencer_page.php @@ -201,15 +201,15 @@ function avertissement_messagerie() { // http://doc.spip.org/@alertes_auteur function alertes_auteur() { - global $connect_statut; - if ($connect_statut == '0minirezo' + + if (autoriser('detruire') AND ( - $GLOBALS['meta']['message_crash_tables'] + @$GLOBALS['meta']['message_crash_tables'] OR false // autres alertes administrateur )) { $alertes = array(); - if ($GLOBALS['meta']['message_crash_tables']) { + if (@$GLOBALS['meta']['message_crash_tables']) { include_spip('inc/maintenance'); if ($msg = message_crash_tables()) $alertes[] = $msg; diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index c0e5de3d29df0b5eb419075c3e5440b7f0d8ee1e..c71409abd45a102c51ca17962170fabdcb6b1b11 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -400,7 +400,7 @@ function navigation_pagination($num_rows, $nb_aff=10, $href=null, $onclick=false . $tmp_var . '\');"'; } - $texte .= "<a href=\"$script#a$ancre\"$on>$deb</a>"; + $texte .= "<a href=\"$script\"$on>$deb</a>"; } } } @@ -1215,7 +1215,7 @@ function fin_page() global $spip_display; // avec &var_profile=1 on a le tableau de mesures SQL - if (count($GLOBALS['tableau_des_temps'])) { + if (@count($GLOBALS['tableau_des_temps'])) { include_spip('public/debug'); $chrono = chrono_requete($GLOBALS['tableau_des_temps']); } else $chrono = ''; diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 131458d974839a0f7fcfa0ca1691465845f4c615..84852436265c2a2e60d45b3a7e3fbbf5d263c2da 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -702,8 +702,9 @@ function find_in_path ($filename) { $sous = $dir.$p['dirname']; if (!isset($ram[$sous])) $ram[$sous] = memoriser_fichiers($sous); - if ($ram[$sous][$p['basename']] - AND is_readable($f = $sous.'/'.$p['basename'])) + $f = $p['basename']; + if (isset($ram[$sous][$f]) + AND is_readable($f = $sous.'/'.$f)) return $f; } } @@ -839,7 +840,7 @@ function generer_url_ecrire($script='', $args="", $no_entities=false, $rel=false $rel = _DIR_RESTREINT ? _DIR_RESTREINT : ('./' . _SPIP_ECRIRE_SCRIPT); - list($script, $ancre) = split('#', $script); + @list($script, $ancre) = split('#', $script); if ($script AND $script<>'accueil') $args = "?exec=$script" . (!$args ? '' : "&$args"); elseif ($args)