|
|
|
|
@ -11,39 +11,40 @@
|
|
|
|
|
include_spip('lib/array_column/array_column'); |
|
|
|
|
|
|
|
|
|
if (_request('var_mode')=='preview' |
|
|
|
|
AND $cle = _request('var_relecture')){ |
|
|
|
|
include_spip("spip_bonux_fonctions"); |
|
|
|
|
if (previsu_verifier_cle_temporaire($cle)){ |
|
|
|
|
include_spip("inc/autoriser"); |
|
|
|
|
autoriser_exception('previsualiser','',0); |
|
|
|
|
define('_VAR_PREVIEW_EXCEPTION',true); |
|
|
|
|
and $cle = _request('var_relecture')) { |
|
|
|
|
include_spip('spip_bonux_fonctions'); |
|
|
|
|
if (previsu_verifier_cle_temporaire($cle)) { |
|
|
|
|
include_spip('inc/autoriser'); |
|
|
|
|
autoriser_exception('previsualiser', '', 0); |
|
|
|
|
define('_VAR_PREVIEW_EXCEPTION', true); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function spip_bonux_affichage_final($flux){ |
|
|
|
|
if (defined('_VAR_PREVIEW') AND _VAR_PREVIEW){ |
|
|
|
|
$p = stripos($flux,"</body>"); |
|
|
|
|
$url_relecture = parametre_url(self(),'var_mode','preview','&'); |
|
|
|
|
$js = ""; |
|
|
|
|
if (!defined('_VAR_PREVIEW_EXCEPTION')){ |
|
|
|
|
$url_relecture = parametre_url($url_relecture,'var_relecture',previsu_cle_temporaire(),'&'); |
|
|
|
|
$label = "Relecture temporaire"; |
|
|
|
|
} |
|
|
|
|
else { |
|
|
|
|
function spip_bonux_affichage_final($flux) { |
|
|
|
|
if (defined('_VAR_PREVIEW') and _VAR_PREVIEW) { |
|
|
|
|
$p = stripos($flux, '</body>'); |
|
|
|
|
$url_relecture = parametre_url(self(), 'var_mode', 'preview', '&'); |
|
|
|
|
$js = ''; |
|
|
|
|
if (!defined('_VAR_PREVIEW_EXCEPTION')) { |
|
|
|
|
$url_relecture = parametre_url($url_relecture, 'var_relecture', previsu_cle_temporaire(), '&'); |
|
|
|
|
$label = 'Relecture temporaire'; |
|
|
|
|
} else { |
|
|
|
|
$label = _T('previsualisation'); |
|
|
|
|
$js = "jQuery('.spip-previsu').html('Relecture temporaire');"; |
|
|
|
|
} |
|
|
|
|
$js .= "jQuery('#spip-admin').append('<a class=\"spip-admin-boutons review_link\" href=\"$url_relecture\">$label</a>');"; |
|
|
|
|
$js = "jQuery(function(){ $js });"; |
|
|
|
|
$js = "<script>$js</script>"; |
|
|
|
|
$flux = substr_replace($flux,$js,$p,0); |
|
|
|
|
$flux = substr_replace($flux, $js, $p, 0); |
|
|
|
|
} |
|
|
|
|
return $flux; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!defined('_ECRIRE_INC_VERSION')) return; |
|
|
|
|
if (!defined('_ECRIRE_INC_VERSION')) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
/** |
|
|
|
|
* une fonction qui regarde si $texte est une chaine de langue |
|
|
|
|
* de la forme <:qqch:> |
|
|
|
|
* si oui applique _T() |
|
|
|
|
@ -54,37 +55,34 @@ if (!defined('_ECRIRE_INC_VERSION')) return;
|
|
|
|
|
* @return unknown_type Retourne la valeur éventuellement modifiée. |
|
|
|
|
*/ |
|
|
|
|
if (!function_exists('_T_ou_typo')) { |
|
|
|
|
function _T_ou_typo($valeur, $mode_typo='toujours') { |
|
|
|
|
function _T_ou_typo($valeur, $mode_typo = 'toujours') { |
|
|
|
|
|
|
|
|
|
// Si la valeur est bien une chaine (et pas non plus un entier déguisé) |
|
|
|
|
if (is_string($valeur) and !intval($valeur)){ |
|
|
|
|
if (is_string($valeur) and !intval($valeur)) { |
|
|
|
|
// Si la chaine est du type <:truc:> on passe à _T() |
|
|
|
|
if (preg_match('/^\<:(.*?):\>$/', $valeur, $match)) |
|
|
|
|
if (preg_match('/^\<:(.*?):\>$/', $valeur, $match)) { |
|
|
|
|
$valeur = _T($match[1]); |
|
|
|
|
// Sinon on la passe a typo() |
|
|
|
|
else { |
|
|
|
|
if (!in_array($mode_typo, array('toujours', 'multi', 'jamais'))) |
|
|
|
|
} else { |
|
|
|
|
// Sinon on la passe a typo() |
|
|
|
|
if (!in_array($mode_typo, array('toujours', 'multi', 'jamais'))) { |
|
|
|
|
$mode_typo = 'toujours'; |
|
|
|
|
|
|
|
|
|
if ($mode_typo == 'toujours' or ($mode_typo == 'multi' and strpos($valeur, '<multi>') !== false)){ |
|
|
|
|
} |
|
|
|
|
if ($mode_typo == 'toujours' or ($mode_typo == 'multi' and strpos($valeur, '<multi>') !== false)) { |
|
|
|
|
include_spip('inc/texte'); |
|
|
|
|
$valeur = typo($valeur); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// Si c'est un tableau, on reapplique la fonction récursivement |
|
|
|
|
elseif (is_array($valeur)){ |
|
|
|
|
foreach ($valeur as $cle => $valeur2){ |
|
|
|
|
} elseif (is_array($valeur)) { |
|
|
|
|
// Si c'est un tableau, on reapplique la fonction récursivement |
|
|
|
|
foreach ($valeur as $cle => $valeur2) { |
|
|
|
|
$valeur[$cle] = _T_ou_typo($valeur2, $mode_typo); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $valeur; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* |
|
|
|
|
/** |
|
|
|
|
* Insère toutes les valeurs du tableau $arr2 après (ou avant) $cle dans le tableau $arr1. |
|
|
|
|
* Si $cle n'est pas trouvé, les valeurs de $arr2 seront ajoutés à la fin de $arr1. |
|
|
|
|
* |
|
|
|
|
@ -99,13 +97,12 @@ function _T_ou_typo($valeur, $mode_typo='toujours') {
|
|
|
|
|
* @return array Retourne le tableau avec l'insertion |
|
|
|
|
*/ |
|
|
|
|
if (!function_exists('spip_array_insert')) { |
|
|
|
|
function spip_array_insert($arr1, $cle, $arr2, $avant=false){ |
|
|
|
|
function spip_array_insert($arr1, $cle, $arr2, $avant = false) { |
|
|
|
|
$index = array_search($cle, array_keys($arr1)); |
|
|
|
|
if($index === false){ |
|
|
|
|
if ($index === false) { |
|
|
|
|
$index = count($arr1); // insert @ end of array if $key not found |
|
|
|
|
} |
|
|
|
|
else { |
|
|
|
|
if(!$avant){ |
|
|
|
|
} else { |
|
|
|
|
if (!$avant) { |
|
|
|
|
$index++; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -118,16 +115,18 @@ function spip_array_insert($arr1, $cle, $arr2, $avant=false){
|
|
|
|
|
* Une fonction extrêmement pratique, mais qui n'est disponible qu'à partir de PHP 5.3 ! |
|
|
|
|
* cf. http://www.php.net/manual/fr/function.array-replace-recursive.php |
|
|
|
|
*/ |
|
|
|
|
if (!function_exists('array_replace_recursive')){ |
|
|
|
|
function array_replace_recursive($array, $array1){ |
|
|
|
|
function recurse($array, $array1){ |
|
|
|
|
foreach ($array1 as $key => $value){ |
|
|
|
|
if (!function_exists('array_replace_recursive')) { |
|
|
|
|
function array_replace_recursive($array, $array1) { |
|
|
|
|
function recurse($array, $array1) { |
|
|
|
|
foreach ($array1 as $key => $value) { |
|
|
|
|
// create new key in $array, if it is empty or not an array |
|
|
|
|
if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) |
|
|
|
|
if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) { |
|
|
|
|
$array[$key] = array(); |
|
|
|
|
} |
|
|
|
|
// overwrite the value in the base array |
|
|
|
|
if (is_array($value)) |
|
|
|
|
if (is_array($value)) { |
|
|
|
|
$value = recurse($array[$key], $value); |
|
|
|
|
} |
|
|
|
|
$array[$key] = $value; |
|
|
|
|
} |
|
|
|
|
return $array; |
|
|
|
|
@ -136,13 +135,15 @@ if (!function_exists('array_replace_recursive')){
|
|
|
|
|
// handle the arguments, merge one by one |
|
|
|
|
$args = func_get_args(); |
|
|
|
|
$array = $args[0]; |
|
|
|
|
if (!is_array($array)) |
|
|
|
|
if (!is_array($array)) { |
|
|
|
|
return $array; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for ($i = 1; $i < count($args); $i++) |
|
|
|
|
if (is_array($args[$i])) |
|
|
|
|
for ($i = 1; $i < count($args); $i++) { |
|
|
|
|
if (is_array($args[$i])) { |
|
|
|
|
$array = recurse($array, $args[$i]); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return $array; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -168,91 +169,90 @@ if (!function_exists('text_truncate')) {
|
|
|
|
|
* @link http://book.cakephp.org/view/1469/Text#truncate-1625 |
|
|
|
|
*/ |
|
|
|
|
function text_truncate($text, $length = 100, $options = array()) { |
|
|
|
|
$default = array( |
|
|
|
|
'ending' => '...', 'exact' => true, 'html' => false |
|
|
|
|
); |
|
|
|
|
$options = array_merge($default, $options); |
|
|
|
|
extract($options); |
|
|
|
|
|
|
|
|
|
if ($html) { |
|
|
|
|
if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) { |
|
|
|
|
return $text; |
|
|
|
|
} |
|
|
|
|
$totalLength = mb_strlen(strip_tags($ending)); |
|
|
|
|
$openTags = array(); |
|
|
|
|
$truncate = ''; |
|
|
|
|
$default = array( |
|
|
|
|
'ending' => '...', 'exact' => true, 'html' => false |
|
|
|
|
); |
|
|
|
|
$options = array_merge($default, $options); |
|
|
|
|
extract($options); |
|
|
|
|
|
|
|
|
|
preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); |
|
|
|
|
foreach ($tags as $tag) { |
|
|
|
|
if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) { |
|
|
|
|
if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) { |
|
|
|
|
array_unshift($openTags, $tag[2]); |
|
|
|
|
} else if (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) { |
|
|
|
|
$pos = array_search($closeTag[1], $openTags); |
|
|
|
|
if ($pos !== false) { |
|
|
|
|
array_splice($openTags, $pos, 1); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
$truncate .= $tag[1]; |
|
|
|
|
if ($html) { |
|
|
|
|
if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) { |
|
|
|
|
return $text; |
|
|
|
|
} |
|
|
|
|
$totalLength = mb_strlen(strip_tags($ending)); |
|
|
|
|
$openTags = array(); |
|
|
|
|
$truncate = ''; |
|
|
|
|
|
|
|
|
|
$contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3])); |
|
|
|
|
if ($contentLength + $totalLength > $length) { |
|
|
|
|
$left = $length - $totalLength; |
|
|
|
|
$entitiesLength = 0; |
|
|
|
|
if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) { |
|
|
|
|
foreach ($entities[0] as $entity) { |
|
|
|
|
if ($entity[1] + 1 - $entitiesLength <= $left) { |
|
|
|
|
$left--; |
|
|
|
|
$entitiesLength += mb_strlen($entity[0]); |
|
|
|
|
} else { |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); |
|
|
|
|
foreach ($tags as $tag) { |
|
|
|
|
if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) { |
|
|
|
|
if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) { |
|
|
|
|
array_unshift($openTags, $tag[2]); |
|
|
|
|
} else if (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) { |
|
|
|
|
$pos = array_search($closeTag[1], $openTags); |
|
|
|
|
if ($pos !== false) { |
|
|
|
|
array_splice($openTags, $pos, 1); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
$truncate .= $tag[1]; |
|
|
|
|
|
|
|
|
|
$truncate .= mb_substr($tag[3], 0 , $left + $entitiesLength); |
|
|
|
|
break; |
|
|
|
|
} else { |
|
|
|
|
$truncate .= $tag[3]; |
|
|
|
|
$totalLength += $contentLength; |
|
|
|
|
} |
|
|
|
|
if ($totalLength >= $length) { |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
if (mb_strlen($text) <= $length) { |
|
|
|
|
return $text; |
|
|
|
|
} else { |
|
|
|
|
$truncate = mb_substr($text, 0, $length - mb_strlen($ending)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (!$exact) { |
|
|
|
|
$spacepos = mb_strrpos($truncate, ' '); |
|
|
|
|
if (isset($spacepos)) { |
|
|
|
|
if ($html) { |
|
|
|
|
$bits = mb_substr($truncate, $spacepos); |
|
|
|
|
preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER); |
|
|
|
|
if (!empty($droppedTags)) { |
|
|
|
|
foreach ($droppedTags as $closingTag) { |
|
|
|
|
if (!in_array($closingTag[1], $openTags)) { |
|
|
|
|
array_unshift($openTags, $closingTag[1]); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
$truncate = mb_substr($truncate, 0, $spacepos); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
$truncate .= $ending; |
|
|
|
|
$contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3])); |
|
|
|
|
if ($contentLength + $totalLength > $length) { |
|
|
|
|
$left = $length - $totalLength; |
|
|
|
|
$entitiesLength = 0; |
|
|
|
|
if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) { |
|
|
|
|
foreach ($entities[0] as $entity) { |
|
|
|
|
if ($entity[1] + 1 - $entitiesLength <= $left) { |
|
|
|
|
$left--; |
|
|
|
|
$entitiesLength += mb_strlen($entity[0]); |
|
|
|
|
} else { |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
$truncate .= mb_substr($tag[3], 0, $left + $entitiesLength); |
|
|
|
|
break; |
|
|
|
|
} else { |
|
|
|
|
$truncate .= $tag[3]; |
|
|
|
|
$totalLength += $contentLength; |
|
|
|
|
} |
|
|
|
|
if ($totalLength >= $length) { |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
if (mb_strlen($text) <= $length) { |
|
|
|
|
return $text; |
|
|
|
|
} else { |
|
|
|
|
$truncate = mb_substr($text, 0, $length - mb_strlen($ending)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (!$exact) { |
|
|
|
|
$spacepos = mb_strrpos($truncate, ' '); |
|
|
|
|
if (isset($spacepos)) { |
|
|
|
|
if ($html) { |
|
|
|
|
$bits = mb_substr($truncate, $spacepos); |
|
|
|
|
preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER); |
|
|
|
|
if (!empty($droppedTags)) { |
|
|
|
|
foreach ($droppedTags as $closingTag) { |
|
|
|
|
if (!in_array($closingTag[1], $openTags)) { |
|
|
|
|
array_unshift($openTags, $closingTag[1]); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
$truncate = mb_substr($truncate, 0, $spacepos); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
$truncate .= $ending; |
|
|
|
|
|
|
|
|
|
if ($html) { |
|
|
|
|
foreach ($openTags as $tag) { |
|
|
|
|
$truncate .= '</'.$tag.'>'; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if ($html) { |
|
|
|
|
foreach ($openTags as $tag) { |
|
|
|
|
$truncate .= '</'.$tag.'>'; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return $truncate; |
|
|
|
|
return $truncate; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
kent1@arscenic.info
6 years ago