" - . '

' @@ -456,7 +455,7 @@ function debusquer_squelette($fonc, $mode, $self){ } else return strlen(trim($res)) - ? "

$res

" + ? "

$res

" // cas de l'appel sur erreur: montre la page : $GLOBALS['debug_objets']['resultat']['tout']; } @@ -476,7 +475,7 @@ function debusquer_squelette($fonc, $mode, $self){ $res = $id = ''; } return !trim($texte) ? '' : ( - "

$res" + " afficher-masquer le debug

$res" . "

" . " ↑ " . ($legend ? $legend : $mode) @@ -647,7 +646,7 @@ function debusquer_navigation_boucles($boucles, $nom_skel, $self, $nom_source){ "\n" . $req . "\n" . - $crit . + htmlspecialchars($crit) . ""; } } @@ -738,10 +737,7 @@ function debusquer_entete($titre, $corps){ . "' type='text/css' />" . "\n" . "\n" . - "

" . - " + / - " . - "

" . - "

" . + "

" . $corps . inclure_balise_dynamique(balise_FORMULAIRE_ADMIN_dyn('spip-admin-float', $debug_objets), false) . '

'; diff --git a/www/ecrire/public/parametrer.php b/www/ecrire/public/parametrer.php index 28d21f2..2617ff5 100644 --- a/www/ecrire/public/parametrer.php +++ b/www/ecrire/public/parametrer.php @@ -217,18 +217,21 @@ function tester_redirection($fond, $contexte, $connect) // passer en url absolue car cette redirection pourra // etre utilisee dans un contexte d'url qui change // y compris url arbo + $status = 302; + if (defined('_STATUS_REDIRECTION_VIRTUEL')) + $status=_STATUS_REDIRECTION_VIRTUEL; if (!preg_match(',^\w+:,', $url)) { include_spip('inc/filtres_mini'); $url = url_absolue($url); } $url = str_replace('&', '&', $url); return array('texte' => "<" - . "?php header('Location: " + . "?php include_spip('inc/headers');redirige_par_entete('" . texte_script($url) - . "'); echo '" - . addslashes($url) - . "'.\"\n\"?" . ">", - 'process_ins' => 'php'); + . "','',$status);" + . "?" . ">", + 'process_ins' => 'php', + 'status' => $status); } } } diff --git a/www/ecrire/public/tracer.php b/www/ecrire/public/tracer.php index 94cdccc..9d316de 100644 --- a/www/ecrire/public/tracer.php +++ b/www/ecrire/public/tracer.php @@ -134,15 +134,13 @@ function chrono_requete($temps) . join('',$t[$k]); } - $navigation = - _T('zbug_statistiques') - . "\n\n" . (# _request('var_mode_objet') ? '' : - ("")) - . "

" + $navigation = array(_T('zbug_statistiques'), + "
" . join("
", $d) . "
" . count($temps) . "	" . _T('info_total') . '	' . $total . "

"; - + ("" . count($temps) . "" . _T('info_total') . '' . $total . ""))); + return array($temps, $navigation); } diff --git a/www/ecrire/req/mysql.php b/www/ecrire/req/mysql.php index b485cd8..3bbd435 100644 --- a/www/ecrire/req/mysql.php +++ b/www/ecrire/req/mysql.php @@ -178,7 +178,17 @@ function spip_mysql_query($query, $serveur='',$requeter=true) { } else $t = 0 ; $connexion['last'] = $query; - $r = $link ? mysql_query($query, $link) : mysql_query($query); + + // ajouter un debug utile dans log/mysql-slow.log ? + $debug = (!defined('_DEBUG_SLOW_QUERIES') || !_DEBUG_SLOW_QUERIES) + ? '' + : ' /* ' + .str_replace('*/','@/', + $_SERVER['REQUEST_URI'].' + '.$GLOBALS['ip'] + ) + .' */'; + + $r = $link ? mysql_query($query.$debug, $link) : mysql_query($query.$debug); if ($e = spip_mysql_errno($serveur)) // Log de l'erreur eventuelle $e .= spip_mysql_error($query, $serveur); // et du fautif diff --git a/www/ecrire/req/sqlite_fonctions.php b/www/ecrire/req/sqlite_fonctions.php index ea08827..14708b8 100644 --- a/www/ecrire/req/sqlite_fonctions.php +++ b/www/ecrire/req/sqlite_fonctions.php @@ -27,7 +27,7 @@ function _sqlite_init_functions(&$sqlite){ $fonctions = array( - 'CONCAT' => array( '_sqlite_func_concat' ,2), + 'CONCAT' => array( '_sqlite_func_concat' ,-1), 'CEIL' => array( '_sqlite_func_ceil', 1), // absent de sqlite2 'DATE_FORMAT' => array( '_sqlite_func_strftime' ,2), @@ -69,6 +69,8 @@ function _sqlite_init_functions(&$sqlite){ 'TO_DAYS' => array( '_sqlite_func_to_days' ,1), # 'TRIM' => array( 'trim' ,1), // present en theorie + 'TIMESTAMPDIFF' => array('_sqlite_timestampdiff' /*,3*/), + 'UNIX_TIMESTAMP'=> array( '_sqlite_func_unix_timestamp' ,1), # 'UPPER' => array( 'strtoupper' ,1), // present v2.4 @@ -273,6 +275,75 @@ function _sqlite_func_substring($string,$start,$len=null){ return substr($string,$start,$len); } +/** + * Calcul de la difference entre 2 timestamp, exprimes dans l'unite fournie en premier argument + * emule https://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html#function_timestampdiff + * @param string $unit + * @param string $date1 + * @param string $date2 + * @return int + */ +function _sqlite_timestampdiff($unit,$date1,$date2){ + // PHP >= 5.3 + if (function_exists("date_diff")){ + $d1 = date_create($date1); + $d2 = date_create($date2); + $diff = date_diff($d1,$d2); + $inv = $diff->invert?-1:1; + switch($unit){ + case "YEAR": + return $inv*$diff->y; + case "QUARTER": + return $inv*(4*$diff->y+intval(floor($diff->m/3))); + case "MONTH": + return $inv*(12*$diff->y+$diff->m); + case "WEEK": + return $inv*intval(floor($diff->days/7)); + case "DAY": + #var_dump($inv*$diff->days); + return $inv*$diff->days; + case "HOUR": + return $inv*(24*$diff->days+$diff->h); + case "MINUTE": + return $inv*((24*$diff->days+$diff->h)*60+$diff->i); + case "SECOND": + return $inv*(((24*$diff->days+$diff->h)*60+$diff->i)*60+$diff->s); + case "MICROSECOND": + return $inv*(((24*$diff->days+$diff->h)*60+$diff->i)*60+$diff->s)*1000000; + } + return 0; + } + // PHP < 5.3 + else { + $d1 = strtotime($date1); + $d2 = strtotime($date2); + $diff = $d2 - $d1; + $sign = ($diff<0?-1:1); + $diff = $sign * $diff; + switch($unit){ + case "YEAR": + $diff = $d2-$d1; + return $sign*(date('Y',abs($diff))-date('Y',0)); + case "QUARTER": + return $sign*(4*(date('Y',abs($diff))-date('Y',0))+intval(floor((date('m',$diff)-1)/3))); + case "MONTH": + return $sign*((date('Y',$diff)-date('Y',0))*12+date('m',$diff)-1); + case "WEEK": + return intval(floor(($d2-$d1)/3600/7)); + case "DAY": + return intval(floor(($d2-$d1)/3600/24)); + case "HOUR": + return intval(floor(($d2-$d1)/3600)); + case "MINUTE": + return intval(floor(($d2-$d1)/60)); + case "SECOND": + return $d2-$d1; + case "MICROSECOND": + return $d2-$d1*1000000; + } + } +} + // http://doc.spip.org/@_sqlite_func_unix_timestamp function _sqlite_func_unix_timestamp($d) { //2005-12-02 20:53:53 diff --git a/www/ecrire/req/sqlite_generique.php b/www/ecrire/req/sqlite_generique.php index f596141..17c0969 100644 --- a/www/ecrire/req/sqlite_generique.php +++ b/www/ecrire/req/sqlite_generique.php @@ -512,12 +512,15 @@ function spip_sqlite_create_index($nom, $table, $champs, $unique='', $serveur = } $ifnotexists = ""; - if (_sqlite_is_version(2, '', $serveur)){ - /* simuler le IF EXISTS - version 2 */ + $version = spip_sqlite_fetch(spip_sqlite_query("select sqlite_version() AS sqlite_version",$serveur),'',$serveur); + if (!function_exists('spip_version_compare')) include_spip('plugins/installer'); + + if ($version AND spip_version_compare($version['sqlite_version'],'3.3.0','>=')) { + $ifnotexists = ' IF NOT EXISTS'; + } else { + /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ $a = spip_sqlite_showtable($table, $serveur); if (isset($a['key']['KEY '.$nom])) return true; - } else { - $ifnotexists = ' IF NOT EXISTS'; } $query = "CREATE ".($unique?"UNIQUE ":"")."INDEX$ifnotexists $nom ON $table (".join(',', $champs).")"; @@ -1957,15 +1960,18 @@ function _sqlite_requete_create($nom, $champs, $cles, $autoinc = false, $tempora $ifnotexists = ""; if ($_ifnotexists){ - // simuler le IF NOT EXISTS - version 2 - if (_sqlite_is_version(2, '', $serveur)){ - $a = spip_sqlite_showtable($nom, $serveur); - if ($a) return false; - } - // sinon l'ajouter en version 3 - else { + + $version = spip_sqlite_fetch(spip_sqlite_query("select sqlite_version() AS sqlite_version",$serveur),'',$serveur); + if (!function_exists('spip_version_compare')) include_spip('plugins/installer'); + + if ($version AND spip_version_compare($version['sqlite_version'],'3.3.0','>=')) { $ifnotexists = ' IF NOT EXISTS'; + } else { + /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ + $a = spip_sqlite_showtable($table, $serveur); + if (isset($a['key']['KEY '.$nom])) return true; } + } $temporary = $temporary ? ' TEMPORARY' : ''; @@ -2273,6 +2279,11 @@ class sqlite_traducteur { $this->query = str_replace('LEFT(','_LEFT(',$this->query); } + if (strpos($this->query, 'TIMESTAMPDIFF(')!==false){ + $this->query = preg_replace('/TIMESTAMPDIFF\(\s*([^,]*)\s*,/Uims',"TIMESTAMPDIFF('\\1',",$this->query); + } + + // Correction Using // USING (non reconnu en sqlite2) // problematique car la jointure ne se fait pas du coup. diff --git a/www/ecrire/typographie/fr.php b/www/ecrire/typographie/fr.php index 4e1d058..1288a62 100644 --- a/www/ecrire/typographie/fr.php +++ b/www/ecrire/typographie/fr.php @@ -44,7 +44,7 @@ function typographie_fr_dist($letexte) { $cherche1 = array( /* 1 */ '/((?:^|[^\#0-9a-zA-Z\&])[\#0-9a-zA-Z]*)\;/S', - /* 2 */ '/»| --?,|(?::| %)(?:\W|$)/S', + /* 2 */ '/»| --?,|(?::(?!:)| %)(?:\W|$)/S', /* 3 */ '/([^[<(!?.])([!?][!?\.]*)/iS', /* 4 */ '/«|(?:M(?:M?\.|mes?|r\.?)|[MnN]°) /S' ); diff --git a/www/plugins-dist/breves/lang/breves.xml b/www/plugins-dist/breves/lang/breves.xml index d7ea692..25662f4 100644 --- a/www/plugins-dist/breves/lang/breves.xml +++ b/www/plugins-dist/breves/lang/breves.xml @@ -3,8 +3,8 @@ - + @@ -29,8 +29,8 @@ - + @@ -75,8 +75,8 @@ - + diff --git a/www/plugins-dist/breves/lang/breves_ft_tu.php b/www/plugins-dist/breves/lang/breves_ft_tu.php deleted file mode 100644 index ace3c28..0000000 --- a/www/plugins-dist/breves/lang/breves_ft_tu.php +++ /dev/null @@ -1,52 +0,0 @@ - 'BrÃ¨ve', - 'breves' => 'BrÃ¨ves', - - // E - 'entree_breve_publiee' => 'Cette brÃ¨ve estÂ :', # NEW - 'entree_texte_breve' => 'Texte de la brÃ¨ve', # NEW - - // I - 'icone_breves' => 'BrÃ¨ves', # NEW - 'icone_ecrire_nouvel_article' => 'Les brÃ¨ves contenues dans cette rubrique', # NEW - 'icone_modifier_breve' => 'Modifier cette brÃ¨ve', # NEW - 'icone_nouvelle_breve' => 'Ãcrire une nouvelle brÃ¨ve', # NEW - 'info_1_breve' => '1 brÃ¨ve', # NEW - 'info_aucun_breve' => 'Aucune brÃ¨ve', # NEW - 'info_breves' => 'Votre site utilise-t-il le systÃ¨me de brÃ¨vesÂ ?', # NEW - 'info_breves_02' => 'BrÃ¨ves', # NEW - 'info_breves_valider' => 'BrÃ¨ves Ã valider', # NEW - 'info_gauche_numero_breve' => 'BrÃ¨ve numÃ©ro', # NEW - 'info_nb_breves' => '@nb@ brÃ¨ves', # NEW - 'item_breve_proposee' => 'proposÃ©e Ã l\'Ã©valuation', # NEW - 'item_breve_refusee' => 'refusÃ©e', # NEW - 'item_breve_validee' => 'validÃ©e', # NEW - 'item_non_utiliser_breves' => 'Ne pas utiliser les brÃ¨ves', # NEW - 'item_utiliser_breves' => 'Utiliser les brÃ¨ves', # NEW - - // L - 'logo_breve' => 'Logo de la brÃ¨ve', # NEW - - // T - 'texte_breves' => 'Les brÃ¨ves sont des textes courts et simples permettant de - mettre en ligne rapidement des informations concises, de gÃ©rer - une revue de presse, un calendrier d\'Ã©vÃ©nements...', # NEW - 'titre_breve_proposee' => 'BrÃ¨ve proposÃ©e', # NEW - 'titre_breve_publiee' => 'BrÃ¨ve publiÃ©e', # NEW - 'titre_breve_refusee' => 'BrÃ¨ve refusÃ©e', # NEW - 'titre_breves' => 'Les brÃ¨ves', # NEW - 'titre_langue_breve' => 'Langue de la brÃ¨ve', # NEW - 'titre_nouvelle_breve' => 'Nouvelle brÃ¨ve', # NEW - 'titre_page_breves' => 'BrÃ¨ves' # NEW -); - -?> diff --git a/www/plugins-dist/compagnon/compagnon/article_redaction _redacteur.html b/www/plugins-dist/compagnon/compagnon/article_redaction _redacteur.html deleted file mode 100644 index 002bbd1..0000000 --- a/www/plugins-dist/compagnon/compagnon/article_redaction _redacteur.html +++ /dev/null @@ -1,11 +0,0 @@ -[(#ENV{fermer}|non) -[

(#ENV**|unserialize|print_r{1})

] -#BOITE_OUVRIR{'<:compagnon:c_article_redaction:>',compagnon} - -<:compagnon:c_article_redaction_texte:> - -#BOITE_PIED - - [(#BOUTON_ACTION{[(#VAL|ok_aleatoire)],#URL_ACTION_AUTEUR{compagnon,compris/#ID,#SELF|parametre_url{fermer,oui}},ajax})] -#BOITE_FERMER -] diff --git a/www/plugins-dist/compagnon/compagnon/article_redaction_redacteur.html b/www/plugins-dist/compagnon/compagnon/article_redaction_redacteur.html new file mode 100644 index 0000000..52b372d --- /dev/null +++ b/www/plugins-dist/compagnon/compagnon/article_redaction_redacteur.html @@ -0,0 +1,10 @@ +[(#ENV{fermer}|non) +[(#BOITE_OUVRIR{<:compagnon:c_article_redaction:>,compagnon})] + +<:compagnon:c_article_redaction_texte:> + +#BOITE_PIED + + [(#BOUTON_ACTION{[(#VAL|ok_aleatoire)],#URL_ACTION_AUTEUR{compagnon,compris/#ID,#SELF|parametre_url{fermer,oui}},ajax})] +#BOITE_FERMER +] diff --git a/www/plugins-dist/compagnon/lang/compagnon_eo.php b/www/plugins-dist/compagnon/lang/compagnon_eo.php index e547658..1e63c9a 100644 --- a/www/plugins-dist/compagnon/lang/compagnon_eo.php +++ b/www/plugins-dist/compagnon/lang/compagnon_eo.php @@ -12,7 +12,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'c_accueil_configurer_site' => 'Agordi vian retejon', 'c_accueil_configurer_site_texte' => 'Unu el la unuaj aferoj por fari estas doni nomon al via retejo. Äi nuntempe nomiÄas Â« @nom@ Â». La retejnomo estas montrita supre de Äi paÄo. -Klakante sur tio, vi povas ÅanÄi lian nomon, sed ankaÅ donas al Äi vigneton kaj devizon.', +Klakante sur tio, vi povas ÅanÄi lian nomon, sed ankaÅ donas al Äi vinjeton kaj devizon.', 'c_accueil_publication' => 'Publikigu !', 'c_accueil_publication_texte' => 'Por publikigi paÄon, vi devas krei artikolon. Por tio, estas necesa krei almenaÅ unu rubrikon. Vi povas fari tion en la menuo Â«EldonoÂ» per klako sur Â«RubrikojÂ».', diff --git a/www/plugins-dist/compagnon/paquet.xml b/www/plugins-dist/compagnon/paquet.xml index 1a0bb1c..e2db746 100644 --- a/www/plugins-dist/compagnon/paquet.xml +++ b/www/plugins-dist/compagnon/paquet.xml @@ -1,7 +1,7 @@ - - + + @@ -38,9 +38,9 @@ - + diff --git a/www/plugins-dist/compresseur/lib/csstidy/css_optimiser.php b/www/plugins-dist/compresseur/lib/csstidy/css_optimiser.php deleted file mode 100644 index b282062..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/css_optimiser.php +++ /dev/null @@ -1,478 +0,0 @@ -. - * - * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License - * @package csstidy - * @author Florian Schmitz (floele at gmail dot com) 2005-2007 - * @author Brett Zamir (brettz9 at yahoo dot com) 2007 - */ - -require('class.csstidy.php'); -require('lang.inc.php'); - - -if (get_magic_quotes_gpc()) { - if (isset($_REQUEST['css_text'])) { - $_REQUEST['css_text'] = stripslashes($_REQUEST['css_text']); - } - if (isset($_REQUEST['custom'])) { - $_REQUEST['custom'] = stripslashes($_REQUEST['custom']); - } - if (isset($_COOKIE['custom_template'])) { - $_COOKIE['custom_template'] = stripslashes($_COOKIE['custom_template']); - } -} - -function rmdirr($dirname,$oc=0) -{ - // Sanity check - if (!file_exists($dirname)) { - return false; - } - // Simple delete for a file - if (is_file($dirname) && (time()-fileatime($dirname))>3600) { - return unlink($dirname); - } - // Loop through the folder - if(is_dir($dirname)) - { - $dir = dir($dirname); - while (false !== $entry = $dir->read()) { - // Skip pointers - if ($entry === '.' || $entry === '..') { - continue; - } - // Recurse - rmdirr($dirname.'/'.$entry,$oc); - } - $dir->close(); - } - // Clean up - if ($oc==1) - { - return rmdir($dirname); - } -} - -function options($options, $selected = null, $labelIsValue = false) -{ - $html = ''; - - settype($selected, 'array'); - settype($options, 'array'); - - foreach ($options as $value=>$label) - { - if (is_array($label)) { - $value = $label[0]; - $label = $label[1]; - } - $label = htmlspecialchars($label, ENT_QUOTES, 'utf-8'); - $value = $labelIsValue ? $label - : htmlspecialchars($value, ENT_QUOTES, 'utf-8'); - - $html .= ''; - } - - return $html; -} - -$css = new csstidy(); -$is_custom = isset($_REQUEST['custom']) && !empty($_REQUEST['custom']) && isset($_REQUEST['template']) && ($_REQUEST['template'] === '4'); -if($is_custom) -{ - setcookie ('custom_template', $_REQUEST['custom'], time()+360000); -} - -rmdirr('temp'); - -if(isset($_REQUEST['case_properties'])) $css->set_cfg('case_properties',$_REQUEST['case_properties']); -if(isset($_REQUEST['lowercase'])) $css->set_cfg('lowercase_s',true); -if(!isset($_REQUEST['compress_c']) && isset($_REQUEST['post'])) $css->set_cfg('compress_colors',false); -if(!isset($_REQUEST['compress_fw']) && isset($_REQUEST['post'])) $css->set_cfg('compress_font-weight',false); -if(isset($_REQUEST['merge_selectors'])) $css->set_cfg('merge_selectors', $_REQUEST['merge_selectors']); -if(isset($_REQUEST['optimise_shorthands'])) $css->set_cfg('optimise_shorthands',$_REQUEST['optimise_shorthands']); -if(!isset($_REQUEST['rbs']) && isset($_REQUEST['post'])) $css->set_cfg('remove_bslash',false); -if(isset($_REQUEST['preserve_css'])) $css->set_cfg('preserve_css',true); -if(isset($_REQUEST['sort_sel'])) $css->set_cfg('sort_selectors',true); -if(isset($_REQUEST['sort_de'])) $css->set_cfg('sort_properties',true); -if(isset($_REQUEST['remove_last_sem'])) $css->set_cfg('remove_last_;',true); -if(isset($_REQUEST['discard'])) $css->set_cfg('discard_invalid_properties',true); -if(isset($_REQUEST['css_level'])) $css->set_cfg('css_level',$_REQUEST['css_level']); -if(isset($_REQUEST['timestamp'])) $css->set_cfg('timestamp',true); - - -// This by itself is enough since our scripts don't use DOM to create elements (in which case the namespace aware ones -// should be used when serving as application/xhtml+xml but not when served as text/html ; -// also, case will be different when retrieving element names, as HTML DOM returns in upper case, -// genuine XHTML DOM (when XHTML served as such) as lower -if (stristr($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml')) { - $http_accept = 'application/xhtml+xml'; -} -elseif (stristr($_SERVER['HTTP_ACCEPT'], 'application/xml')) { - $http_accept = 'application/xml'; -} -elseif (stristr($_SERVER['HTTP_ACCEPT'], 'text/xml')) { - $http_accept = 'text/xml'; -} -elseif (stristr($_SERVER['HTTP_USER_AGENT'], 'Opera ') || stristr($_SERVER['HTTP_USER_AGENT'], 'Opera/')) { - preg_match('@Opera/(\d)@', $_SERVER['HTTP_USER_AGENT'], $matches); - if (isset($matches[1]) && $matches[1] >= 7) { - $http_accept = 'application/xhtml+xml'; - } - else { - $http_accept = 'text/html'; - } -} -else { - $http_accept = 'text/html'; -} - -header('Content-Type: '.$http_accept.'; charset=utf-8'); - -if ($http_accept === 'text/html') { -?> - - - - - - - - - <?php echo $lang[$l][0]; echo $css->version; ?>) - - - - - -

- -

- csstidy version; ?>) -

- : English Deutsch French Chinese

- -

- - - size="35" />
- -

- -

- load_template($_REQUEST['custom'],false); - } - break; - - case 3: - $css->load_template('highest_compression'); - break; - - case 2: - $css->load_template('high_compression'); - break; - - case 0: - $css->load_template('low_compression'); - break; - } - } - - if($url) - { - if(substr($_REQUEST['url'],0,7) !== 'http://') - { - $_REQUEST['url'] = 'http://'.$_REQUEST['url']; - } - $result = $css->parse_from_url($_REQUEST['url'],0); - } - elseif(isset($_REQUEST['css_text']) && strlen($_REQUEST['css_text'])>5) - { - $result = $css->parse($_REQUEST['css_text']); - } - - if($result) - { - $ratio = $css->print->get_ratio(); - $diff = $css->print->get_diff(); - if(isset($_REQUEST['file_output'])) - { - $filename = md5(mt_rand().time().mt_rand()); - if (!is_dir('temp')) { - $madedir = mkdir('temp'); - if (!$madedir) { - print 'Could not make directory "temp" in '.dirname(__FILE__); - exit; - } - } - $handle = fopen('temp/'.$filename.'.css','w'); - if($handle) { - if(fwrite($handle,$css->print->plain())) - { - $file_ok = true; - } - } - fclose($handle); - } - if($ratio>0) $ratio = ''.$ratio.'% - ('.$diff.' Bytes)'; else $ratio = ''.$ratio.'% ('.$diff.' Bytes)'; - if(count($css->log) > 0): ?> -

Messages -

',$line,': ',$array[$i]['m'],'

- ',$lang[$l][37],': ',$css->print->size('input'),'KB, ',$lang[$l][38],':',$css->print->size('output'),'KB, ',$lang[$l][36],': ',$ratio; - if($file_ok) - { - echo ' - Download'; - } - echo ' - ',$lang[$l][58],''; - echo ''; - echo '

';
-        echo $css->print->formatted();
-        echo '

'; - - echo '

',$lang[$l][64],''; - echo '

'; - echo '

',$lang[$l][65],''; - echo ''; - - echo '

↑ ',$lang[$l][59],'

'; - - } - elseif(isset($_REQUEST['css_text']) || isset($_REQUEST['url'])) { - echo '

',$lang[$l][28],'

'; - } - ?> -

- . -

- - diff --git a/www/plugins-dist/compresseur/lib/csstidy/lang.inc.php b/www/plugins-dist/compresseur/lib/csstidy/lang.inc.php deleted file mode 100644 index 6452b42..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/lang.inc.php +++ /dev/null @@ -1,311 +0,0 @@ -. - * - * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License - * @package csstidy - * @author Florian Schmitz (floele at gmail dot com) 2005-2007 - * @author Brett Zamir (brettz9 at yahoo dot com) 2007 - */ - - -if(isset($_GET['lang'])) { - $l = $_GET['lang']; -} -else if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - $l = $_SERVER['HTTP_ACCEPT_LANGUAGE']; - $l = strtolower(substr($l, 0, 2)); -} -else { - $l = ''; -} - -$l = (in_array($l, array('de', 'fr', 'zh'))) ? $l : 'en'; - -// note 5 in all but French, and 40 in all are orphaned - -$lang = array(); -$lang['en'][0] = 'CSS Formatter and Optimiser/Optimizer (based on CSSTidy '; -$lang['en'][1] = 'CSS Formatter and Optimiser'; -$lang['en'][2] = '(based on'; -$lang['en'][3] = '(plaintext)'; -$lang['en'][4] = 'Important Note:'; -$lang['en'][6] = 'Your code should be well-formed. This is not a validator which points out errors in your CSS code. To make sure that your code is valid, use the W3C Validator.'; -$lang['en'][7] = 'all comments are removed'; -$lang['en'][8] = 'CSS Input:'; -$lang['en'][9] = 'CSS-Code:'; -$lang['en'][10] = 'CSS from URL:'; -$lang['en'][11] = 'Code Layout:'; -$lang['en'][12] = 'Compression (code layout):'; -$lang['en'][13] = 'Highest (no readability, smallest size)'; -$lang['en'][14] = 'High (moderate readability, smaller size)'; -$lang['en'][15] = 'Standard (balance between readability and size)'; -$lang['en'][16] = 'Low (higher readability)'; -$lang['en'][17] = 'Custom (enter below)'; -$lang['en'][18] = 'Custom template'; -$lang['en'][19] = 'Options'; -$lang['en'][20] = 'Sort Selectors (caution)'; -$lang['en'][21] = 'Sort Properties'; -$lang['en'][22] = 'Regroup selectors'; -$lang['en'][23] = 'Optimise shorthands'; -$lang['en'][24] = 'Compress colors'; -$lang['en'][25] = 'Lowercase selectors'; -$lang['en'][26] = 'Case for properties:'; -$lang['en'][27] = 'Lowercase'; -$lang['en'][28] = 'No or invalid CSS input or wrong URL!'; -$lang['en'][29] = 'Uppercase'; -$lang['en'][30] = 'lowercase elementnames needed for XHTML'; -$lang['en'][31] = 'Remove unnecessary backslashes'; -$lang['en'][32] = 'convert !important-hack'; -$lang['en'][33] = 'Output as file'; -$lang['en'][34] = 'Bigger compression because of smaller newlines (copy & paste doesn\'t work)'; -$lang['en'][35] = 'Process CSS'; -$lang['en'][36] = 'Compression Ratio'; -$lang['en'][37] = 'Input'; -$lang['en'][38] = 'Output'; -$lang['en'][39] = 'Language'; -$lang['en'][41] = 'Attention: This may change the behaviour of your CSS Code!'; -$lang['en'][42] = 'Remove last ;'; -$lang['en'][43] = 'Discard invalid properties'; -$lang['en'][44] = 'Only safe optimisations'; -$lang['en'][45] = 'Compress font-weight'; -$lang['en'][46] = 'Save comments'; -$lang['en'][47] = 'Do not change anything'; -$lang['en'][48] = 'Only seperate selectors (split at ,)'; -$lang['en'][49] = 'Merge selectors with the same properties (fast)'; -$lang['en'][50] = 'Merge selectors intelligently (slow)'; -$lang['en'][51] = 'Preserve CSS'; -$lang['en'][52] = 'Save comments, hacks, etc. Most optimisations can *not* be applied if this is enabled.'; -$lang['en'][53] = 'None'; -$lang['en'][54] = 'Don\'t optimise'; -$lang['en'][55] = 'Safe optimisations'; -$lang['en'][56] = 'All optimisations'; -$lang['en'][57] = 'Add timestamp'; -$lang['en'][58] = 'Copy to clipboard'; -$lang['en'][59] = 'Back to top'; -$lang['en'][60] = 'Your browser doesn\'t support copy to clipboard.'; -$lang['en'][61] = 'For bugs and suggestions feel free to'; -$lang['en'][62] = 'contact me'; -$lang['en'][63] = 'Output CSS code as complete HTML document'; -$lang['en'][64] = 'Code'; -$lang['en'][65] = 'CSS to style CSS output'; -$lang['en'][66] = 'You need to go to about:config in your URL bar, select \'signed.applets.codebase_principal_support\' in the filter field, and set its value to true in order to use this feature; however, be aware that doing so increases security risks.'; - - -$lang['de'][0] = 'CSS Formatierer und Optimierer (basierend auf CSSTidy '; -$lang['de'][1] = 'CSS Formatierer und Optimierer'; -$lang['de'][2] = '(basierend auf'; -$lang['de'][3] = '(Textversion)'; -$lang['de'][4] = 'Wichtiger Hinweis:'; -$lang['de'][6] = 'Der CSS Code sollte wohlgeformt sein. Der CSS Code wird nicht auf GÃ¼ltigkeit Ã¼berprÃ¼ft. Um sicherzugehen dass dein Code valide ist, benutze den W3C Validierungsservice.'; -$lang['de'][7] = 'alle Kommentare werden entfernt'; -$lang['de'][8] = 'CSS Eingabe:'; -$lang['de'][9] = 'CSS-Code:'; -$lang['de'][10] = 'CSS von URL:'; -$lang['de'][11] = 'Code Layout:'; -$lang['de'][12] = 'Komprimierung (Code Layout):'; -$lang['de'][13] = 'HÃ¶chste (keine Lesbarkeit, niedrigste GrÃ¶Ãe)'; -$lang['de'][14] = 'Hoch (mittelmÃ¤Ãige Lesbarkeit, geringe GrÃ¶Ãe)'; -$lang['de'][15] = 'Standard (Kompromiss zwischen Lesbarkeit und GrÃ¶Ãe)'; -$lang['de'][16] = 'Niedrig (hÃ¶here Lesbarkeit)'; -$lang['de'][17] = 'Benutzerdefiniert (unten eingeben)'; -$lang['de'][18] = 'Benutzerdefinierte Vorlage'; -$lang['de'][19] = 'Optionen'; -$lang['de'][20] = 'Selektoren sortieren (Vorsicht)'; -$lang['de'][21] = 'Eigenschaften sortieren'; -$lang['de'][22] = 'Selektoren umgruppieren'; -$lang['de'][23] = 'Shorthands optimieren'; -$lang['de'][24] = 'Farben komprimieren'; -$lang['de'][25] = 'Selektoren in Kleinbuchstaben'; -$lang['de'][26] = 'GroÃ-/Kleinschreibung fÃ¼r Eigenschaften'; -$lang['de'][27] = 'Kleinbuchstaben'; -$lang['de'][28] = 'Keine oder ungÃ¼ltige CSS Eingabe oder falsche URL!'; -$lang['de'][29] = 'GroÃbuchstaben'; -$lang['de'][30] = 'kleingeschriebene Elementnamen benÃ¶tigt fÃ¼r XHTML'; -$lang['de'][31] = 'UnnÃ¶tige Backslashes entfernen'; -$lang['de'][32] = '!important-Hack konvertieren'; -$lang['de'][33] = 'Als Datei ausgeben'; -$lang['de'][34] = 'GrÃ¶Ãere Komprimierung augrund von kleineren Neuezeile-Zeichen'; -$lang['de'][35] = 'CSS verarbeiten'; -$lang['de'][36] = 'Komprimierungsrate'; -$lang['de'][37] = 'Eingabe'; -$lang['de'][38] = 'Ausgabe'; -$lang['de'][39] = 'Sprache'; -$lang['de'][41] = 'Achtung: Dies kÃ¶nnte das Verhalten ihres CSS-Codes verÃ¤ndern!'; -$lang['de'][42] = 'Letztes ; entfernen'; -$lang['de'][43] = 'UngÃ¼ltige Eigenschaften entfernen'; -$lang['de'][44] = 'Nur sichere Optimierungen'; -$lang['de'][45] = 'font-weight komprimieren'; -$lang['de'][46] = 'Kommentare beibehalten'; -$lang['de'][47] = 'Nichts Ã¤ndern'; -$lang['de'][48] = 'Selektoren nur trennen (am Komma)'; -$lang['de'][49] = 'Selektoren mit gleichen Eigenschaften zusammenfassen (schnell)'; -$lang['de'][50] = 'Selektoren intelligent zusammenfassen (langsam!)'; -$lang['de'][51] = 'CSS erhalten'; -$lang['de'][52] = 'Kommentare, Hacks, etc. speichern. Viele Optimierungen sind dann aber nicht mehr mÃ¶glich.'; -$lang['de'][53] = 'Keine'; -$lang['de'][54] = 'Nicht optimieren'; -$lang['de'][55] = 'Sichere Optimierungen'; -$lang['de'][56] = 'Alle Optimierungen'; -$lang['de'][57] = 'Zeitstempel hinzufÃ¼gen'; -$lang['de'][58] = 'Copy to clipboard'; -$lang['de'][59] = 'Back to top'; -$lang['de'][60] = 'Your browser doesn\'t support copy to clipboard.'; -$lang['de'][61] = 'For bugs and suggestions feel free to'; -$lang['de'][62] = 'contact me'; -$lang['de'][63] = 'Output CSS code as complete HTML document'; -$lang['de'][64] = 'Code'; -$lang['de'][65] = 'CSS to style CSS output'; -$lang['de'][66] = 'You need to go to about:config in your URL bar, select \'signed.applets.codebase_principal_support\' in the filter field, and set its value to true in order to use this feature; however, be aware that doing so increases security risks.'; - - -$lang['fr'][0] = 'CSS Formatteur et Optimiseur (basÃ© sur CSSTidy '; -$lang['fr'][1] = 'CSS Formatteur et Optimiseur'; -$lang['fr'][2] = '(basÃ© sur '; -$lang['fr'][3] = '(Version texte)'; -$lang['fr'][4] = 'Note Importante :'; -$lang['fr'][6] = 'Votre code doit Ãªtre valide. Ce nâest pas un validateur qui signale les erreurs dans votre code CSS. Pour Ãªtre sÃ»r que votre code est correct, utilisez le validateur : W3C Validator.'; -$lang['fr'][7] = 'tous les commentaires sont enlevÃ©s'; -$lang['fr'][8] = 'Champ CSS :'; -$lang['fr'][9] = 'Code CSS :'; -$lang['fr'][10] = 'CSS en provenance dâune URL :
'; -$lang['fr'][11] = 'Mise en page du code :'; -$lang['fr'][12] = 'Compression (mise en page du code) :'; -$lang['fr'][13] = 'La plus Ã©levÃ©e (aucune lisibilitÃ©, taille minimale)'; -$lang['fr'][14] = 'ÃlevÃ©e (lisibilitÃ© modÃ©rÃ©e, petite taille)'; -$lang['fr'][15] = 'Normale (Ã©quilibre entre lisibilitÃ© et taille)'; -$lang['fr'][16] = 'Faible (lisibilitÃ© Ã©levÃ©e)'; -$lang['fr'][17] = 'Sur mesure (entrer ci-dessous)'; -$lang['fr'][18] = 'Gabarit sur mesure'; -$lang['fr'][19] = 'Options'; -$lang['fr'][20] = 'Trier les sÃ©lecteurs (attention)'; -$lang['fr'][21] = 'Trier les propriÃ©tÃ©s'; -$lang['fr'][22] = 'Regrouper les sÃ©lecteurs'; -$lang['fr'][23] = 'PropriÃ©tÃ©s raccourcies'; -$lang['fr'][24] = 'Compresser les couleurs'; -$lang['fr'][25] = 'SÃ©lecteurs en minuscules'; -$lang['fr'][26] = 'Case pour les propriÃ©tÃ©s :'; -$lang['fr'][27] = 'Minuscule'; -$lang['fr'][28] = 'CSS non valide ou URL incorrecte !'; -$lang['fr'][29] = 'Majuscule'; -$lang['fr'][30] = 'les noms des Ã©lÃ©ments en minuscules (indispensables pour XHTML)'; -$lang['fr'][31] = 'enlever les antislashs inutiles'; -$lang['fr'][32] = 'convertir !important-hack'; -$lang['fr'][33] = 'Sauver en tant que fichier'; -$lang['fr'][34] = 'Meilleure compression grÃ¢ce aux caractÃ¨res de saut de ligne plus petits (copier & coller ne marche pas)'; -$lang['fr'][35] = 'Compresser la CSS'; -$lang['fr'][36] = 'Facteur de Compression'; -$lang['fr'][37] = 'EntrÃ©e'; -$lang['fr'][38] = 'Sortie'; -$lang['fr'][39] = 'Langue'; -$lang['fr'][41] = 'Attention : ceci peut changer le comportement de votre code CSS !'; -$lang['fr'][42] = 'Enlever le dernier ;'; -$lang['fr'][43] = 'Supprimer les propriÃ©tÃ©s non valide'; -$lang['fr'][44] = 'Seulement les optimisations sÃ»res'; -$lang['fr'][45] = 'Compresser font-weight'; -$lang['fr'][46] = 'Sauvegarder les commentaires '; -$lang['fr'][47] = 'Ne rien changer'; -$lang['fr'][48] = 'SÃ©pare les sÃ©lecteurs (sÃ©pare au niveau de ,)'; -$lang['fr'][49] = 'Fusionne les sÃ©lecteurs avec les mÃªmes propriÃ©tÃ©s (rapide)'; -$lang['fr'][50] = 'Fusionne les sÃ©lecteurs intelligemment (lent)'; -$lang['fr'][51] = 'PrÃ©server la CSS'; -$lang['fr'][52] = 'Sauvegarder les commentaires, hacks, etc. La plupart des optimisations ne peuvent *pas* Ãªtre appliquÃ©es si cela est activÃ©.'; -$lang['fr'][53] = 'Aucun'; -$lang['fr'][54] = 'Ne pas optimiser'; -$lang['fr'][55] = 'Optimisations sÃ»res'; -$lang['fr'][56] = 'Toutes les optimisations'; -$lang['fr'][57] = 'Ajouter un timestamp'; -$lang['fr'][58] = 'Copier dans le presse-papiers'; -$lang['fr'][59] = 'Retour en haut'; -$lang['fr'][60] = 'Votre navigateur ne suporte pas la copie vers le presse-papiers.'; -$lang['fr'][61] = 'Pour signaler des bugs ou pour des suggestions,'; -$lang['fr'][62] = 'contactez-moi'; -$lang['fr'][63] = 'Sauver le code CSS comme document complet HTML'; -$lang['fr'][64] = 'Code'; -$lang['fr'][65] = 'CSS pour colorier la sortie CSS'; -$lang['fr'][66] = 'Vous devez aller dans about:config dans votre barre dâadresse, selectionner \'signed.applets.codebase_principal_support\' dans le champ Filtre et attribuez-lui la valeur \'true\' pour utiliser cette fonctionnalitÃ©; toutefois, soyez conscient que cela augmente les risques de sÃ©curitÃ©.'; - - -$lang['zh'][0] = 'CSSæ´å½¢èæä½³åå·¥å·(ä½¿ç¨ CSSTidy '; -$lang['zh'][1] = 'CSSæ´å½¢èæä½³åå·¥å·'; -$lang['zh'][2] = '(ä½¿ç¨'; -$lang['zh'][3] = '(ç´æå)'; -$lang['zh'][4] = 'éè¦äºé :'; -$lang['zh'][6] = 'ä½ çåå§ç¢¼å¿é æ¯è¯æ§ç(well-formed). éåå·¥å·æ²æå§å»ºé©èå¨(validator). é©èå¨è½å¤ æåºä½ CSSåå§ç¢¼è£¡çé¯èª¤. è«ä½¿ç¨ W3C é©èå¨, ç¢ºä¿ä½ çåå§ç¢¼åä¹è¦ç¯.'; -$lang['zh'][7] = 'ææè¨»è§£é½ç§»é¤äº'; -$lang['zh'][8] = 'CSS è¼¸å¥:'; -$lang['zh'][9] = 'CSS åå§ç¢¼:'; -$lang['zh'][10] = 'CSS æªæ¡ç¶²å(URL):'; -$lang['zh'][11] = 'åå§ç¢¼è¦å:'; -$lang['zh'][12] = 'å£ç¸®ç¨åº¦(åå§ç¢¼è¦å):'; -$lang['zh'][13] = 'æé« (æ²æè¾¦æ³è®, æªæ¡æå°)'; -$lang['zh'][14] = 'é« (é©åº¦çå¯è®æ§, æªæ¡å°)'; -$lang['zh'][15] = 'æ¨æº (å¼é¡§å¯è®æ§èæªæ¡å¤§å°)'; -$lang['zh'][16] = 'ä½ (æ³¨éå¯è®æ§)'; -$lang['zh'][17] = 'èªè¨ (å¨ä¸æ¹è¨å®)'; -$lang['zh'][18] = 'èªè¨æ¨£æ¿'; -$lang['zh'][19] = 'é¸é '; -$lang['zh'][20] = 'æ´çé¸æç¬¦(è«è¬¹æä½¿ç¨)'; -$lang['zh'][21] = 'æ´çå±¬æ§'; -$lang['zh'][22] = 'éçµé¸æç¬¦'; -$lang['zh'][23] = 'éè¨æ³(shorthand)æä½³å'; -$lang['zh'][24] = 'å£ç¸®è²å½©èªæ³'; -$lang['zh'][25] = 'æ¹ç¨å°å¯«é¸æç¬¦'; -$lang['zh'][26] = 'å±¬æ§çåå½¢:'; -$lang['zh'][27] = 'å°å¯«'; -$lang['zh'][28] = 'æ²æè¼¸å¥CSS, èªæ³ä¸ç¬¦åè¦å®, ææ¯ç¶²åé¯èª¤!'; -$lang['zh'][29] = 'å¤§å¯«'; -$lang['zh'][30] = 'XHTMLå¿é ä½¿ç¨å°å¯«çåç´ åç¨±'; -$lang['zh'][31] = 'ç§»é¤ä¸å¿è¦çåæç·'; -$lang['zh'][32] = 'è½æ !important-hack'; -$lang['zh'][33] = 'è¼¸åºææªæ¡å½¢å¼'; -$lang['zh'][34] = 'ç±æ¼æ¯è¼å°æè¡åå, æææ´å¤§çå£ç¸®æ¯ç(è¤è£½&è²¼ä¸æ²æç¨)'; -$lang['zh'][35] = 'å·è¡'; -$lang['zh'][36] = 'å£ç¸®æ¯ç'; -$lang['zh'][37] = 'è¼¸å¥'; -$lang['zh'][38] = 'è¼¸åº'; -$lang['zh'][39] = 'èªè¨'; -$lang['zh'][41] = 'æ³¨æ: éæè¨±æè®æ´ä½ CSSåå§ç¢¼çè¡çº!'; -$lang['zh'][42] = 'é¤å»æå¾ä¸ååè'; -$lang['zh'][43] = 'ææ£ä¸ç¬¦åè¦å®çå±¬æ§'; -$lang['zh'][44] = 'åªå®å¨å°æä½³å'; -$lang['zh'][45] = 'å£ç¸® font-weight'; -$lang['zh'][46] = 'ä¿çè¨»è§£'; -$lang['zh'][47] = 'ä»éº¼é½ä¸è¦æ¹'; -$lang['zh'][48] = 'åªåéåæ¬ç¨éèåéçé¸æç¬¦'; -$lang['zh'][49] = 'åä½µæç¸åå±¬æ§çé¸æç¬¦(å¿«é)'; -$lang['zh'][50] = 'è°æå°åä½µé¸æç¬¦(æ¢é)'; -$lang['zh'][51] = 'ä¿è·CSS'; -$lang['zh'][52] = 'ä¿çè¨»è§£è hack çç. å¦æåç¨éåé¸é , å¤§å¤æ¸çæä½³åç¨åºé½ä¸æå·è¡.'; -$lang['zh'][53] = 'ä¸æ¹è®'; -$lang['zh'][54] = 'ä¸åæä½³å'; -$lang['zh'][55] = 'å®å¨å°æä½³å'; -$lang['zh'][56] = 'å¨é¨æä½³å'; -$lang['zh'][57] = 'å ä¸æéæ³è¨'; -$lang['zh'][58] = 'å¤å¶å°åªè´´æ¿'; -$lang['zh'][59] = 'åå°é¡µé¢ä¸æ¹'; -$lang['zh'][60] = 'ä½ çæµè§å¨ä¸æ¯æå¤å¶å°åªè´´æ¿ã'; -$lang['zh'][61] = 'å¦æç¨åºæéè¯¯æä½ æå»ºè®®ï¼æ¬¢è¿'; -$lang['zh'][62] = 'åæèç³»'; -$lang['zh'][63] = 'Output CSS code as complete HTML document'; -$lang['zh'][64] = 'ä»£ç '; -$lang['zh'][65] = 'CSS to style CSS output'; -$lang['zh'][66] = 'You need to go to about:config in your URL bar, select \'signed.applets.codebase_principal_support\' in the filter field, and set its value to true in order to use this feature; however, be aware that doing so increases security risks.'; diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests.inc b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests.inc deleted file mode 100644 index 4982a38..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests.inc +++ /dev/null @@ -1,35 +0,0 @@ - - * - * Required - * unit-tets/Text : http://download.pear.php.net/package/Text_Diff-1.1.1.tgz - * unit-tests/simpletest/ : http://downloads.sourceforge.net/project/simpletest/simpletest/simpletest_1.0.1/simpletest_1.0.1.tar.gz?r=&ts=1289748853&use_mirror=freefr - * - */ - -error_reporting(E_ALL ^ 8192/*E_DEPRECATED*/); - -// Configuration -$simpletest_location = 'simpletest/'; -if (file_exists('../test-settings.php')) include_once '../test-settings.php'; - -// Includes -require_once '../class.csstidy.php'; -require_once 'Text/Diff.php'; -require_once 'Text/Diff/Renderer.php'; -require_once $simpletest_location . 'unit_tester.php'; -require_once $simpletest_location . 'reporter.php'; -require_once 'unit-tests/class.csstidy_reporter.php'; -require_once 'unit-tests/class.csstidy_harness.php'; -require_once 'unit-tests.inc'; - -// Test files -$test_files = array(); -require 'unit-tests/_files.php'; - -// Setup test files -$test = new GroupTest('CSSTidy unit tests'); -foreach ($test_files as $test_file) { - require_once "unit-tests/$test_file"; - list($x, $class_suffix) = explode('.', $test_file); - $test->addTestClass("csstidy_test_$class_suffix"); -} - -if (SimpleReporter::inCli()) $reporter = new TextReporter(); -else $reporter = new csstidy_reporter('UTF-8'); - -$test->run($reporter); diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/_files.php b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/_files.php deleted file mode 100644 index 076d63e..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/_files.php +++ /dev/null @@ -1,4 +0,0 @@ -'. $this->original .''. $this->final .''; - } - function _endDiff() { - return ''; - } - function _context($lines) { - return '

'. htmlspecialchars(implode("\n", $lines)) .'

'. htmlspecialchars(implode("\n", $lines)) .'

'; - } - function _added($lines) { - return '

'. htmlspecialchars(implode("\n", $lines)) .'

'; - } - function _deleted($lines) { - return '

'. htmlspecialchars(implode("\n", $lines)) .'

'; - } - function _changed($orig, $final) { - return '

'. htmlspecialchars(implode("\n", $orig)) .'

'. htmlspecialchars(implode("\n", $final)) .'

'; - } -} diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/class.csstidy_csst.php b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/class.csstidy_csst.php deleted file mode 100644 index 6d8ddad..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/class.csstidy_csst.php +++ /dev/null @@ -1,135 +0,0 @@ -css[41] (no at block) */ - var $expect = ''; - - /** Boolean whether or not to use $css->css instead for $expect */ - var $fullexpect = false; - - /** Print form of CSS that can be tested **/ - var $print = false; - var $default_media = ""; - - /** Actual result */ - var $actual; - - /** - * Loads this class from a file. - * @param $filename String filename to load - */ - function load($filename) { - $this->filename = $filename; - $fh = fopen($filename, 'r'); - $state = ''; - while (($line = fgets($fh)) !== false) { - $line = rtrim($line, "\n\r"); // normalize newlines - if (substr($line, 0, 2) == '--') { - // detected section - $state = $line; - continue; - } - if ($state === null) continue; - switch ($state) { - case '--TEST--': - $this->test = trim($line); - break; - case '--CSS--': - $this->css .= $line . "\n"; - break; - case '--FULLEXPECT--': - $this->fullexpect = true; - $this->expect .= $line . "\n"; - break; - case '--EXPECT--': - $this->expect .= $line . "\n"; - break; - case '--SETTINGS--': - list($n, $v) = array_map('trim',explode('=', $line, 2)); - $v = eval("return $v;"); - if ($n=="default_media" AND $this->print) - $this->default_media = $v; - else - $this->settings[$n] = $v; - break; - case '--PRINT--': - $this->print = true; - $this->expect .= $line . "\n"; - break; - } - } - if ($this->print) { - $this->expect = trim($this->expect); - } - else { - if ($this->expect) - $this->expect = eval("return ".$this->expect.";"); - if (!$this->fullexpect) - $this->expect = array(41=>$this->expect); - } - fclose($fh); - } - - /** - * Implements SimpleExpectation::test(). - * @param $filename Filename of test file to test. - */ - function test($filename = false) { - if ($filename) $this->load($filename); - $css = new csstidy(); - $css->set_cfg($this->settings); - $css->parse($this->css); - if ($this->print){ - $this->actual = $css->print->plain($this->default_media); - } - else{ - $this->actual = $css->css; - } - return $this->expect === $this->actual; - } - - /** - * Implements SimpleExpectation::testMessage(). - */ - function testMessage() { - $message = $this->test . ' test at '. htmlspecialchars($this->filename); - return $message; - } - - /** - * Renders the test with an HTML diff table. - */ - function render() { - $message = '

'. htmlspecialchars($this->css) .'

'; - $diff = new Text_Diff( - 'auto', - array( - explode("\n", $this->print?$this->expect:var_export($this->expect,true)), - explode("\n", $this->print?$this->actual:var_export($this->actual,true)) - ) - ); - $renderer = new Text_Diff_Renderer_parallel(); - $renderer->original = 'Expected'; - $renderer->final = 'Actual'; - $message .= $renderer->render($diff); - return $message; - } -} diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/class.csstidy_harness.php b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/class.csstidy_harness.php deleted file mode 100644 index eb6d2af..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/class.csstidy_harness.php +++ /dev/null @@ -1,21 +0,0 @@ -css[41] - -Note carefully that EXPECT is for csstidy->css[41], not csstidy->css. This -is because, by default, all declarations are placed inside the -DEFAULT_AT section. For tests that need to make use of at selectors, use - ---FULLEXPECT-- -var_export() representation of csstidy->css - -...instead. - -See also: class.csstidy_csst.php (the implementation of these tests) and -test.csst.php (the caller stub for SimpleTest) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/atvalues.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/atvalues.csst deleted file mode 100644 index e5ee74b..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/atvalues.csst +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -Test @import directive ---CSS-- -@import url('../thematic/library/styles/reset.css'); -@namespace foo url("http://www.example.com/"); -@charset "Shift-JIS"; - -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - -/* begin suggest post */ -.float-l { - float : left ; -} ---PRINT-- -@charset "Shift-JIS"; -@import "../thematic/library/styles/reset.css"; -@namespace foo "http://www.example.com/"; -@media screen { -.float-l{float:left} -} ---SETTINGS-- -template='high' -sort_properties=false -sort_selectors=false -default_media="@media screen" \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/font-face-atmedia-2.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/font-face-atmedia-2.csst deleted file mode 100644 index fd15fde..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/font-face-atmedia-2.csst +++ /dev/null @@ -1,39 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/** **/ -@font-face { - font-family: 'GenerikaRegular'; - src: url('../fonts/generikaregular-webfont.eot'); - src: url('../fonts/generikaregular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/generikaregular-webfont.woff') format('woff'), - url('../fonts/generikaregular-webfont.ttf') format('truetype'), - url('../fonts/generikaregular-webfont.svg#GenerikaRegular') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'GenerikaLight'; - src: url('../fonts/generikalight-webfont.eot'); - src: url('../fonts/generikalight-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/generikalight-webfont.woff') format('woff'), - url('../fonts/generikalight-webfont.ttf') format('truetype'), - url('../fonts/generikalight-webfont.svg#GenerikaLight') format('svg'); - font-weight: normal; - font-style: normal; -} - -p { border: none;} - ---PRINT-- -@font-face{font-family:'GenerikaRegular';src:url(../fonts/generikaregular-webfont.eot);src:url(../fonts/generikaregular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/generikaregular-webfont.woff) format("woff"),url(../fonts/generikaregular-webfont.ttf) format("truetype"),url(../fonts/generikaregular-webfont.svg#GenerikaRegular) format("svg");font-weight:400;font-style:normal} -@font-face{font-family:'GenerikaLight';src:url(../fonts/generikalight-webfont.eot);src:url(../fonts/generikalight-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/generikalight-webfont.woff) format("woff"),url(../fonts/generikalight-webfont.ttf) format("truetype"),url(../fonts/generikalight-webfont.svg#GenerikaLight) format("svg");font-weight:400;font-style:normal} -@media screen { -p{border:none} -} ---SETTINGS-- -template='high' -sort_properties=false -sort_selectors=false -default_media="@media screen" \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/font-face-atmedia.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/font-face-atmedia.csst deleted file mode 100644 index 5a17feb..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/font-face-atmedia.csst +++ /dev/null @@ -1,56 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - -/* begin suggest post */ -.float-l { - float : left ; -} - -@font-face { -font-family: GillSans; -src:url("/generic/fonts/GillSansC.otf") format('opentype'); -font-style: normal; -font-weight: bold; -} - -.font-9{ - font-size: 11px; - } - -@media print { -.font-9{ - font-size: 9px; - } -} - -.form-suggest { -height : 200px ; -background : #DEE2D0 ; -vertical-align : top; -} - - ---PRINT-- -@media screen { -.float-l{float:left} -} -@font-face{font-family:GillSans;src:url(/generic/fonts/GillSansC.otf) format("opentype");font-style:normal;font-weight:700} -@media screen { -.font-9{font-size:11px} -} -@media print { -.font-9{font-size:9px} -} -@media screen { -.form-suggest{height:200px;background:#DEE2D0;vertical-align:top} -} ---SETTINGS-- -template='high' -sort_properties=false -sort_selectors=false -default_media="@media screen" \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/ie-hacks.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/ie-hacks.csst deleted file mode 100644 index 18ac246..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/ie-hacks.csst +++ /dev/null @@ -1,30 +0,0 @@ ---TEST-- -IE Hacks Issue/5 ---SETTINGS-- -discard_invalid_properties = 0 ---CSS-- -fakeList a { -width: 100%; -display: block; -height: 30px; -padding-top: 2px; --padding-top: 0; -line-height:18px; -*line-height:17; -/line-height:none; -// background-image: url(images/cellpic3.gif); /* should be ignored */ -_background-image: url(/ttt/gf.gif); -} ---PRINT-- -fakeList a { -width:100%; -display:block; -height:30px; -padding-top:2px; --padding-top:0; -line-height:18px; -*line-height:17; -/line-height:none; -_background-image:url(/ttt/gf.gif) -} ---SETTINGS-- \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-default.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-default.csst deleted file mode 100644 index 299f276..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-default.csst +++ /dev/null @@ -1,77 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - - /* begin suggest post */ - .float-l { - float : left ; - } - - .form-suggest { - height : 200px ; - background : #DEE2D0 ; - vertical-align : top; - } - - .form-input input{ - font-size: 10px; - } - - .form-input textarea{ - font-size: 11px; - width: 350px; - } - - .form-label{ - font-size: 10px; - font-weight: bold; - line-height: 25px; - padding-right: 10px; - text-align: right; - width: 100px; - color: #39738F; - } - - .font-9{ - font-size: 9px; - } ---PRINT-- -.float-l { -float:left -} - -.form-suggest { -height:200px; -background:#DEE2D0; -vertical-align:top -} - -.form-input input { -font-size:10px -} - -.form-input textarea { -font-size:11px; -width:350px -} - -.form-label { -font-size:10px; -font-weight:700; -line-height:25px; -padding-right:10px; -text-align:right; -width:100px; -color:#39738F -} - -.font-9 { -font-size:9px -} ---SETTINGS-- -sort_properties=false -sort_selectors=false \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-high.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-high.csst deleted file mode 100644 index e31c778..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-high.csst +++ /dev/null @@ -1,52 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - - /* begin suggest post */ - .float-l { - float : left ; - } - - .form-suggest { - height : 200px ; - background : #DEE2D0 ; - vertical-align : top; - } - - .form-input input{ - font-size: 10px; - } - - .form-input textarea{ - font-size: 11px; - width: 350px; - } - - .form-label{ - font-size: 10px; - font-weight: bold; - line-height: 25px; - padding-right: 10px; - text-align: right; - width: 100px; - color: #39738F; - } - - .font-9{ - font-size: 9px; - } ---PRINT-- -.float-l{float:left} -.form-suggest{height:200px;background:#DEE2D0;vertical-align:top} -.form-input input{font-size:10px} -.form-input textarea{font-size:11px;width:350px} -.form-label{font-size:10px;font-weight:700;line-height:25px;padding-right:10px;text-align:right;width:100px;color:#39738F} -.font-9{font-size:9px} ---SETTINGS-- -template='high' -sort_properties=false -sort_selectors=false \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-highest.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-highest.csst deleted file mode 100644 index abae483..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-highest.csst +++ /dev/null @@ -1,47 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - - /* begin suggest post */ - .float-l { - float : left ; - } - - .form-suggest { - height : 200px ; - background : #DEE2D0 ; - vertical-align : top; - } - - .form-input input{ - font-size: 10px; - } - - .form-input textarea{ - font-size: 11px; - width: 350px; - } - - .form-label{ - font-size: 10px; - font-weight: bold; - line-height: 25px; - padding-right: 10px; - text-align: right; - width: 100px; - color: #39738F; - } - - .font-9{ - font-size: 9px; - } ---PRINT-- -.float-l{float:left}.form-suggest{height:200px;background:#DEE2D0;vertical-align:top}.form-input input{font-size:10px}.form-input textarea{font-size:11px;width:350px}.form-label{font-size:10px;font-weight:700;line-height:25px;padding-right:10px;text-align:right;width:100px;color:#39738F}.font-9{font-size:9px} ---SETTINGS-- -template='highest' -sort_properties=false -sort_selectors=false \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-low.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-low.csst deleted file mode 100644 index 122d53d..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/print-plain/simple-low.csst +++ /dev/null @@ -1,84 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - - /* begin suggest post */ - .float-l { - float : left ; - } - - .form-suggest { - height : 200px ; - background : #DEE2D0 ; - vertical-align : top; - } - - .form-input input{ - font-size: 10px; - } - - .form-input textarea{ - font-size: 11px; - width: 350px; - } - - .form-label{ - font-size: 10px; - font-weight: bold; - line-height: 25px; - padding-right: 10px; - text-align: right; - width: 100px; - color: #39738F; - } - - .font-9{ - font-size: 9px; - } ---PRINT-- -.float-l -{ - float:left -} - -.form-suggest -{ - height:200px; - background:#DEE2D0; - vertical-align:top -} - -.form-input input -{ - font-size:10px -} - -.form-input textarea -{ - font-size:11px; - width:350px -} - -.form-label -{ - font-size:10px; - font-weight:700; - line-height:25px; - padding-right:10px; - text-align:right; - width:100px; - color:#39738F -} - -.font-9 -{ - font-size:9px -} ---SETTINGS-- -template='low' -sort_properties=false -sort_selectors=false \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css1.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css1.csst deleted file mode 100644 index 8d0d450..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css1.csst +++ /dev/null @@ -1,138 +0,0 @@ ---TEST-- -Test CSS1 properties ---CSS-- -a { - foo:rgb(0,0,0); - bar:black; - baz:#ffaabb; - qux:#f00; - quux:blanchedalmond; - quuux:rgb(0,0,1); - background:1; - background-color:1; - background-image:1; - background-repeat:1; - background-attachment:1; - background-position:1; - border:1; - border-top:1; - border-right:1; - border-bottom:1; - border-left:1; - border-color:1; - border-style:1; - border-width:1; - border-top-width:1; - border-right-width:1; - border-left-width:1; - border-bottom-width:1; - clear:1; - clip:1; - color:1; - display:1; - float:1; - font:1; - font-family:1; - font-style:1; - font-variant:1; - font-weight:1; - font-size:1; - height:1; - left:1; - line-height:1; - list-style:1; - list-style-type:1; - list-style-image:1; - list-style-position:1; - margin:1; - margin-top:1; - margin-right:1; - margin-bottom:1; - margin-left:1; - marks:1; - overflow:1; - padding:1; - padding-top:1; - padding-right:1; - padding-bottom:1; - padding-left:1; - page-break-before:1; - page-break-after:1; - position:1; - size:1; - top:1; - text-indent:1; - text-align:1; - text-decoration:1; - letter-spacing:1; - word-spacing:1; - text-transform:1; - white-space:1; - vertical-align:1; - visibility:1; - width:1; - z-index:1; -} ---EXPECT-- -array ( - 'a' => - array ( - 'background' => '1px', - 'background-color' => '#1', - 'background-image' => '1', - 'background-repeat' => '1', - 'background-attachment' => '1', - 'background-position' => '1px', - 'border' => '1px', - 'border-top' => '1px', - 'border-right' => '1px', - 'border-bottom' => '1px', - 'border-left' => '1px', - 'border-color' => '#1', - 'border-style' => '1', - 'border-width' => '1px', - 'border-top-width' => '1px', - 'border-right-width' => '1px', - 'border-left-width' => '1px', - 'border-bottom-width' => '1px', - 'clear' => '1', - 'color' => '#1', - 'display' => '1', - 'float' => '1', - 'font' => '1', - 'font-family' => '1', - 'font-style' => '1', - 'font-variant' => '1', - 'font-weight' => '1', - 'font-size' => '1px', - 'height' => '1px', - 'line-height' => '1', - 'list-style' => '1', - 'list-style-type' => '1', - 'list-style-image' => '1', - 'list-style-position' => '1', - 'margin' => '1px', - 'margin-top' => '1px', - 'margin-right' => '1px', - 'margin-bottom' => '1px', - 'margin-left' => '1px', - 'padding' => '1px', - 'padding-top' => '1px', - 'padding-right' => '1px', - 'padding-bottom' => '1px', - 'padding-left' => '1px', - 'text-indent' => '1px', - 'text-align' => '1', - 'text-decoration' => '1', - 'letter-spacing' => '1px', - 'word-spacing' => '1px', - 'text-transform' => '1', - 'white-space' => '1', - 'vertical-align' => '1', - 'width' => '1px', - ), -) ---SETTINGS-- -discard_invalid_properties=true -optimise_shorthands=0 -css_level='CSS1' diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css2.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css2.csst deleted file mode 100644 index 1c8fdf8..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css2.csst +++ /dev/null @@ -1,265 +0,0 @@ ---TEST-- -Test CSS1 properties ---CSS-- -a { - foo:rgb(0,0,0); - bar:black; - baz:#ffaabb; - qux:#f00; - quux:blanchedalmond; - quuux:rgb(0,0,1); - background:1; - background-color:1; - background-image:1; - background-repeat:1; - background-attachment:1; - background-position:1; - border:1; - border-top:1; - border-right:1; - border-bottom:1; - border-left:1; - border-color:1; - border-top-color:1; - border-bottom-color:1; - border-left-color:1; - border-right-color:1; - border-style:1; - border-top-style:1; - border-right-style:1; - border-left-style:1; - border-bottom-style:1; - border-width:1; - border-top-width:1; - border-right-width:1; - border-left-width:1; - border-bottom-width:1; - border-collapse:1; - border-spacing:1; - bottom:1; - caption-side:1; - content:1; - clear:1; - clip:1; - color:1; - counter-reset:1; - counter-increment:1; - cursor:1; - empty-cells:1; - display:1; - direction:1; - float:1; - font:1; - font-family:1; - font-style:1; - font-variant:1; - font-weight:1; - font-stretch:1; - font-size-adjust:1; - font-size:1; - height:1; - left:1; - line-height:1; - list-style:1; - list-style-type:1; - list-style-image:1; - list-style-position:1; - margin:1; - margin-top:1; - margin-right:1; - margin-bottom:1; - margin-left:1; - marks:1; - marker-offset:1; - max-height:1; - max-width:1; - min-height:1; - min-width:1; - overflow:1; - orphans:1; - outline:1; - outline-width:1; - outline-style:1; - outline-color:1; - padding:1; - padding-top:1; - padding-right:1; - padding-bottom:1; - padding-left:1; - page-break-before:1; - page-break-after:1; - page-break-inside:1; - page:1; - position:1; - quotes:1; - right:1; - size:1; - speak-header:1; - table-layout:1; - top:1; - text-indent:1; - text-align:1; - text-decoration:1; - text-shadow:1; - letter-spacing:1; - word-spacing:1; - text-transform:1; - white-space:1; - unicode-bidi:1; - vertical-align:1; - visibility:1; - width:1; - widows:1; - z-index:1; - volume:1; - speak:1; - pause:1; - pause-before:1; - pause-after:1; - cue:1; - cue-before:1; - cue-after:1; - play-during:1; - azimuth:1; - elevation:1; - speech-rate:1; - voice-family:1; - pitch:1; - pitch-range:1; - stress:1; - richness:1; - speak-punctuation:1; - speak-numeral:1; -} ---EXPECT-- -array ( - 'a' => - array ( - 'background' => '1px', - 'background-color' => '#1', - 'background-image' => '1', - 'background-repeat' => '1', - 'background-attachment' => '1', - 'background-position' => '1px', - 'border' => '1px', - 'border-top' => '1px', - 'border-right' => '1px', - 'border-bottom' => '1px', - 'border-left' => '1px', - 'border-color' => '#1', - 'border-top-color' => '#1', - 'border-bottom-color' => '#1', - 'border-left-color' => '#1', - 'border-right-color' => '#1', - 'border-style' => '1', - 'border-top-style' => '1', - 'border-right-style' => '1', - 'border-left-style' => '1', - 'border-bottom-style' => '1', - 'border-width' => '1px', - 'border-top-width' => '1px', - 'border-right-width' => '1px', - 'border-left-width' => '1px', - 'border-bottom-width' => '1px', - 'border-collapse' => '1', - 'border-spacing' => '1px', - 'bottom' => '1px', - 'caption-side' => '1', - 'content' => '1', - 'clear' => '1', - 'clip' => '1', - 'color' => '#1', - 'counter-reset' => '1', - 'counter-increment' => '1', - 'cursor' => '1', - 'empty-cells' => '1', - 'display' => '1', - 'direction' => '1', - 'float' => '1', - 'font' => '1', - 'font-family' => '1', - 'font-style' => '1', - 'font-variant' => '1', - 'font-weight' => '1', - 'font-stretch' => '1', - 'font-size-adjust' => '1', - 'font-size' => '1px', - 'height' => '1px', - 'left' => '1px', - 'line-height' => '1', - 'list-style' => '1', - 'list-style-type' => '1', - 'list-style-image' => '1', - 'list-style-position' => '1', - 'margin' => '1px', - 'margin-top' => '1px', - 'margin-right' => '1px', - 'margin-bottom' => '1px', - 'margin-left' => '1px', - 'marks' => '1', - 'marker-offset' => '1', - 'max-height' => '1px', - 'max-width' => '1px', - 'min-height' => '1px', - 'min-width' => '1px', - 'overflow' => '1', - 'orphans' => '1', - 'outline' => '1px', - 'outline-width' => '1px', - 'outline-style' => '1', - 'outline-color' => '#1', - 'padding' => '1px', - 'padding-top' => '1px', - 'padding-right' => '1px', - 'padding-bottom' => '1px', - 'padding-left' => '1px', - 'page-break-before' => '1', - 'page-break-after' => '1', - 'page-break-inside' => '1', - 'page' => '1', - 'position' => '1', - 'quotes' => '1', - 'right' => '1px', - 'size' => '1', - 'speak-header' => '1', - 'table-layout' => '1', - 'top' => '1px', - 'text-indent' => '1px', - 'text-align' => '1', - 'text-decoration' => '1', - 'text-shadow' => '1', - 'letter-spacing' => '1px', - 'word-spacing' => '1px', - 'text-transform' => '1', - 'white-space' => '1', - 'unicode-bidi' => '1', - 'vertical-align' => '1', - 'visibility' => '1', - 'width' => '1px', - 'widows' => '1', - 'z-index' => '1', - 'volume' => '1', - 'speak' => '1', - 'pause' => '1', - 'pause-before' => '1', - 'pause-after' => '1', - 'cue' => '1', - 'cue-before' => '1', - 'cue-after' => '1', - 'play-during' => '1', - 'azimuth' => '1', - 'elevation' => '1', - 'speech-rate' => '1', - 'voice-family' => '1', - 'pitch' => '1', - 'pitch-range' => '1', - 'stress' => '1', - 'richness' => '1', - 'speak-punctuation' => '1', - 'speak-numeral' => '1', - ), -) ---SETTINGS-- -discard_invalid_properties=true -optimise_shorthands=0 -css_level='CSS2.0' \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css21.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css21.csst deleted file mode 100644 index 7d5c9f2..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css21.csst +++ /dev/null @@ -1,258 +0,0 @@ ---TEST-- -Test CSS1 properties ---CSS-- -a { - foo:rgb(0,0,0); - bar:black; - baz:#ffaabb; - qux:#f00; - quux:blanchedalmond; - quuux:rgb(0,0,1); - background:1; - background-color:1; - background-image:1; - background-repeat:1; - background-attachment:1; - background-position:1; - border:1; - border-top:1; - border-right:1; - border-bottom:1; - border-left:1; - border-color:1; - border-top-color:1; - border-bottom-color:1; - border-left-color:1; - border-right-color:1; - border-style:1; - border-top-style:1; - border-right-style:1; - border-left-style:1; - border-bottom-style:1; - border-width:1; - border-top-width:1; - border-right-width:1; - border-left-width:1; - border-bottom-width:1; - border-collapse:1; - border-spacing:1; - bottom:1; - caption-side:1; - content:1; - clear:1; - clip:1; - color:1; - counter-reset:1; - counter-increment:1; - cursor:1; - empty-cells:1; - display:1; - direction:1; - float:1; - font:1; - font-family:1; - font-style:1; - font-variant:1; - font-weight:1; - font-stretch:1; - font-size-adjust:1; - font-size:1; - height:1; - left:1; - line-height:1; - list-style:1; - list-style-type:1; - list-style-image:1; - list-style-position:1; - margin:1; - margin-top:1; - margin-right:1; - margin-bottom:1; - margin-left:1; - marks:1; - marker-offset:1; - max-height:1; - max-width:1; - min-height:1; - min-width:1; - overflow:1; - orphans:1; - outline:1; - outline-width:1; - outline-style:1; - outline-color:1; - padding:1; - padding-top:1; - padding-right:1; - padding-bottom:1; - padding-left:1; - page-break-before:1; - page-break-after:1; - page-break-inside:1; - page:1; - position:1; - quotes:1; - right:1; - size:1; - speak-header:1; - table-layout:1; - top:1; - text-indent:1; - text-align:1; - text-decoration:1; - text-shadow:1; - letter-spacing:1; - word-spacing:1; - text-transform:1; - white-space:1; - unicode-bidi:1; - vertical-align:1; - visibility:1; - width:1; - widows:1; - z-index:1; - volume:1; - speak:1; - pause:1; - pause-before:1; - pause-after:1; - cue:1; - cue-before:1; - cue-after:1; - play-during:1; - azimuth:1; - elevation:1; - speech-rate:1; - voice-family:1; - pitch:1; - pitch-range:1; - stress:1; - richness:1; - speak-punctuation:1; - speak-numeral:1; -} ---EXPECT-- -array ( - 'a' => - array ( - 'background' => '1px', - 'background-color' => '#1', - 'background-image' => '1', - 'background-repeat' => '1', - 'background-attachment' => '1', - 'background-position' => '1px', - 'border' => '1px', - 'border-top' => '1px', - 'border-right' => '1px', - 'border-bottom' => '1px', - 'border-left' => '1px', - 'border-color' => '#1', - 'border-top-color' => '#1', - 'border-bottom-color' => '#1', - 'border-left-color' => '#1', - 'border-right-color' => '#1', - 'border-style' => '1', - 'border-top-style' => '1', - 'border-right-style' => '1', - 'border-left-style' => '1', - 'border-bottom-style' => '1', - 'border-width' => '1px', - 'border-top-width' => '1px', - 'border-right-width' => '1px', - 'border-left-width' => '1px', - 'border-bottom-width' => '1px', - 'border-collapse' => '1', - 'border-spacing' => '1px', - 'bottom' => '1px', - 'caption-side' => '1', - 'content' => '1', - 'clear' => '1', - 'clip' => '1', - 'color' => '#1', - 'counter-reset' => '1', - 'counter-increment' => '1', - 'cursor' => '1', - 'empty-cells' => '1', - 'display' => '1', - 'direction' => '1', - 'float' => '1', - 'font' => '1', - 'font-family' => '1', - 'font-style' => '1', - 'font-variant' => '1', - 'font-weight' => '1', - 'font-size' => '1px', - 'height' => '1px', - 'left' => '1px', - 'line-height' => '1', - 'list-style' => '1', - 'list-style-type' => '1', - 'list-style-image' => '1', - 'list-style-position' => '1', - 'margin' => '1px', - 'margin-top' => '1px', - 'margin-right' => '1px', - 'margin-bottom' => '1px', - 'margin-left' => '1px', - 'max-height' => '1px', - 'max-width' => '1px', - 'min-height' => '1px', - 'min-width' => '1px', - 'overflow' => '1', - 'orphans' => '1', - 'outline' => '1px', - 'outline-width' => '1px', - 'outline-style' => '1', - 'outline-color' => '#1', - 'padding' => '1px', - 'padding-top' => '1px', - 'padding-right' => '1px', - 'padding-bottom' => '1px', - 'padding-left' => '1px', - 'page-break-before' => '1', - 'page-break-after' => '1', - 'page-break-inside' => '1', - 'position' => '1', - 'quotes' => '1', - 'right' => '1px', - 'speak-header' => '1', - 'table-layout' => '1', - 'top' => '1px', - 'text-indent' => '1px', - 'text-align' => '1', - 'text-decoration' => '1', - 'letter-spacing' => '1px', - 'word-spacing' => '1px', - 'text-transform' => '1', - 'white-space' => '1', - 'unicode-bidi' => '1', - 'vertical-align' => '1', - 'visibility' => '1', - 'width' => '1px', - 'widows' => '1', - 'z-index' => '1', - 'volume' => '1', - 'speak' => '1', - 'pause' => '1', - 'pause-before' => '1', - 'pause-after' => '1', - 'cue' => '1', - 'cue-before' => '1', - 'cue-after' => '1', - 'play-during' => '1', - 'azimuth' => '1', - 'elevation' => '1', - 'speech-rate' => '1', - 'voice-family' => '1', - 'pitch' => '1', - 'pitch-range' => '1', - 'stress' => '1', - 'richness' => '1', - 'speak-punctuation' => '1', - 'speak-numeral' => '1', - ), -) ---SETTINGS-- -discard_invalid_properties=true -optimise_shorthands=0 -css_level='CSS2.1' \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css3.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css3.csst deleted file mode 100644 index 239c24c..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/css3.csst +++ /dev/null @@ -1,592 +0,0 @@ ---TEST-- -Test CSS1 properties ---CSS-- -a { - foo:rgb(0,0,0); - bar:black; - baz:#ffaabb; - qux:#f00; - quux:blanchedalmond; - quuux:rgb(0,0,1); - alignment-adjust:1; - alignment-baseline:1; - animation:1; - animation-delay:1; - animation-direction:1; - animation-duration:1; - animation-iteration-count:1; - animation-name:1; - animation-play-state:1; - animation-timing-function:1; - appearance:1; - azimuth:1; - backface-visibility:1; - background:1; - background-attachment:1; - background-clip:1; - background-color:1; - background-image:1; - background-origin:1; - background-position:1; - background-repeat:1; - background-size:1; - baseline-shift:1; - binding:1; - bleed:1; - bookmark-label:1; - bookmark-level:1; - bookmark-state:1; - bookmark-target:1; - border:1; - border-bottom:1; - border-bottom-color:1; - border-bottom-left-radius:1; - border-bottom-right-radius:1; - border-bottom-style:1; - border-bottom-width:1; - border-collapse:1; - border-color:1; - border-image:1; - border-image-outset:1; - border-image-repeat:1; - border-image-slice:1; - border-image-source:1; - border-image-width:1; - border-left:1; - border-left-color:1; - border-left-style:1; - border-left-width:1; - border-radius:1; - border-right:1; - border-right-color:1; - border-right-style:1; - border-right-width:1; - border-spacing:1; - border-style:1; - border-top:1; - border-top-color:1; - border-top-left-radius:1; - border-top-right-radius:1; - border-top-style:1; - border-top-width:1; - border-width:1; - bottom:1; - box-decoration-break:1; - box-shadow:1; - box-sizing:1; - break-after:1; - break-before:1; - break-inside:1; - caption-side:1; - clear:1; - clip:1; - color:1; - color-profile:1; - column-count:1; - column-fill:1; - column-gap:1; - column-rule:1; - column-rule-color:1; - column-rule-style:1; - column-rule-width:1; - column-span:1; - column-width:1; - columns:1; - content:1; - counter-increment:1; - counter-reset:1; - crop:1; - cue:1; - cue-after:1; - cue-before:1; - cursor:1; - direction:1; - display:1; - dominant-baseline:1; - drop-initial-after-adjust:1; - drop-initial-after-align:1; - drop-initial-before-adjust:1; - drop-initial-before-align:1; - drop-initial-size:1; - drop-initial-value:1; - elevation:1; - empty-cells:1; - fit:1; - fit-position:1; - flex-align:1; - flex-flow:1; - flex-line-pack:1; - flex-order:1; - flex-pack:1; - float:1; - float-offset:1; - font:1; - font-family:1; - font-size:1; - font-size-adjust:1; - font-stretch:1; - font-style:1; - font-variant:1; - font-weight:1; - grid-columns:1; - grid-rows:1; - hanging-punctuation:1; - height:1; - hyphenate-after:1; - hyphenate-before:1; - hyphenate-character:1; - hyphenate-lines:1; - hyphenate-resource:1; - hyphens:1; - icon:1; - image-orientation:1; - image-rendering:1; - image-resolution:1; - inline-box-align:1; - left:1; - letter-spacing:1; - line-break:1; - line-height:1; - line-stacking:1; - line-stacking-ruby:1; - line-stacking-shift:1; - line-stacking-strategy:1; - list-style:1; - list-style-image:1; - list-style-position:1; - list-style-type:1; - margin:1; - margin-bottom:1; - margin-left:1; - margin-right:1; - margin-top:1; - marker-offset:1; - marks:1; - marquee-direction:1; - marquee-loop:1; - marquee-play-count:1; - marquee-speed:1; - marquee-style:1; - max-height:1; - max-width:1; - min-height:1; - min-width:1; - move-to:1; - nav-down:1; - nav-index:1; - nav-left:1; - nav-right:1; - nav-up:1; - opacity:1; - orphans:1; - outline:1; - outline-color:1; - outline-offset:1; - outline-style:1; - outline-width:1; - overflow:1; - overflow-style:1; - overflow-wrap:1; - overflow-x:1; - overflow-y:1; - padding:1; - padding-bottom:1; - padding-left:1; - padding-right:1; - padding-top:1; - page:1; - page-break-after:1; - page-break-before:1; - page-break-inside:1; - page-policy:1; - pause:1; - pause-after:1; - pause-before:1; - perspective:1; - perspective-origin:1; - phonemes:1; - pitch:1; - pitch-range:1; - play-during:1; - position:1; - presentation-level:1; - punctuation-trim:1; - quotes:1; - rendering-intent:1; - resize:1; - rest:1; - rest-after:1; - rest-before:1; - richness:1; - right:1; - rotation:1; - rotation-point:1; - ruby-align:1; - ruby-overhang:1; - ruby-position:1; - ruby-span:1; - size:1; - speak:1; - speak-header:1; - speak-numeral:1; - speak-punctuation:1; - speech-rate:1; - src:1; - stress:1; - string-set:1; - tab-size:1; - table-layout:1; - target:1; - target-name:1; - target-new:1; - target-position:1; - text-align:1; - text-align-last:1; - text-decoration:1; - text-decoration-color:1; - text-decoration-line:1; - text-decoration-skip:1; - text-decoration-style:1; - text-emphasis:1; - text-emphasis-color:1; - text-emphasis-position:1; - text-emphasis-style:1; - text-height:1; - text-indent:1; - text-justify:1; - text-outline:1; - text-shadow:1; - text-space-collapse:1; - text-transform:1; - text-underline-position:1; - text-wrap:1; - top:1; - transform:1; - transform-origin:1; - transform-style:1; - transition:1; - transition-delay:1; - transition-duration:1; - transition-property:1; - transition-timing-function:1; - unicode-bidi:1; - vertical-align:1; - visibility:1; - voice-balance:1; - voice-duration:1; - voice-family:1; - voice-pitch:1; - voice-pitch-range:1; - voice-rate:1; - voice-stress:1; - voice-volume:1; - volume:1; - white-space:1; - widows:1; - width:1; - word-break:1; - word-spacing:1; - word-wrap:1; - z-index:1; -} ---EXPECT-- -array ( - 'a' => - array ( - 'alignment-adjust' => '1', - 'alignment-baseline' => '1', - 'animation' => '1', - 'animation-delay' => '1', - 'animation-direction' => '1', - 'animation-duration' => '1', - 'animation-iteration-count' => '1', - 'animation-name' => '1', - 'animation-play-state' => '1', - 'animation-timing-function' => '1', - 'appearance' => '1', - 'azimuth' => '1', - 'backface-visibility' => '1', - 'background' => '1px', - 'background-attachment' => '1', - 'background-clip' => '1', - 'background-color' => '#1', - 'background-image' => '1', - 'background-origin' => '1', - 'background-position' => '1px', - 'background-repeat' => '1', - 'background-size' => '1px', - 'baseline-shift' => '1', - 'binding' => '1', - 'bleed' => '1', - 'bookmark-label' => '1', - 'bookmark-level' => '1', - 'bookmark-state' => '1', - 'bookmark-target' => '1', - 'border' => '1px', - 'border-bottom' => '1px', - 'border-bottom-color' => '#1', - 'border-bottom-left-radius' => '1', - 'border-bottom-right-radius' => '1', - 'border-bottom-style' => '1', - 'border-bottom-width' => '1px', - 'border-collapse' => '1', - 'border-color' => '#1', - 'border-image' => '1', - 'border-image-outset' => '1', - 'border-image-repeat' => '1', - 'border-image-slice' => '1', - 'border-image-source' => '1', - 'border-image-width' => '1', - 'border-left' => '1px', - 'border-color' => '#1', - 'border-bottom-color' => '#1', - 'border-left-color' => '#1', - 'border-left-style' => '1', - 'border-left-width' => '1px', - 'border-radius' => '1', - 'border-right' => '1px', - 'border-right-color' => '#1', - 'border-right-style' => '1', - 'border-right-style' => '1', - 'border-right-width' => '1px', - 'border-spacing' => '1px', - 'border-style' => '1', - 'border-top' => '1px', - 'border-top-color' => '#1', - 'border-top-left-radius' => '1', - 'border-top-right-radius' => '1', - 'border-top-style' => '1', - 'border-left-style' => '1', - 'border-bottom-style' => '1', - 'border-top-width' => '1px', - 'border-width' => '1px', - 'border-right-width' => '1px', - 'border-left-width' => '1px', - 'border-bottom-width' => '1px', - 'border-collapse' => '1', - 'border-spacing' => '1px', - 'bottom' => '1px', - 'box-decoration-break' => '1', - 'box-shadow' => '1', - 'box-sizing' => '1', - 'break-after' => '1', - 'break-before' => '1', - 'break-inside' => '1', - 'caption-side' => '1', - 'clear' => '1', - 'clip' => '1', - 'color' => '#1', - 'color-profile' => '1', - 'column-count' => '1', - 'column-fill' => '1', - 'column-gap' => '1px', - 'column-rule' => '1', - 'column-rule-color' => '#1', - 'column-rule-style' => '1', - 'column-rule-width' => '1', - 'column-span' => '1', - 'column-width' => '1px', - 'columns' => '1', - 'content' => '1', - 'counter-increment' => '1', - 'counter-reset' => '1', - 'crop' => '1', - 'cue' => '1', - 'cue-after' => '1', - 'cue-before' => '1', - 'cursor' => '1', - 'direction' => '1', - 'display' => '1', - 'dominant-baseline' => '1', - 'drop-initial-after-adjust' => '1', - 'drop-initial-after-align' => '1', - 'drop-initial-before-adjust' => '1', - 'drop-initial-before-align' => '1', - 'drop-initial-size' => '1', - 'drop-initial-value' => '1', - 'elevation' => '1', - 'empty-cells' => '1', - 'fit' => '1', - 'fit-position' => '1', - 'flex-align' => '1', - 'flex-flow' => '1', - 'flex-line-pack' => '1', - 'flex-order' => '1', - 'flex-pack' => '1', - 'float' => '1', - 'float-offset' => '1', - 'font' => '1', - 'font-family' => '1', - 'font-size' => '1px', - 'font-size-adjust' => '1', - 'font-stretch' => '1', - 'font-style' => '1', - 'font-variant' => '1', - 'font-weight' => '1', - 'grid-columns' => '1', - 'grid-rows' => '1', - 'hanging-punctuation' => '1', - 'height' => '1px', - 'hyphenate-after' => '1', - 'hyphenate-before' => '1', - 'hyphenate-character' => '1', - 'hyphenate-lines' => '1', - 'hyphenate-resource' => '1', - 'hyphens' => '1', - 'icon' => '1', - 'image-orientation' => '1', - 'image-rendering' => '1', - 'image-resolution' => '1', - 'inline-box-align' => '1', - 'left' => '1px', - 'letter-spacing' => '1px', - 'line-break' => '1', - 'line-height' => '1', - 'line-stacking' => '1', - 'line-stacking-ruby' => '1', - 'line-stacking-shift' => '1', - 'line-stacking-strategy' => '1', - 'list-style' => '1', - 'list-style-image' => '1', - 'list-style-position' => '1', - 'list-style-type' => '1', - 'margin' => '1px', - 'margin-bottom' => '1px', - 'margin-left' => '1px', - 'margin-right' => '1px', - 'margin-top' => '1px', - 'marker-offset' => '1', - 'marks' => '1', - 'marquee-direction' => '1', - 'marquee-loop' => '1', - 'marquee-play-count' => '1', - 'marquee-speed' => '1', - 'marquee-style' => '1', - 'max-height' => '1px', - 'max-width' => '1px', - 'min-height' => '1px', - 'min-width' => '1px', - 'move-to' => '1', - 'nav-down' => '1', - 'nav-index' => '1', - 'nav-left' => '1', - 'nav-right' => '1', - 'nav-up' => '1', - 'opacity' => '1', - 'orphans' => '1', - 'outline' => '1px', - 'outline-color' => '#1', - 'outline-offset' => '1', - 'outline-style' => '1', - 'outline-width' => '1px', - 'overflow' => '1', - 'overflow-style' => '1', - 'overflow-wrap' => '1', - 'overflow-x' => '1', - 'overflow-y' => '1', - 'padding' => '1px', - 'padding-bottom' => '1px', - 'padding-left' => '1px', - 'padding-right' => '1px', - 'padding-top' => '1px', - 'page' => '1', - 'page-break-after' => '1', - 'page-break-before' => '1', - 'page-break-inside' => '1', - 'page-policy' => '1', - 'pause' => '1', - 'pause-after' => '1', - 'pause-before' => '1', - 'perspective' => '1px', - 'perspective-origin' => '1', - 'phonemes' => '1', - 'pitch' => '1', - 'pitch-range' => '1', - 'play-during' => '1', - 'position' => '1', - 'presentation-level' => '1', - 'punctuation-trim' => '1', - 'quotes' => '1', - 'rendering-intent' => '1', - 'resize' => '1', - 'rest' => '1', - 'rest-after' => '1', - 'rest-before' => '1', - 'richness' => '1', - 'right' => '1px', - 'rotation' => '1', - 'rotation-point' => '1', - 'ruby-align' => '1', - 'ruby-overhang' => '1', - 'ruby-position' => '1', - 'ruby-span' => '1', - 'size' => '1', - 'speak' => '1', - 'speak-header' => '1', - 'speak-numeral' => '1', - 'speak-punctuation' => '1', - 'speech-rate' => '1', - 'src' => '1', - 'stress' => '1', - 'string-set' => '1', - 'tab-size' => '1', - 'table-layout' => '1', - 'target' => '1', - 'target-name' => '1', - 'target-new' => '1', - 'target-position' => '1', - 'text-align' => '1', - 'text-align-last' => '1', - 'text-decoration' => '1', - 'text-decoration-color' => '1', - 'text-decoration-line' => '1', - 'text-decoration-skip' => '1', - 'text-decoration-style' => '1', - 'text-emphasis' => '1', - 'text-emphasis-color' => '1', - 'text-emphasis-position' => '1', - 'text-emphasis-style' => '1', - 'text-height' => '1', - 'text-indent' => '1px', - 'text-justify' => '1', - 'text-outline' => '1', - 'text-shadow' => '1', - 'text-space-collapse' => '1', - 'letter-spacing' => '1px', - 'text-transform' => '1', - 'text-underline-position' => '1', - 'text-wrap' => '1', - 'top' => '1px', - 'transform' => '1', - 'transform-origin' => '1', - 'transform-style' => '1', - 'transition' => '1', - 'transition-delay' => '1', - 'transition-duration' => '1', - 'transition-property' => '1', - 'transition-timing-function' => '1', - 'unicode-bidi' => '1', - 'vertical-align' => '1', - 'visibility' => '1', - 'voice-balance' => '1', - 'voice-duration' => '1', - 'voice-family' => '1', - 'voice-pitch' => '1', - 'voice-pitch-range' => '1', - 'voice-rate' => '1', - 'voice-stress' => '1', - 'voice-volume' => '1', - 'volume' => '1', - 'white-space' => '1', - 'widows' => '1', - 'width' => '1px', - 'word-break' => '1', - 'word-spacing' => '1px', - 'word-wrap' => '1', - 'z-index' => '1', - ), -) ---SETTINGS-- -discard_invalid_properties=true -optimise_shorthands=0 -css_level='CSS3.0' \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/importance.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/importance.csst deleted file mode 100644 index fa39274..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/importance.csst +++ /dev/null @@ -1,81 +0,0 @@ ---TEST-- -Testing proper parsing of importance. ---CSS-- -a { - width: 100px; - height: 200px; -} - -a { - width: 400px !important; - height: 300px; -} - -b { - width: 100px !important; - height: 200px; -} - -b { - width: 400px; - height: 300px !important; -} - -c { - width: 100px!important; -} - -d { - width: 100px; -} - -d { - width: 200px !IMPORTANT; -} - -d { - width: 300px ! important; -} - -e { - background-image: url(http://example.com/test.png) !importANT; -} - -f { - background-image: url(http://example.com/test.png)!imPORTant; -} ---EXPECT-- -array ( - 'a' => - array ( - 'width' => '100px', - 'height' => '200px', - 'width ' => '400px!important', - 'height ' => '300px', - ), - 'b' => - array ( - 'width' => '100px!important', - 'height' => '200px', - 'width ' => '400px', - 'height ' => '300px!important', - ), - 'c' => - array ( - 'width' => '100px!important', - ), - 'd' => - array ( - 'width' => '100px', - 'width ' => '200px!important', - 'width ' => '300px!important', - ), - 'e' => - array ( - 'background-image' => 'url(http://example.com/test.png)!important', - ), - 'f' => - array ( - 'background-image' => 'url(http://example.com/test.png)!important', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/multiple-properties.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/multiple-properties.csst deleted file mode 100644 index 31283f1..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/multiple-properties.csst +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Support for multiple background properties. ---CSS-- -body { - background: linear-gradient(bottom, rgb(153,102,51) 0%, rgb(51,153,102) 30%, rgb(102,51,153) 100%); - background: -o-linear-gradient(bottom, rgb(153,102,51) 0%, rgb(51,153,102) 30%, rgb(102,51,153) 100%); - background: -moz-linear-gradient(bottom, rgb(153,102,51) 0%, rgb(51,153,102) 30%, rgb(102,51,153) 100%); - background: -webkit-linear-gradient(bottom, rgb(153,102,51) 0%, rgb(51,153,102) 30%, rgb(102,51,153) 100%); - background: -ms-linear-gradient(bottom, rgb(153,102,51) 0%, rgb(51,153,102) 30%, rgb(102,51,153) 100%); -} ---EXPECT-- -array ( - 'body' => - array ( - 'background' => 'linear-gradient(bottom,#963 0%,#396 30%,#639 100%)', - 'background ' => '-o-linear-gradient(bottom,#963 0%,#396 30%,#639 100%)', - 'background ' => '-moz-linear-gradient(bottom,#963 0%,#396 30%,#639 100%)', - 'background ' => '-webkit-linear-gradient(bottom,#963 0%,#396 30%,#639 100%)', - 'background ' => '-ms-linear-gradient(bottom,#963 0%,#396 30%,#639 100%)', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/preserve-merging.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/preserve-merging.csst deleted file mode 100644 index 67cc6cc..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/properties/preserve-merging.csst +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -Preserve merging of properties issue/2 ---CSS-- -div { - display:block; - display:inline-block; -} -.gradient { - background-image:-webkit-gradient(linear, left bottom, left top, color-stop(0.15, rgba(215,240,240,0.9)), color-stop(0.5, rgba(235,250,250,0))); - background-image: -moz-linear-gradient(bottom,rgba(215,240,240,0.9),rgba(235,250,250,0)) #ebf7f9; -} ---EXPECT-- -array ( - 'div' => - array ( - 'display' => 'block', - 'display ' => 'inline-block', - ), - '.gradient' => - array ( - 'background-image' => '-webkit-gradient(linear,left bottom,left top,color-stop(0.15,rgba(215,240,240,0.9)),color-stop(0.5,rgba(235,250,250,0)))', - 'background-image ' => '-moz-linear-gradient(bottom,rgba(215,240,240,0.9),rgba(235,250,250,0)) #ebf7f9', - ), -) ---SETTINGS-- -discard_invalid_properties=false -optimise_shorthands=0 -css_level='CSS21' diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/active.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/active.csst deleted file mode 100644 index 157e5ab..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/active.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Dynamic active selector ---CSS-- -a:active {display: inherit;} ---EXPECT-- -array ( - 'a:active' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/adjacent.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/adjacent.csst deleted file mode 100644 index f5113b1..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/adjacent.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Adjacent selector ---CSS-- -a + b {display: inherit;} ---EXPECT-- -array ( - 'a + b' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-begins.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-begins.csst deleted file mode 100644 index e84344b..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-begins.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Begins hyphen-separated attribute list selector ---CSS-- -a[foo|="en"] {display: inherit;} ---EXPECT-- -array ( - 'a[foo|="en"]' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-contains.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-contains.csst deleted file mode 100644 index 397edf2..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-contains.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Contained in space-separated attribute list selector ---CSS-- -a[foo~="warning"] {display: inherit;} ---EXPECT-- -array ( - 'a[foo~="warning"]' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-equals.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-equals.csst deleted file mode 100644 index 0d2e98a..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-equals.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Attribute equals selector ---CSS-- -a[foo="warning"] {display: inherit;} ---EXPECT-- -array ( - 'a[foo="warning"]' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-set.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-set.csst deleted file mode 100644 index cd749fd..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/attribute-set.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Attribute selector ---CSS-- -a[foo] {display: inherit;} ---EXPECT-- -array ( - 'a[foo]' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/chain.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/chain.csst deleted file mode 100644 index 1e3b639..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/chain.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Chained selector ---CSS-- -a * > div[attr="value"].class + div#id:hover {display: inherit;} ---EXPECT-- -array ( - 'a * > div[attr="value"].class + div#id:hover' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/child.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/child.csst deleted file mode 100644 index 1e80118..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/child.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Child selector ---CSS-- -table > tr {display: inherit;} ---EXPECT-- -array ( - 'table > tr' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/class.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/class.csst deleted file mode 100644 index 4cc6d20..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/class.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Class selector ---CSS-- -a.foo {display: inherit;} ---EXPECT-- -array ( - 'a.foo' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/combinator-compressed.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/combinator-compressed.csst deleted file mode 100644 index ed51bfb..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/combinator-compressed.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Combinator selector ---CSS-- -a>b {display: inherit;} ---EXPECT-- -array ( - 'a>b' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/descendant.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/descendant.csst deleted file mode 100644 index 5667aee..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/descendant.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Descendant selector ---CSS-- -table tr {display: inherit;} ---EXPECT-- -array ( - 'table tr' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst deleted file mode 100644 index c7ff919..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst +++ /dev/null @@ -1,12 +0,0 @@ ---TEST-- -Dangling combinator selector ---CSS-- -+ b {display: inherit;} -b > {font-family: inherit;} -asdf {font-size: inherit;} ---EXPECT-- -array ( -) ---SETTINGS-- -optimise_shorthands=0 -discard_invalid_selectors=1 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst deleted file mode 100644 index 5415e23..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst +++ /dev/null @@ -1,9 +0,0 @@ ---TEST-- -Duplicate combinator selector ---CSS-- -div + + b {display: inherit;} ---EXPECT-- -array ( -) ---SETTINGS-- -discard_invalid_selectors=1 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/first-child.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/first-child.csst deleted file mode 100644 index eaffb77..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/first-child.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -First child selector ---CSS-- -p:first-child {display: inherit;} ---EXPECT-- -array ( - 'p:first-child' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/focus.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/focus.csst deleted file mode 100644 index 1779496..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/focus.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Dynamic focus selector ---CSS-- -a:focus {display: inherit;} ---EXPECT-- -array ( - 'a:focus' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/grouping.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/grouping.csst deleted file mode 100644 index 78f3599..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/grouping.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Grouped selectors ---CSS-- -h1,h2,h3 {display: inherit;} ---EXPECT-- -array ( - 'h1,h2,h3' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/hover.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/hover.csst deleted file mode 100644 index 9766d5f..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/hover.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Dynamic hover selector ---CSS-- -a:hover {display: inherit;} ---EXPECT-- -array ( - 'a:hover' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/id.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/id.csst deleted file mode 100644 index e9c9e5d..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/id.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -ID selector ---CSS-- -a#foo {display: inherit;} ---EXPECT-- -array ( - 'a#foo' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/lang.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/lang.csst deleted file mode 100644 index c709f2f..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/lang.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Language selector ---CSS-- -div:lang(en) {display: inherit;} ---EXPECT-- -array ( - 'div:lang(en)' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/link.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/link.csst deleted file mode 100644 index 22f763b..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/link.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Not-visited link selector ---CSS-- -a:link {display: inherit;} ---EXPECT-- -array ( - 'a:link' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/merge-optimization.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/merge-optimization.csst deleted file mode 100644 index 5827db9..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/merge-optimization.csst +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Merge selectors optimization ---CSS-- -h1 {display: inherit;} -h2 {display: inherit;} -h3 {display: inherit;} ---EXPECT-- -array ( - 'h1,h2,h3' => - array ( - 'display' => 'inherit', - ), -) ---SETTINGS-- -merge_selectors=2 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/merge-preserve.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/merge-preserve.csst deleted file mode 100644 index dc7d80a..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/merge-preserve.csst +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -Merge selectors optimization off ---SETTINGS-- -merge_selectors = 0 ---CSS-- -h1 {display: inherit;} -h2 {display: inherit;} -h3 {display: inherit;} ---EXPECT-- -array ( - 'h1' => - array ( - 'display' => 'inherit', - ), - 'h2' => - array ( - 'display' => 'inherit', - ), - 'h3' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/pseudo-elements.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/pseudo-elements.csst deleted file mode 100644 index 7885fda..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/pseudo-elements.csst +++ /dev/null @@ -1,26 +0,0 @@ ---TEST-- -Pseudo elements selectors ---CSS-- -P:first-line { display: inherit; } -P:first-letter { font-size: inherit; } -H1:before { font-family: inherit; } -H1:after { font-weight: inherit; } ---EXPECT-- -array ( - 'P:first-line' => - array ( - 'display' => 'inherit', - ), - 'P:first-letter' => - array ( - 'font-size' => 'inherit', - ), - 'H1:before' => - array ( - 'font-family' => 'inherit', - ), - 'H1:after' => - array ( - 'font-weight' => 'inherit', - ), -) \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/same-merge-siblings.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/same-merge-siblings.csst deleted file mode 100644 index abfdff5..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/same-merge-siblings.csst +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -merge multiples siblings occurences of same seletor ---SETTINGS-- -merge_selectors = 0 ---CSS-- -h1,h2 {font-size:1em;} -h1 {display: inherit;} -h1 {font-size:2em;} ---EXPECT-- -array ( - 'h1,h2' => - array ( - 'font-size' => '1em', - ), - 'h1' => - array ( - 'display' => 'inherit', - 'font-size' => '2em', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/same-nomerge.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/same-nomerge.csst deleted file mode 100644 index 6af8493..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/same-nomerge.csst +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -Don't merge multiples occurences of same seletor ---SETTINGS-- -merge_selectors = 0 ---CSS-- -h1 {display: inherit;} -h1,h2 {font-size:1em;} -h1 {font-size:2em;} ---EXPECT-- -array ( - 'h1' => - array ( - 'display' => 'inherit', - ), - 'h1,h2' => - array ( - 'font-size' => '1em', - ), - 'h1 ' => - array ( - 'font-size' => '2em', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/simple.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/simple.csst deleted file mode 100644 index c0f637b..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/simple.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Simple selector ---CSS-- -a[foo="bar"].class#id:hover {display: inherit;} ---EXPECT-- -array ( - 'a[foo="bar"].class#id:hover' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/type.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/type.csst deleted file mode 100644 index a175b7d..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/type.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Type selector ---CSS-- -a {display: inherit;} ---EXPECT-- -array ( - 'a' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal-optimization.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal-optimization.csst deleted file mode 100644 index cade2b8..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal-optimization.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Universal selector optimization ---CSS-- -*.foo {display: inherit;} ---EXPECT-- -array ( - '.foo' => - array ( - 'display' => 'inherit', - ), -) \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal-shorthand.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal-shorthand.csst deleted file mode 100644 index 4bc3873..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal-shorthand.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Universal selector shorthand ---CSS-- -.foo {display: inherit;} ---EXPECT-- -array ( - '.foo' => - array ( - 'display' => 'inherit', - ), -) \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal.csst deleted file mode 100644 index ccb8db2..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/universal.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Universal selector ---CSS-- -* {display: inherit;} ---EXPECT-- -array ( - '*' => - array ( - 'display' => 'inherit', - ), -) \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/visited.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/visited.csst deleted file mode 100644 index fe3dce1..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/selectors/visited.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Visited link selector ---CSS-- -a:visited {display: inherit;} ---EXPECT-- -array ( - 'a:visited' => - array ( - 'display' => 'inherit', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/background-general.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/background-general.csst deleted file mode 100644 index fe78a61..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/background-general.csst +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -Test general background optimization ---CSS-- -a { - background-color: white; - background-image: url(123); - background-repeat: no-repeat; - background-position: 1px 1px; - background-attachment: scroll; -} ---EXPECT-- -array ( - 'a' => - array ( - 'background' => 'url(123) no-repeat 1px 1px #fff', - ), -) ---SETTINGS-- -optimise_shorthands=3 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/background-noopt.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/background-noopt.csst deleted file mode 100644 index 8f5191f..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/background-noopt.csst +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -Test general background optimization ---CSS-- -a { - background-color: white; - background-image: url(123); - background-repeat: no-repeat; - background-position: 1px 1px; - background-attachment: scroll; -} ---EXPECT-- -array ( - 'a' => - array ( - 'background-color' => '#fff', - 'background-image' => 'url(123)', - 'background-repeat' => 'no-repeat', - 'background-position' => '1px 1px', - 'background-attachment' => 'scroll', - ), -) ---SETTINGS-- -optimise_shorthands=1 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand1.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand1.csst deleted file mode 100644 index f9d517d..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand1.csst +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -Test general font optimization ---CSS-- - .form-suggest { - height : 200px ; - background : #DEE2D0 ; - vertical-align : top; - } - -body{ - color: #000000; - font : 11px Verdana, Arial, Helvetica, sans-serif ; - margin: 0 10px 10px 10px; - padding: 0; - overflow:auto; -} ---EXPECT-- -array ( - '.form-suggest' => - array ( - 'height' => '200px', - 'background' => '#DEE2D0', - 'vertical-align' => 'top', - ), - 'body' => - array ( - 'color' => '#000', - 'font' => '11px Verdana,Arial,Helvetica,sans-serif', - 'margin' => '0 10px 10px', - 'padding' => '0', - 'overflow' => 'auto', - ), -) ---SETTINGS-- -optimise_shorthands=1 -sort_selectors=0 -sort_properties=0 diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand2.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand2.csst deleted file mode 100644 index 6b0a703..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand2.csst +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -Test general font optimization ---CSS-- - .form-suggest { - height : 200px ; - background : #DEE2D0 ; - vertical-align : top; - } - -body{ - color: #000000; - font : 11px Verdana, Arial, Helvetica, sans-serif ; - margin: 0 10px 10px 10px; - padding: 0; - overflow:auto; -} ---EXPECT-- -array ( - '.form-suggest' => - array ( - 'height' => '200px', - 'background' => '#DEE2D0', - 'vertical-align' => 'top', - ), - 'body' => - array ( - 'color' => '#000', - 'font' => '11px Verdana,Arial,Helvetica,sans-serif', - 'margin' => '0 10px 10px', - 'padding' => '0', - 'overflow' => 'auto', - ), -) ---SETTINGS-- -optimise_shorthands=2 -sort_selectors=0 -sort_properties=0 diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand3.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand3.csst deleted file mode 100644 index 778adce..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/bugshorthand3.csst +++ /dev/null @@ -1,56 +0,0 @@ ---TEST-- -Test general font optimization ---CSS-- - .form-suggest { - height : 200px ; - background : #DEE2D0 ; - vertical-align : top; - } - -body{ - color: #000000; - font : 11px Verdana, Arial, Helvetica, sans-serif ; - margin: 0 10px 10px 10px; - padding: 0; - overflow:auto; -} -.degrade{ - background-color:#777777; - background:-webkit-gradient(linear,left top,left bottom,from(#999999),to(#666666)); - background-image:-moz-linear-gradient(top,#999999,#666666); -} - -.sans {background:none;} ---EXPECT-- -array ( -'.form-suggest' => - array ( - 'height' => '200px', - 'background' => '#DEE2D0', - 'vertical-align' => 'top', - ), - - 'body' => - array ( - 'color' => '#000', - 'font' => '11px Verdana,Arial,Helvetica,sans-serif', - 'margin' => '0 10px 10px', - 'padding' => '0', - 'overflow' => 'auto', - ), - '.degrade' => - array ( - 'background-color' => '#777', - 'background' => '-webkit-gradient(linear,left top,left bottom,from(#999),to(#666))', - 'background-image' => '-moz-linear-gradient(top,#999,#666)', -), - '.sans' => - array ( - 'background' => 'none', - ), - -) ---SETTINGS-- -optimise_shorthands=3 -sort_selectors=0 -sort_properties=0 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-face.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-face.csst deleted file mode 100644 index 1b7ff59..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-face.csst +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -Test font-face optimization (no optimization) ---CSS-- -@font-face { - src: url("fonts/share.ttf") format("truetype"); -} ---FULLEXPECT-- -array ( - ' '=> array( - '@font-face' => - array ( - 'src' => 'url(fonts/share.ttf) format("truetype")', - ), - ), -) ---SETTINGS-- -optimise_shorthands=0 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-general.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-general.csst deleted file mode 100644 index 26ac096..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-general.csst +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -Test general font optimization ---CSS-- -a { - font-weight: bold; - font-size: 12px; - line-height: 2em; - font-family: Arial, "Trebuchet MS", serif; -} -b { - font: 14px/1.25 Trebuchet MS, Arial, Tahoma, sans-serif; -} ---EXPECT-- -array ( - 'a' => - array ( - 'font' => '700 12px/2em Arial,"Trebuchet MS",serif', - ), - 'b' => - array ( - 'font' => '14px/1.25 "Trebuchet MS",Arial,Tahoma,sans-serif', - ), -) ---SETTINGS-- -optimise_shorthands=2 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-noopt.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-noopt.csst deleted file mode 100644 index 8bbc3a7..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-noopt.csst +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Test general font optimization (no optimization) ---CSS-- -a { - font-weight: bold; - font-size: 12px; - line-height: 2em; - font-family: Arial, sans-serif; -} ---EXPECT-- -array ( - 'a' => - array ( - 'font-weight' => '700', - 'font-size' => '12px', - 'line-height' => '2em', - 'font-family' => 'Arial,sans-serif', - ), -) ---SETTINGS-- -optimise_shorthands=0 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-weight-general.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-weight-general.csst deleted file mode 100644 index f1f9b84..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-weight-general.csst +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -Test font-weight optimization (full) ---CSS-- -a { - font-weight: bold; -} -b { - font-weight: normal; -} ---EXPECT-- -array ( - 'a' => - array ( - 'font-weight' => '700', - ), - 'b' => - array ( - 'font-weight' => '400', - ), -) ---SETTINGS-- -compress_font-weight=true \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-weight-noopt.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-weight-noopt.csst deleted file mode 100644 index e0ff5ee..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/font-weight-noopt.csst +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -Test font-weight optimization (no optimization) ---CSS-- -a { - font-weight: bold; -} -b { - font-weight: normal; -} ---EXPECT-- -array ( - 'a' => - array ( - 'font-weight' => 'bold', - ), - 'b' => - array ( - 'font-weight' => 'normal', - ), -) ---SETTINGS-- -compress_font-weight=false \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/margin-general.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/margin-general.csst deleted file mode 100644 index e6ac2b8..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/margin-general.csst +++ /dev/null @@ -1,46 +0,0 @@ ---TEST-- -Test margin optimization ---CSS-- -a { - margin-left: 10px; - margin-right: 10px; - margin-top: 10px; - margin-bottom: 10px; -} -b { - margin-left: 6px; - margin-right: 6px; - margin-top: 10px; - margin-bottom: 10px; -} -c { - margin-left: 6px; - margin-right: 6px; - margin-top: 10px; - margin-bottom: 1px; -} -d { - margin-left: 1px; - margin-right: 6px; - margin-top: 10px; - margin-bottom: 3px; -} ---EXPECT-- -array ( - 'a' => - array ( - 'margin' => '10px', - ), - 'b' => - array ( - 'margin' => '10px 6px', - ), - 'c' => - array ( - 'margin' => '10px 6px 1px', - ), - 'd' => - array ( - 'margin' => '10px 6px 3px 1px', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/margin-noopt.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/margin-noopt.csst deleted file mode 100644 index 60b5800..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/margin-noopt.csst +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Test margin optimization ---CSS-- -a { - margin-left: 10px; - margin-right: 10px; - margin-top: 10px; - margin-bottom: 10px; -} ---EXPECT-- -array ( - 'a' => - array ( - 'margin-left' => '10px', - 'margin-right' => '10px', - 'margin-top' => '10px', - 'margin-bottom' => '10px', - ), -) ---SETTINGS-- -optimise_shorthands=0 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/padding-general.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/padding-general.csst deleted file mode 100644 index 3260a5f..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/padding-general.csst +++ /dev/null @@ -1,46 +0,0 @@ ---TEST-- -Test padding optimization ---CSS-- -a { - padding-left: 10px; - padding-right: 10px; - padding-top: 10px; - padding-bottom: 10px; -} -b { - padding-left: 10px; - padding-right: 10px; - padding-top: 2px; - padding-bottom: 2px; -} -c { - padding-left: 10px; - padding-right: 10px; - padding-top: 2px; - padding-bottom: 3px; -} -d { - padding-left: 1px; - padding-right: 10px; - padding-top: 2px; - padding-bottom: 3px; -} ---EXPECT-- -array ( - 'a' => - array ( - 'padding' => '10px', - ), - 'b' => - array ( - 'padding' => '2px 10px', - ), - 'c' => - array ( - 'padding' => '2px 10px 3px', - ), - 'd' => - array ( - 'padding' => '2px 10px 3px 1px', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/padding-noopt.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/padding-noopt.csst deleted file mode 100644 index b992d76..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/shorthands/padding-noopt.csst +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Test padding optimization (no optimization) ---CSS-- -a { - padding-left: 10px; - padding-right: 10px; - padding-top: 10px; - padding-bottom: 10px; -} ---EXPECT-- -array ( - 'a' => - array ( - 'padding-left' => '10px', - 'padding-right' => '10px', - 'padding-top' => '10px', - 'padding-bottom' => '10px', - ), -) ---SETTINGS-- -optimise_shorthands=0 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/atmedia-decimals.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/atmedia-decimals.csst deleted file mode 100644 index f40d041..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/atmedia-decimals.csst +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -Decimal values in @media selectors should be maintained. ---CSS-- -@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-device-pixel-ratio: 1.5) { - #browserHigh { - background-image: url(http://design5279.files.wordpress.com/2012/04/browser-128.png); - } - - #internetHigh { - background-image: url(http://design5279.files.wordpress.com/2012/04/internet-128.png); - } -} ---FULLEXPECT-- -array ( - '@media only screen and (-webkit-min-device-pixel-ratio: 1.5),only screen and (min-device-pixel-ratio: 1.5) ' => - array ( - '#browserHigh' => - array ( - 'background-image' => 'url(http://design5279.files.wordpress.com/2012/04/browser-128.png)', - ), - '#internetHigh' => - array ( - 'background-image' => 'url(http://design5279.files.wordpress.com/2012/04/internet-128.png)', - ), - ), -) ---SETTINGS-- diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/complex-gradient.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/complex-gradient.csst deleted file mode 100644 index 7ba3493..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/complex-gradient.csst +++ /dev/null @@ -1,26 +0,0 @@ ---TEST-- -multiples cursor rules ---CSS-- -.degrade{ - background-color:#777777; - background:-webkit-gradient(linear,left top, left bottom,from(#999999),to(#666666)); - background-image:-moz-linear-gradient(top, #999999, #666666); - /* ne pas remplacer les couleurs ci-apres */ - filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#999999', endColorstr='#666666'); - filter:progid:DXImageTransform.Microsoft.Shadow(color=#666666, direction=146, Strength=5); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#999999', endColorstr='#666666')"; - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#ff999999',endColorstr='#ff666666'); -} ---EXPECT-- -array ( -'.degrade' => - array ( - 'background-color' => '#777', - 'background' => '-webkit-gradient(linear,left top,left bottom,from(#999),to(#666))', - 'background-image' => '-moz-linear-gradient(top,#999,#666)', - 'filter' => 'progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=\'#999999\',endColorstr=\'#666666\')', - 'filter ' => 'progid:DXImageTransform.Microsoft.Shadow(color=#666666,direction=146,Strength=5)', - '-ms-filter' => '"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=\'#999999\',endColorstr=\'#666666\')"', - 'filter ' => 'progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=\'#ff999999\',endColorstr=\'#ff666666\')', - ), -) \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/cursor.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/cursor.csst deleted file mode 100644 index 4365532..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/cursor.csst +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -multiples cursor rules ---CSS-- -a { - cursor: pointer; - cursor: hand; -} ---EXPECT-- -array ( - 'a' => - array ( - 'cursor' => 'pointer', - 'cursor ' => 'hand', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-atmedia-2.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-atmedia-2.csst deleted file mode 100644 index c4fea89..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-atmedia-2.csst +++ /dev/null @@ -1,58 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/** **/ -@font-face { - font-family: 'GenerikaRegular'; - src: url('../fonts/generikaregular-webfont.eot'); - src: url('../fonts/generikaregular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/generikaregular-webfont.woff') format('woff'), - url('../fonts/generikaregular-webfont.ttf') format('truetype'), - url('../fonts/generikaregular-webfont.svg#GenerikaRegular') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'GenerikaLight'; - src: url('../fonts/generikalight-webfont.eot'); - src: url('../fonts/generikalight-webfont.eot?#iefix') format('embedded-opentype'), - url('../fonts/generikalight-webfont.woff') format('woff'), - url('../fonts/generikalight-webfont.ttf') format('truetype'), - url('../fonts/generikalight-webfont.svg#GenerikaLight') format('svg'); - font-weight: normal; - font-style: normal; -} - -p { border: none;} - ---FULLEXPECT-- -array( - ' ' => array ( - '@font-face' => - array ( - 'font-family' => '\'GenerikaRegular\'', - 'src' => 'url(../fonts/generikaregular-webfont.eot)', - 'src ' => 'url(../fonts/generikaregular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/generikaregular-webfont.woff) format("woff"),url(../fonts/generikaregular-webfont.ttf) format("truetype"),url(../fonts/generikaregular-webfont.svg#GenerikaRegular) format("svg")', - 'font-weight' => '400', - 'font-style' => 'normal', - ), - '@font-face ' => - array ( - 'font-family' => '\'GenerikaLight\'', - 'src' => 'url(../fonts/generikalight-webfont.eot)', - 'src ' => 'url(../fonts/generikalight-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/generikalight-webfont.woff) format("woff"),url(../fonts/generikalight-webfont.ttf) format("truetype"),url(../fonts/generikalight-webfont.svg#GenerikaLight) format("svg")', - 'font-weight' => '400', - 'font-style' => 'normal', - ), - ), - 41 => array ( - 'p' => - array ( - 'border' => 'none', - ), - ), -) ---SETTINGS-- -sort_properties=false -sort_selectors=false diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-atmedia.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-atmedia.csst deleted file mode 100644 index a656864..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-atmedia.csst +++ /dev/null @@ -1,76 +0,0 @@ ---TEST-- -Test simple CSS print ---CSS-- -/* Based on the original Style Sheet for the fisubsilver v2 Theme for phpBB version 2+ -Edited by Daz - http://www.forumimages.com - last updated 26-06-03 */ -/* The content of the posts (body of text) */ -/* General page style */ - -/* begin suggest post */ -.float-l { - float : left ; -} - -@font-face { -font-family: GillSans; -src:url("/generic/fonts/GillSansC.otf") format('opentype'); -font-style: normal; -font-weight: bold; -} - -.font-9{ - font-size: 11px; - } - -@media print { -.font-9{ - font-size: 9px; - } -} - -.form-suggest { -height : 200px ; -background : #DEE2D0 ; -vertical-align : top; -} - - ---FULLEXPECT-- -array ( - 41 => array ( - '.float-l' => - array ( - 'float' => 'left', - ), - ), - ' ' => array ( - '@font-face' => array ( - 'font-family' => 'GillSans', - 'src' => 'url(/generic/fonts/GillSansC.otf) format("opentype")', - 'font-style' => 'normal', - 'font-weight' => '700', - ), - ), - 42 => array ( - '.font-9' => - array ( - 'font-size' => '11px', - ), - ), - '@media print ' => array ( - '.font-9' => - array ( - 'font-size' => '9px', - ), - ), - 43 => - array ( - '.form-suggest' => - array ( - 'height' => '200px', - 'background' => '#DEE2D0', - 'vertical-align' => 'top', - ), - ), -) ---SETTINGS-- \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-simple.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-simple.csst deleted file mode 100644 index 52ddb0e..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face-simple.csst +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -@font-face rules ---CSS-- -@font-face { - font-family: GillSans; - src:url("/generic/fonts/GillSansLightC.otf") format('opentype'); - font-style: normal; - font-weight: normal; -} - -@font-face { - font-family: GillSans; - src:url("/generic/fonts/GillSansC.otf") format('opentype'); - font-style: normal; - font-weight: bold; -} ---FULLEXPECT-- -array ( - ' ' => array( - '@font-face' => - array ( - 'font-family' => 'GillSans', - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype")', - 'font-style' => 'normal', - 'font-weight' => '400', - ), - '@font-face ' => - array ( - 'font-family' => 'GillSans', - 'src' => 'url(/generic/fonts/GillSansC.otf) format("opentype")', - 'font-style' => 'normal', - 'font-weight' => '700', - ), - ) -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face.csst deleted file mode 100644 index 1c6e5dc..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face.csst +++ /dev/null @@ -1,109 +0,0 @@ ---TEST-- -@font-face rules ---CSS-- -@font-face { - font-family: GillSans; - src:url("/generic/fonts/GillSansLightC.otf") format("opentype"); - font-style: normal; - font-weight: normal; -} - -@font-face { - font-family: GillSans; - src:url("/generic/fonts/GillSansC.otf") format('opentype'); - font-style: normal; - font-weight: bold; -} - -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format("opentype", "woff"); -} - -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format(); -} - -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format("opentype" "svg"); -} - -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format("opentype", 'woff', 'svg'); -} -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format(opentype); -} -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format(opentype woff); -} -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format(opentype, woff); -} -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format(opentype, woff, "svg"); -} -@font-face { - src:url("/generic/fonts/GillSansLightC.otf") format(opentype woff, "svg"); -} -@font-face { - src:url("/generic/fonts/GillSans LightC.otf") format(opentype,woff); -} ---FULLEXPECT-- -array ( - ' ' => array( - '@font-face' => - array ( - 'font-family' => 'GillSans', - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype")', - 'font-style' => 'normal', - 'font-weight' => '400', - ), - '@font-face ' => - array ( - 'font-family' => 'GillSans', - 'src' => 'url(/generic/fonts/GillSansC.otf) format("opentype")', - 'font-style' => 'normal', - 'font-weight' => '700', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype","woff")', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf)', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype","svg")', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype","woff","svg")', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype")', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype","woff")', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype","woff")', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype","woff","svg")', - ), - '@font-face ' => - array ( - 'src' => 'url(/generic/fonts/GillSansLightC.otf) format("opentype","woff","svg")', - ), - '@font-face ' => - array ( - 'src' => 'url("/generic/fonts/GillSans LightC.otf") format("opentype","woff")', - ), - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face_woff.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face_woff.csst deleted file mode 100644 index 6555c5c..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/font-face_woff.csst +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -@font-face rules with woff https://github.com/Cerdic/CSSTidy/issues/issue/1 ---CSS-- -@font-face { - font-family: "Unibody8SmallCaps Regular"; - src:url('fonts/unibody_8-smallcaps-webfont.woff') format('woff'); -} ---FULLEXPECT-- -array ( - ' ' => array( - '@font-face' => - array ( - 'font-family' => '"Unibody8SmallCaps Regular"', - 'src' => 'url(fonts/unibody_8-smallcaps-webfont.woff) format("woff")', - ), - ) -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/hex.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/hex.csst deleted file mode 100644 index e39892d..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/hex.csst +++ /dev/null @@ -1,10 +0,0 @@ ---TEST-- ---CSS-- -li:before { content: "\00BB \0020"; } ---EXPECT-- -array ( - 'li:before' => - array ( - 'content' => '"\\00BB \\0020"', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/ie-hacks-sort.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/ie-hacks-sort.csst deleted file mode 100644 index ca7d5e3..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/ie-hacks-sort.csst +++ /dev/null @@ -1,34 +0,0 @@ ---TEST-- -IE Hacks Sort Issue/6 ---SETTINGS-- -discard_invalid_properties = 0 -sort_properties = true ---CSS-- -fakeList a { -width: 100%; -display: block; -height: 30px; -padding-top: 2px; --padding-top: 0; -line-height:18px; --moz-border-radius:10px; -*line-height:17; -/line-height:none; -_background-image: url(/ttt/gf.gif); -} ---EXPECT-- -array ( -'fakeList a' => - array ( - 'width' => '100%', - 'display' => 'block', - 'height' => '30px', - 'padding-top' => '2px', - '-padding-top' => '0', - 'line-height' => '18px', - '-moz-border-radius' => '10px', - '*line-height' => '17', - '/line-height' => 'none', - '_background-image' => 'url(/ttt/gf.gif)', - ), -) \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/ie-hacks.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/ie-hacks.csst deleted file mode 100644 index b6904cc..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/ie-hacks.csst +++ /dev/null @@ -1,33 +0,0 @@ ---TEST-- -IE Hacks Issue/5 ---SETTINGS-- -discard_invalid_properties = 0 ---CSS-- -fakeList a { -width: 100%; -display: block; -height: 30px; -padding-top: 2px; --padding-top: 0; -line-height:18px; -*line-height:17; -/line-height:none; -// background-image: url(images/cellpic3.gif); /* should be ignored in print version*/ -_background-image: url(/ttt/gf.gif); -} ---EXPECT-- -array ( - 'fakeList a' => - array ( - 'width' => '100%', - 'display' => 'block', - 'height' => '30px', - 'padding-top' => '2px', - '-padding-top' => '0', - 'line-height' => '18px', - '*line-height' => '17', - '/line-height' => 'none', - '//background-image' => 'url(images/cellpic3.gif)', - '_background-image' => 'url(/ttt/gf.gif)', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/iezoom.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/iezoom.csst deleted file mode 100644 index b3e469b..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/iezoom.csst +++ /dev/null @@ -1,13 +0,0 @@ ---TEST-- -IE Zoom ---CSS-- -#content { -zoom: 1; -} ---EXPECT-- -array ( - '#content' => - array ( - 'zoom' => '1', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/newlines.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/newlines.csst deleted file mode 100644 index 866a6fc..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/newlines.csst +++ /dev/null @@ -1,77 +0,0 @@ ---TEST-- -@font-face rules ---CSS-- -a { - background: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(153,102,51)), - color-stop(0.3, rgb(51,153,102)), - color-stop(1, rgb(102,51,153)) - ); - content: "ABC -123 -DEF -GHI"; -} -b { - content: "ABC\A123"; -} -i { - content: 'ABC -123\ADEF'; -} - -u { - background: parenthetical( - "string 1", - "string -2", - 'string 3', - 'string "4', - 'string "5"', - "string '6", - "string (7)", - "string 8)", - ( - ( - ( - ( - ("boo") - ) - ) - ) - ), - ( - ( - ( - ( - ("boo ba") - ) - ) - ) - ) - -); -} ---EXPECT-- -array ( - 'a' => - array ( - 'background' => '-webkit-gradient(linear,left bottom,left top,color-stop(0,#963),color-stop(0.3,#396),color-stop(1,#639))', - 'content' => '"ABC\\A123\\ADEF\\AGHI"', - ), - 'b' => - array ( - 'content' => '"ABC\\A123"', - ), - 'i' => - array ( - 'content' => '\'ABC\\A123\\ADEF\'', - ), - 'u' => - array ( - 'background' => 'parenthetical("string 1","string\\A2",\'string 3\',\'string "4\',\'string "5"\',"string \'6","string (7)","string 8)",(((((boo))))),((((("boo ba"))))))', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/same-atmedia-merge.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/same-atmedia-merge.csst deleted file mode 100644 index daa92a5..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/same-atmedia-merge.csst +++ /dev/null @@ -1,50 +0,0 @@ ---TEST-- -Don't merge multiples occurences of same @media ---SETTINGS-- -merge_selectors = 0 ---CSS-- -BODY { -color: black; -} - -@media screen, tv, projection { -BODY { -background-color: red; -} -} - -@media screen, tv, projection { -BODY { -color: green; -} -} - -BODY { -background-color: white; -} - ---FULLEXPECT-- -array ( - 41 => - array ( - 'BODY' => - array ( - 'color' => '#000', - ), - ), - '@media screen,tv,projection ' => - array ( - 'BODY' => - array ( - 'background-color' => 'red', - 'color' => 'green', - ), - ), - 42 => - array ( - 'BODY' => - array ( - 'background-color' => '#fff', - ), - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/same-atmedia-nomerge.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/same-atmedia-nomerge.csst deleted file mode 100644 index c754838..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/special/same-atmedia-nomerge.csst +++ /dev/null @@ -1,56 +0,0 @@ ---TEST-- -Don't merge multiples occurences of same @media ---SETTINGS-- -merge_selectors = 0 ---CSS-- -@media screen, tv, projection { -BODY { -background-color: red; -} -} - -BODY { -color: black; -} - -@media screen, tv, projection { -BODY { -color: green; -} -} - -BODY { -background-color: white; -} - ---FULLEXPECT-- -array ( - '@media screen,tv,projection ' => - array ( - 'BODY' => - array ( - 'background-color' => 'red', - ), - ), - 41 => - array ( - 'BODY' => - array ( - 'color' => '#000', - ), - ), - '@media screen,tv,projection ' => - array ( - 'BODY' => - array ( - 'color' => 'green', - ), - ), - 42 => - array ( - 'BODY' => - array ( - 'background-color' => '#fff', - ), - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/colors.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/colors.csst deleted file mode 100644 index a4e3da1..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/colors.csst +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -Test color optimisation ---CSS-- -a { - foo:rgb(0,0,0); - bar:black; - baz:#ffaabb; - qux:#f00; - quux:blanchedalmond; - quuux:rgb(0,0,1); -} ---EXPECT-- -array ( - 'a' => - array ( - 'foo' => '#000', - 'bar' => '#000', - 'baz' => '#fab', - 'qux' => 'red', - 'quux' => '#ffebcd', - 'quuux' => '#000001', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/font-family.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/font-family.csst deleted file mode 100644 index f7b02d7..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/font-family.csst +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -Tests numeric values: Floating point ---CSS-- -a { font:10px Arial, sans-serif} -b { font:10px "Arial", "Trebuchet MS","sans-serif"} -em { font:10px/normal "Arial", "Trebuchet MS","sans-serif"} -i { font:10px/1.5em "Arial", "Trebuchet MS","sans-serif"} ---EXPECT-- -array ( - 'a' => - array ( - 'font' => '10px Arial,sans-serif', - ), - 'b' => - array ( - 'font' => '10px Arial,"Trebuchet MS",sans-serif', - ), - 'em' => - array ( - 'font' => '10px/normal Arial,"Trebuchet MS",sans-serif', - ), - 'i' => - array ( - 'font' => '10px/1.5em Arial,"Trebuchet MS",sans-serif', - ), -) ---SETTINGS-- -optimise_shorthands=2 diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/important.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/important.csst deleted file mode 100644 index 032ab70..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/important.csst +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -Tests !important ---CSS-- -a { - color:red !important; - size:2 ! important; - foo:2! important; - bar:2!important; -} ---EXPECT-- -array ( - 'a' => - array ( - 'color' => 'red!important', - 'size' => '2!important', - 'foo' => '2!important', - 'bar' => '2!important', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-float.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-float.csst deleted file mode 100644 index 6805c5a..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-float.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Tests numeric values: Floating point ---CSS-- -a { font-size:01.5010em } ---EXPECT-- -array ( - 'a' => - array ( - 'font-size' => '1.501em', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-leadingzero.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-leadingzero.csst deleted file mode 100644 index 5dfd9e1..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-leadingzero.csst +++ /dev/null @@ -1,14 +0,0 @@ ---TEST-- -Tests numeric values: Leading zeros ---CSS-- -a { font-size:0001em; foo:00.1em; line-height:00.1; bar:-00.1;} ---EXPECT-- -array ( - 'a' => - array ( - 'font-size' => '1em', - 'foo' => '.1em', - 'line-height' => '.1', - 'bar' => '-.1', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-missingunit.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-missingunit.csst deleted file mode 100644 index b43e3aa..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-missingunit.csst +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Tests numeric values: Missing unit ---CSS-- -a { -font-size:1.0; -line-height:1.0; -color:123456; -font:1em/1.0 verdana; -} ---EXPECT-- -array ( - 'a' => - array ( - 'font-size' => '1px', - 'line-height' => '1', - 'color' => '#123456', - 'font' => '1em/1 verdana', - ), -) ---SETTINGS-- -optimise_shorthands=0 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-missingzero.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-missingzero.csst deleted file mode 100644 index 6e7ef2e..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-missingzero.csst +++ /dev/null @@ -1,14 +0,0 @@ ---TEST-- -Tests numeric values: Missing zero ---CSS-- -a { font-size:0.1em } -b { font-size:.1em } ---EXPECT-- -array ( - 'a,b' => - array ( - 'font-size' => '.1em', - ), -) ---SETTINGS-- -merge_selectors=2 \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-signed.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-signed.csst deleted file mode 100644 index 0659ea3..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-signed.csst +++ /dev/null @@ -1,16 +0,0 @@ ---TEST-- -Tests numeric values: Signed ---CSS-- -a { font-size:-1em } -b { font-size:+1em } ---EXPECT-- -array ( - 'a' => - array ( - 'font-size' => '-1em', - ), - 'b' => - array ( - 'font-size' => '1em', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-trailingzero.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-trailingzero.csst deleted file mode 100644 index 24287c9..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-trailingzero.csst +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Tests numeric values: Trailing zeros ---CSS-- -a { font-size:1.000em } ---EXPECT-- -array ( - 'a' => - array ( - 'font-size' => '1em', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-zero.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-zero.csst deleted file mode 100644 index 620e36d..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/number-zero.csst +++ /dev/null @@ -1,12 +0,0 @@ ---TEST-- -Tests numeric values: Zero ---CSS-- -a { font-size:0px; line-height:00.00 } ---EXPECT-- -array ( - 'a' => - array ( - 'font-size' => '0', - 'line-height' => '0', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/quoted-strings.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/quoted-strings.csst deleted file mode 100644 index 61ccc8f..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/values/quoted-strings.csst +++ /dev/null @@ -1,29 +0,0 @@ ---TEST-- -Ensure that quoted strings are left unchanged. ---CSS-- -a:after { - content: "This is a typical string with words, commas, and a period."; -} - -b:after { - content: "This string has CSS-like content: foo { color: rgb(0, 0, 0); }."; -} - -c:after { - content: 'This string uses single quotes, not double (").'; -} ---EXPECT-- -array ( - 'a:after' => - array ( - 'content' => '"This is a typical string with words, commas, and a period."', - ), - 'b:after' => - array ( - 'content' => '"This string has CSS-like content: foo { color: rgb(0, 0, 0); }."', - ), - 'c:after' => - array ( - 'content' => '\'This string uses single quotes, not double (").\'', - ), -) diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/vendor-prefixed/webkit-gradient.csst b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/vendor-prefixed/webkit-gradient.csst deleted file mode 100644 index 3ddf50c..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/csst/vendor-prefixed/webkit-gradient.csst +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- --webkit-gradient properties issue/3 ---CSS-- -.linear { - background: -webkit-gradient(linear, left top, left bottom, from(#00abeb), to(#fff), color-stop(0.5, #fff), color-stop(0.5, #66cc00)); -} -.radial { - background: -webkit-gradient(radial, 45 45, 10, 52 50, 30, from(#A7D30C), to(rgba(1,159,98,0)), color-stop(90%, #019F62)); -} ---EXPECT-- -array ( - '.linear' => - array ( - 'background' => '-webkit-gradient(linear,left top,left bottom,from(#00abeb),to(#fff),color-stop(0.5,#fff),color-stop(0.5,#6c0))', - ), - '.radial' => - array ( - 'background' => '-webkit-gradient(radial,45 45,10,52 50,30,from(#A7D30C),to(rgba(1,159,98,0)),color-stop(90%,#019F62))', - ), -) ---SETTINGS-- -discard_invalid_properties=false -optimise_shorthands=0 -css_level='CSS21' \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/test.csst.php b/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/test.csst.php deleted file mode 100644 index 3b007ac..0000000 --- a/www/plugins-dist/compresseur/lib/csstidy/testing/unit-tests/test.csst.php +++ /dev/null @@ -1,21 +0,0 @@ -assert($expectation, $filename, '%s'); - // this is necessary because SimpleTest doesn't support - // HTML messages; this probably should be in the reporter. - // This is *not* compatible with XmlReporter - if (!$result) echo $expectation->render(); - } - } -} diff --git a/www/plugins-dist/compresseur/lib/minify_html/class.minify_html.php b/www/plugins-dist/compresseur/lib/minify_html/class.minify_html.php index 4cb01aa..e088887 100644 --- a/www/plugins-dist/compresseur/lib/minify_html/class.minify_html.php +++ b/www/plugins-dist/compresseur/lib/minify_html/class.minify_html.php @@ -67,14 +67,18 @@ class Minify_HTML_SPIP extends Minify_HTML { * This is a heavy regex-based removal of whitespace, unnecessary comments and * tokens. IE conditional comments are preserved. There are also options to have * STYLE and SCRIPT blocks compressed by callback functions. + * https://github.com/mrclay/minify/blob/master/min/lib/Minify/HTML.php * * A test suite is available. - * http://code.google.com/p/minify/source/browse/trunk/min/lib/Minify/HTML.php - * + * * @package Minify * @author Stephen Clay */ class Minify_HTML { + /** + * @var boolean + */ + protected $_jsCleanComments = true; /** * "Minify" an HTML page @@ -95,7 +99,7 @@ class Minify_HTML { * @return string */ public static function minify($html, $options = array()) { - $min = new Minify_HTML($html, $options); + $min = new self($html, $options); return $min->process(); } @@ -113,6 +117,8 @@ class Minify_HTML { * 'jsMinifier' : (optional) callback function to process content of SCRIPT * elements. Note: the type attribute is ignored. * + * 'jsCleanComments' : (optional) whether to remove HTML comments beginning and end of script block + * * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If * unset, minify will sniff for an XHTML doctype. * @@ -130,6 +136,9 @@ class Minify_HTML { if (isset($options['jsMinifier'])) { $this->_jsMinifier = $options['jsMinifier']; } + if (isset($options['jsCleanComments'])) { + $this->_jsCleanComments = (bool)$options['jsCleanComments']; + } } @@ -149,13 +158,13 @@ class Minify_HTML { // replace SCRIPTs (and minify) with placeholders $this->_html = preg_replace_callback( - '/(\\s*)(]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i' + '/(\\s*)]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i' ,array($this, '_removeScriptCB') ,$this->_html); // replace STYLEs (and minify) with placeholders $this->_html = preg_replace_callback( - '/\\s*(]*?>)([\\s\\S]*?)<\\/style>\\s*/i' + '/\\s*]*>)([\\s\\S]*?)<\\/style>\\s*/i' ,array($this, '_removeStyleCB') ,$this->_html); @@ -166,16 +175,22 @@ class Minify_HTML { ,$this->_html); // replace PREs with placeholders - $this->_html = preg_replace_callback('/\\s*(]*?>[\\s\\S]*?<\\/pre>)\\s*/i' + $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/i' ,array($this, '_removePreCB') ,$this->_html); // replace TEXTAREAs with placeholders $this->_html = preg_replace_callback( - '/\\s*(]*?>[\\s\\S]*?<\\/textarea>)\\s*/i' + '/\\s*]*?>[\\s\\S]*?<\\/textarea>)\\s*/i' ,array($this, '_removeTextareaCB') ,$this->_html); + // replace INPUTs with placeholders + $this->_html = preg_replace_callback( + '/\\s*]*?>)\\s*/i' + ,array($this, '_removeInputCB') + ,$this->_html); + // trim each line. // @todo take into account attribute values that span multiple lines. // 2 regexp because merging un /^\\s+|\\s+$/m also del a lot of newline chars ??? @@ -190,9 +205,9 @@ class Minify_HTML { .'|ul)\\b[^>]*>)/i', '$1', $this->_html); // remove ws outside of all elements - $this->_html = preg_replace_callback( - '/>([^<]+)_html = preg_replace( + '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?$1$2$3<' ,$this->_html); // use newlines before 1st attribute in open tags (to limit line lengths) @@ -204,6 +219,12 @@ class Minify_HTML { ,array_values($this->_placeholders) ,$this->_html ); + // issue 229: multi-pass to catch scripts that didn't get replaced in textareas + $this->_html = str_replace( + array_keys($this->_placeholders) + ,array_values($this->_placeholders) + ,$this->_html + ); return $this->_html; } @@ -227,24 +248,24 @@ class Minify_HTML { protected $_cssMinifier = null; protected $_jsMinifier = null; - protected function _outsideTagCB($m) - { - return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; - } - protected function _removePreCB($m) { - return $this->_reservePlace($m[1]); + return $this->_reservePlace("_reservePlace("_reservePlace($m[1]); + return $this->_reservePlace("\\s*$)/', '', $css); @@ -266,7 +287,7 @@ class Minify_HTML { protected function _removeScriptCB($m) { - $openScript = $m[2]; + $openScript = "\\s*$)/', '', $js); + if ($this->_jsCleanComments) { + $js = preg_replace('/(?:^\\s*\\s*$)/', '', $js); + } // remove CDATA section markers $js = $this->_removeCdata($js); @@ -302,4 +325,4 @@ class Minify_HTML { { return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str)); } -} +} \ No newline at end of file diff --git a/www/plugins-dist/compresseur/paquet.xml b/www/plugins-dist/compresseur/paquet.xml index 86c2a50..dc084d8 100644 --- a/www/plugins-dist/compresseur/paquet.xml +++ b/www/plugins-dist/compresseur/paquet.xml @@ -1,7 +1,7 @@ - + diff --git a/www/plugins-dist/filtres_images/favicon.ico.html b/www/plugins-dist/filtres_images/favicon.ico.html index 03004d8..a670679 100644 --- a/www/plugins-dist/filtres_images/favicon.ico.html +++ b/www/plugins-dist/filtres_images/favicon.ico.html @@ -1,7 +1,13 @@ #HTTP_HEADER{Content-Type: image/x-icon} -[(#CHEMIN{favicon.ico}|sinon{[(#LOGO_SITE_SPIP +#HTTP_HEADER{Content-Transfer-Encoding: binary} + \ No newline at end of file diff --git a/www/plugins-dist/filtres_images/paquet.xml b/www/plugins-dist/filtres_images/paquet.xml index 309b309..99015d5 100644 --- a/www/plugins-dist/filtres_images/paquet.xml +++ b/www/plugins-dist/filtres_images/paquet.xml @@ -1,7 +1,7 @@ '', #ne sert pas dans ce cas, on la vide pour mutualiser le cache 'editable' => false, diff --git a/www/plugins-dist/forum/inc/forum_insert.php b/www/plugins-dist/forum/inc/forum_insert.php index 85b8473..32b90ed 100644 --- a/www/plugins-dist/forum/inc/forum_insert.php +++ b/www/plugins-dist/forum/inc/forum_insert.php @@ -63,15 +63,16 @@ function inc_forum_insert_dist($objet, $id_objet, $id_forum, $force_statut = NUL } spip_log("insertion de forum $force_statut sur $objet $id_objet (+$id_forum)", 'forum'); - $c = array('statut'=>'off'); - $c['objet'] = $objet; - $c['id_objet'] = $id_objet; + include_spip('inc/filtres'); include_spip('inc/modifier'); $champs = objet_info('forum','champs_editables'); $c = collecter_requests($champs, array()); - + + $c['statut'] = 'off'; + $c['objet'] = $objet; + $c['id_objet'] = $id_objet; $c['auteur'] = sinon($GLOBALS['visiteur_session']['nom'], $GLOBALS['visiteur_session']['session_nom']); $c['email_auteur'] = sinon($GLOBALS['visiteur_session']['email'], diff --git a/www/plugins-dist/forum/lang/forum.xml b/www/plugins-dist/forum/lang/forum.xml index eeeb5fa..df57ccd 100644 --- a/www/plugins-dist/forum/lang/forum.xml +++ b/www/plugins-dist/forum/lang/forum.xml @@ -17,14 +17,14 @@ - + - - - + + + @@ -34,7 +34,9 @@ - + + + @@ -58,8 +60,8 @@ - + diff --git a/www/plugins-dist/forum/lang/forum_eu.php b/www/plugins-dist/forum/lang/forum_eu.php index 247d913..972d077 100644 --- a/www/plugins-dist/forum/lang/forum_eu.php +++ b/www/plugins-dist/forum/lang/forum_eu.php @@ -8,103 +8,103 @@ if (!defined('_ECRIRE_INC_VERSION')) return; $GLOBALS[$GLOBALS['idx_lang']] = array( // A - 'aucun_message_forum' => 'Aucun message de forum', # NEW + 'aucun_message_forum' => 'Iruzkinik ez', // B - 'bouton_radio_articles_futurs' => 'geroko artikulueisoilik (ez du aldatzen datu-basea).', - 'bouton_radio_articles_tous' => 'artikulu guztieisalbuespenik gabe.', + 'bouton_radio_articles_futurs' => 'geroko artikuluei soilik (ez du aldatzen datu-basea).', + 'bouton_radio_articles_tous' => 'artikulu guztiei, salbuespenik gabe.', 'bouton_radio_articles_tous_sauf_forum_desactive' => 'artikuluguztiei, desaktibatutako foroan daudenei izan ezik.', - 'bouton_radio_enregistrement_obligatoire' => 'Izena ematea derrigorrezkoa da (foroanparte hartu ahal izateko, inskripzioa egin behar da posta elektronikoaren helbideaemanez).', - 'bouton_radio_moderation_priori' => 'Aurretiaz moderatua (ekarpenak agerian egongodira lekuaren administrazio-eskubideak dituen pertsona batek onartu eta gero).', # MODIF + 'bouton_radio_enregistrement_obligatoire' => 'Izena ematea derrigorrezkoa da (foroan parte hartu ahal izateko, inskripzioa egin behar da posta elektronikoaren helbidea emanez).', + 'bouton_radio_moderation_priori' => 'Aurretiaz moderatua (ekarpenak agerian egongodira lekuaren administrazio-eskubideak dituen pertsona batek onartu eta gero).', 'bouton_radio_modere_abonnement' => 'Moderatua (harpidedunentzat soilik)', - 'bouton_radio_modere_posteriori' => 'gerora moderatua', # MODIF - 'bouton_radio_modere_priori' => 'aurretiaz moderatua', # MODIF - 'bouton_radio_publication_immediate' => 'Mezuen bat-batekoargitaratzea (erakarpenak agerian egongo dira igorri bezain laister, gero administraziotikkendu daitezke).', + 'bouton_radio_modere_posteriori' => 'gerora moderatua', + 'bouton_radio_modere_priori' => 'aurretiaz moderatua', + 'bouton_radio_publication_immediate' => 'Mezuen bat-bateko argitaratzea (erakarpenak agerian egongo dira igorri bezain laister, gero administraziotik kendu daitezke).', // D 'documents_interdits_forum' => 'Dokumentuak debekatuak dira foroetan', // E - 'erreur_enregistrement_message' => 'Votre message n\'a pas pu Ãªtre enregistrÃ© en raison d\'un problÃ¨me technique', # NEW + 'erreur_enregistrement_message' => 'Zure mezuaren garbaketak huts egin du, akats tekniko batengatik', // F 'form_pet_message_commentaire' => 'Mezurik, azalpenik ?', 'forum' => 'Foroa', 'forum_acces_refuse' => 'Dagoeneko ezin zara foro hauetan sartu.', 'forum_attention_dix_caracteres' => 'Adi! zure mezuak hamar karaktere baino gutxiago ditu', - 'forum_attention_message_non_poste' => 'Attention, vous n\'avez pas postÃ© votre message !', # NEW - 'forum_attention_nb_caracteres_mini' => 'AttentionÂ ! votre message doit contenir au moins @min@ caractÃ¨res.', # NEW + 'forum_attention_message_non_poste' => 'Kontuz, mezua ez duzu igorria !', + 'forum_attention_nb_caracteres_mini' => 'KontuzÂ ! zure mezuak @min@ karaketre bederen eduki behar ditu.', 'forum_attention_trois_caracteres' => 'Adi! zure izenburuak hiru karaktere baino gutxiago ditu.', - 'forum_attention_trop_caracteres' => 'kontuzÂ ! zure mezua luzeegi da (@compte@ caractÃ¨res)Â : grabatua izateko, ez ditu @max@ karaktero baino gehiago izan behar.', # MODIF + 'forum_attention_trop_caracteres' => 'kontuzÂ ! zure mezua luzeegi da (@compte@ caractÃ¨res)Â : grabatua izateko, ez ditu @max@ karaktero baino gehiago izan behar.', 'forum_avez_selectionne' => 'Aukeratu egin duzu:', 'forum_cliquer_retour' => 'Jarraitzeko hemen klik egin.', 'forum_forum' => 'foroa', 'forum_info_modere' => 'Foro hau aurretiaz moderaturik dago : -Zure ekarpena gunearen administratzaileak onartu ondoren soilik agerian izango da.', # MODIF - 'forum_lien_hyper' => 'Hipertestu lotura (aukeratzekoa)', # MODIF - 'forum_message' => 'Votre message', # NEW +Zure ekarpena gunearen administratzaileak onartu ondoren soilik agerian izango da.', + 'forum_lien_hyper' => 'Hiperesteka (aukeratzekoa)', + 'forum_message' => 'Zure mezua', 'forum_message_definitif' => 'Behin-betiko mezua : gunera igorri', - 'forum_message_trop_long' => 'Zure mezua luzeegia da. Gehienez ere 20000 karaktere onartzen dira.', # MODIF + 'forum_message_trop_long' => 'Zure mezua luzeegia da. 20 000 karaktere gehienez onartzen dira.', 'forum_ne_repondez_pas' => 'Ez erantzun mezu elektroniko honi, baizik eta hurrengo helbidean dagoen foroan:', 'forum_page_url' => '(Zure mezua interneten argitaratutako artikulu bati buruzkoa baldin bada, edo informazio gehiago duen orrialde bati buruzkoa, adieraz itzazu jarraian orrialdearen izena bai eta URL helbidea ere).', - 'forum_permalink' => 'Lien permanent vers le commentaire', # NEW - 'forum_poste_par' => 'Â« @titre@ Â» artikuluaren ondotik @parauteur@-k bidalitako mezua.', # MODIF - 'forum_poste_par_court' => 'Message postÃ©@parauteur@.', # NEW - 'forum_poste_par_generique' => 'Message postÃ©@parauteur@ (@objet@ Â«Â @titre@Â Â»).', # NEW - 'forum_qui_etes_vous' => 'Nor zara zu? (aukeratzekoa)', # MODIF - 'forum_saisie_texte_info' => 'Ce formulaire accepte les raccourcisÂ SPIP [->url] {{gras}} {italique} <quote> <code> et le codeÂ HTML <q> <del> <ins>. Pour crÃ©er des paragraphes, laissez simplement des lignes vides.', # NEW - 'forum_texte' => 'Zure mezuaren testua:', # MODIF - 'forum_titre' => 'Izenburua :', # MODIF - 'forum_url' => 'URL :', # MODIF + 'forum_permalink' => 'Iruzkinari lotura iraunkorra', + 'forum_poste_par' => 'Â« @titre@ Â» artikuluaren ondotik @parauteur@-k bidalitako mezua.', + 'forum_poste_par_court' => 'Mezu igorlea @parauteur@.', + 'forum_poste_par_generique' => 'Iruzkina igorria @parauteur@ (@objet@ Â«Â @titre@Â Â»).', + 'forum_qui_etes_vous' => 'Nor zara ? (aukerazkoa)', + 'forum_saisie_texte_info' => 'Inprimaki honek Spip lasterbideak onartzen ditu [->url] {{gizena}} {etzana} <quote> <code> eta HTML kodeak <q> <del> <ins>. Paragrafoak sortzeko, lerro bat hutsik utz.', + 'forum_texte' => 'Zure mezuaren testua:', + 'forum_titre' => 'Izenburua', + 'forum_url' => 'Zure gunea', 'forum_valider' => 'Aukera hori onartu', - 'forum_voir_avant' => 'Igorri aurretik mezu hau ikusi', # MODIF - 'forum_votre_email' => 'Zure posta-elektronikoaren helbidea :', # MODIF - 'forum_votre_nom' => 'Zure izena (edo goitizena) :', # MODIF + 'forum_voir_avant' => 'Aurreikusi', + 'forum_votre_email' => 'Zure helbide elektronikoa', + 'forum_votre_nom' => 'Zure izena (edo goitizena) :', 'forum_vous_enregistrer' => 'Aurretik inskribatzea beharrezkoa da foro honetan parte hartzeko. Hornitua izan zaizun identifikadore pertsonala jarraian adieraztea eskertuko dizugu. Inskribaturik ez bazaude, aurretik inskribatu behar duzu.', 'forum_vous_inscrire' => 'Aurretik inskriba zaitez.', // I - 'icone_bruler_message' => 'Signaler comme Spam', # NEW - 'icone_bruler_messages' => 'Signaler comme Spam', # NEW - 'icone_legitimer_message' => 'Signaler comme licite', # NEW + 'icone_bruler_message' => 'Spam gisa salatu', + 'icone_bruler_messages' => 'Spam gisa salatu', + 'icone_legitimer_message' => 'Onargarri gisa seinalatu', 'icone_poster_message' => 'Mezu bat igorri', 'icone_suivi_forum' => 'Foro publikoaren gaurkotasuna: @nb_forums@ekarpena(k)', 'icone_suivi_forums' => 'Foroen gestioa', 'icone_supprimer_message' => 'Mezu hau kendu', - 'icone_supprimer_messages' => 'Supprimer ces messages', # NEW + 'icone_supprimer_messages' => 'Mezu hauek ezabatu', 'icone_valider_message' => 'Mezu hau onartu', - 'icone_valider_messages' => 'Valider ces messages', # NEW - 'icone_valider_repondre_message' => 'Valider & RÃ©pondre Ã ce message', # NEW - 'info_1_message_forum' => '1 message de forum', # NEW - 'info_activer_forum_public' => 'Foru publikoak aktibatzeko, aukeratu moderazio erabat', # MODIF + 'icone_valider_messages' => 'Mezu hauek onartu', + 'icone_valider_repondre_message' => 'Mezu hau onartu eta erantzun', + 'info_1_message_forum' => 'Iruzkin bat', + 'info_activer_forum_public' => 'Foru publikoak aktibatzeko, aukeratu lehenetsitako moderazio erabat', 'info_appliquer_choix_moderation' => 'Moderazio mota hau ezarri', - 'info_config_forums_prive' => 'Eremu pribatuan foro mota desberdinak aktibatzen ahal dituzu', # MODIF + 'info_config_forums_prive' => 'Eremu pribatuan foro mota desberdinak aktibatzen ahal dituzu', 'info_config_forums_prive_admin' => 'gunearen administratzaileei erreserbatutako foroaÂ :', 'info_config_forums_prive_global' => 'Foro orokor bat, idazle guziei irekiaÂ :', 'info_config_forums_prive_objets' => 'Foro bat artikulu, berri-labur edo erreferentzitutako gune bakoitzaren azpianÂ :', - 'info_desactiver_forum_public' => 'Jendaurrekoforoak desaktibatu. Puntualki aktibatuak izan ahalko dira artikuluetarako, baina ezlaburretarako edo ataletarako.', + 'info_desactiver_forum_public' => 'Foro publikoak desaktibatu. Puntualki aktiba daiteke artikuluendako artikuluetarako, baina ez berri-laburretarako edo ataletarako.', 'info_envoi_forum' => 'Foroen jarraipena', 'info_fonctionnement_forum' => 'Foroarenfuntzionamendua', - 'info_forums_liees_mot' => 'Les messages de forum liÃ©s Ã ce mot', # NEW - 'info_gauche_suivi_forum_2' => 'Foroak jarraitzeko orrialdea zureguneko kudeaketa-tresna bat da (eta ez eztabaida edo idazketa-eremu bat). Guneko foroetako kontribuzio guztiak bistaratzen ditu, bai gune publikokoak bai eremu pribatukoak eta kontribuzio hauek administratzen uzten dizu.', # MODIF + 'info_forums_liees_mot' => 'Hitz honi lotutako iruzkinak', + 'info_gauche_suivi_forum_2' => 'Foroak jarraitzeko orrialdea zureguneko kudeaketa-tresna bat da (eta ez eztabaida edo idazketa-eremu bat). Guneko foroetako kontribuzio guztiak bistaratzen ditu, bai gune publikokoak bai eremu pribatukoak eta kontribuzio hauek administratzen uzten dizu.', 'info_liens_syndiques_3' => 'foroak', 'info_liens_syndiques_4' => 'daude', 'info_liens_syndiques_5' => 'foroa', 'info_liens_syndiques_6' => 'dago', 'info_liens_syndiques_7' => 'balidazioaren zain', - 'info_liens_texte' => 'Lien(s) contenu(s) dans le texte du message', # NEW - 'info_liens_titre' => 'Lien(s) contenu(s) dans le titre du message', # NEW + 'info_liens_texte' => 'Iruzkinak edukitako hiperesteka(k)', + 'info_liens_titre' => 'Iruzkinaren izenburuak edukitako hiperesteka(k)', 'info_mode_fonctionnement_defaut_forum_public' => 'Foro publikoenfuntzionamendua', - 'info_nb_messages_forum' => '@nb@ messages de forum', # NEW + 'info_nb_messages_forum' => '@nb@ iruzkin', 'info_option_email' => 'Guneko bisitari batek artikulu batekin erlazionatutako mezu berri bat bidaltzen duenean foroan, artikuluaren idazleak mezu honetaz abisatuakizan ahal dira e-mailez. Aukera hau erabili nahi duzu ?', 'info_pas_de_forum' => 'fororik ez', - 'info_question_visiteur_ajout_document_forum' => 'Si vous souhaitez autoriser les visiteurs Ã joindre des documents (images, sons...) Ã leurs messages de forum, indiquer ci-dessous la liste des extensions de documents autorisÃ©s pour les forums (ex: gif, jpg, png, mp3).', # MODIF - 'info_question_visiteur_ajout_document_forum_format' => 'Le cas Ã©chÃ©ant, indiquer ci-dessous la liste des extensions de documents autorisÃ©s pour les forums (ex: gif, jpg, png, mp3).', # MODIF - 'info_selectionner_message' => 'SÃ©lectionner les messages :', # NEW - 'interface_formulaire' => 'Interface formulaire', # NEW - 'interface_onglets' => 'Interface avec onglets', # NEW + 'info_question_visiteur_ajout_document_forum' => 'Foroko mezuei dokumentuen eranstea onartzen baduzu (irudi, soinu..), onartutako fitxategi-luzapenak zehaztu itzazu ((ad : gif, jpg, p,png,mp3).', + 'info_question_visiteur_ajout_document_forum_format' => 'Beharrez, zehaztu izkizu foroetako dokumentu erantsien fitxategi-luzapen onartuak (ad : gif, jpg, png, mp3).', + 'info_selectionner_message' => 'Mezuak hautatu :', + 'interface_formulaire' => 'Inprimaki interfazea', + 'interface_onglets' => 'Fitxekilako interfazea', 'item_activer_forum_administrateur' => 'Administrazio-taldearen foroa aktibatu.', 'item_config_forums_prive_global' => 'Idazleen foroa aktibatu', 'item_config_forums_prive_objets' => 'Foro hauek aktibatu', @@ -113,29 +113,29 @@ Inskribaturik ez bazaude, aurretik inskribatu behar duzu.', 'item_non_config_forums_prive_objets' => 'Foro hauek desaktibatu', // L - 'label_selectionner' => 'SÃ©lectionner :', # NEW + 'label_selectionner' => 'Hautatu :', 'lien_reponse_article' => 'Artikuluari erantzuna', 'lien_reponse_breve_2' => 'Atalari erantzuna', - 'lien_reponse_message' => 'RÃ©ponse au message', # NEW + 'lien_reponse_message' => 'Mezuari erantzuna', 'lien_reponse_rubrique' => 'Atalari erantzuna', - 'lien_reponse_site_reference' => 'Aipatutako lekuari erantzuna', # MODIF - 'lien_vider_selection' => 'Vider la selection', # NEW + 'lien_reponse_site_reference' => 'Aipatutako guneari erantzuna', + 'lien_vider_selection' => 'Selekzioa hustu', // M - 'messages_aucun' => 'Aucun', # NEW - 'messages_meme_auteur' => 'Tous les messages de cet auteur', # NEW - 'messages_meme_email' => 'Tous les messages de cet email', # NEW - 'messages_meme_ip' => 'Tous les messages de cette IP', # NEW - 'messages_off' => 'SupprimÃ©s', # NEW - 'messages_perso' => 'Personnels', # NEW - 'messages_privadm' => 'Administrateurs', # NEW - 'messages_prive' => 'PrivÃ©s', # NEW - 'messages_privoff' => 'SupprimÃ©s', # NEW - 'messages_privrac' => 'GÃ©nÃ©raux', # NEW - 'messages_prop' => 'ProposÃ©s', # NEW - 'messages_publie' => 'PubliÃ©s', # NEW - 'messages_spam' => 'Spam', # NEW - 'messages_tous' => 'Tous', # NEW + 'messages_aucun' => 'Batere', + 'messages_meme_auteur' => 'Autore honen mezu guztiak', + 'messages_meme_email' => 'Helbide elektroniko honen mezu guztia', + 'messages_meme_ip' => 'IP helbide honen mezu guztiak', + 'messages_off' => 'Kenduak', + 'messages_perso' => 'Pertsonala', + 'messages_privadm' => 'Administrazaile', + 'messages_prive' => 'Pribatuak', + 'messages_privoff' => 'Ezabatuak', + 'messages_privrac' => 'Orokorrak', + 'messages_prop' => 'Proposatuak', + 'messages_publie' => 'Argitaratuak', + 'messages_spam' => 'Spam', + 'messages_tous' => 'Guztiak', // O 'onglet_messages_internes' => 'Barne mezuak', @@ -146,28 +146,28 @@ Inskribaturik ez bazaude, aurretik inskribatu behar duzu.', 'repondre_message' => 'Mezuari erantzun', // S - 'statut_off' => 'SupprimÃ©', # NEW + 'statut_off' => 'Ezabatua', 'statut_original' => 'jatorrizkoa', - 'statut_prop' => 'ProposÃ©', # NEW - 'statut_publie' => 'PubliÃ©', # NEW - 'statut_spam' => 'Spam', # NEW + 'statut_prop' => 'Proposatuak', + 'statut_publie' => 'Argitaratua', + 'statut_spam' => 'Spam', // T 'text_article_propose_publication_forum' => 'Ez beldurtu zure iritzia emateaz. Artikuluari foro bat lotua zaio (orri beherean).', - 'texte_en_cours_validation' => 'Les articles, brÃ¨ves, forums ci dessous sont proposÃ©s Ã la publication.', # NEW + 'texte_en_cours_validation' => 'Artikulu, berri-labur eta iruzkin horiek argitalpenarako proposatuak dira.', 'texte_en_cours_validation_forum' => 'Ez izan zalantzarik zure iritzia emateko beraiei erantsitako foroei esker.', - 'texte_messages_publics' => 'Messages publics surÂ :', # NEW + 'texte_messages_publics' => 'Mezu publikoak hemen Â :', 'titre_cadre_forum_administrateur' => 'Administrarien foroa', 'titre_cadre_forum_interne' => 'Barneko foroa', - 'titre_config_forums_prive' => 'Forums de lâespace privÃ©', # NEW + 'titre_config_forums_prive' => 'Eremu pribatuko foroak', 'titre_forum' => 'Barne-foroa', 'titre_forum_suivi' => 'Foruen kudeaketa', 'titre_page_forum_suivi' => 'Foruenjarraipena', - 'titre_selection_action' => 'SÃ©lection', # NEW - 'tout_voir' => 'Voir tous les messages', # NEW + 'titre_selection_action' => 'Hautua', + 'tout_voir' => 'Mezu guztiak ikusi', // V - 'voir_messages_objet' => 'voir les messages' # NEW + 'voir_messages_objet' => 'mezuak ikusi' ); ?> diff --git a/www/plugins-dist/forum/lang/forum_ft_tu.php b/www/plugins-dist/forum/lang/forum_ft_tu.php deleted file mode 100644 index ea81ece..0000000 --- a/www/plugins-dist/forum/lang/forum_ft_tu.php +++ /dev/null @@ -1,176 +0,0 @@ - 'Aucun message de forum', # NEW - - // B - 'bouton_radio_articles_futurs' => 'aux articles futurs uniquement (pas d\'action sur la base de donnÃ©es).', # NEW - 'bouton_radio_articles_tous' => 'Ã tous les articles sans exception.', # NEW - 'bouton_radio_articles_tous_sauf_forum_desactive' => 'Ã tous les articles, sauf ceux dont le forum est dÃ©sactivÃ©.', # NEW - 'bouton_radio_enregistrement_obligatoire' => 'Enregistrement obligatoire (les - utilisateurs doivent s\'abonner en fournissant leur adresse e-mail avant de - pouvoir poster des contributions).', # NEW - 'bouton_radio_moderation_priori' => 'ModÃ©ration Ã priori (les - contributions ne s\'affichent publiquement qu\'aprÃ¨s validation par les - administrateurs).', # NEW - 'bouton_radio_modere_abonnement' => 'sur abonnement', # NEW - 'bouton_radio_modere_posteriori' => 'modÃ©ration Ã posteriori', # NEW - 'bouton_radio_modere_priori' => 'modÃ©ration Ã priori', # NEW - 'bouton_radio_publication_immediate' => 'Publication immÃ©diate des messages - (les contributions s\'affichent dÃ¨s leur envoi, les administrateurs peuvent - les supprimer ensuite).', # NEW - - // D - 'documents_interdits_forum' => 'Documents interdits dans le forum', - - // E - 'erreur_enregistrement_message' => 'Votre message n\'a pas pu Ãªtre enregistrÃ© en raison d\'un problÃ¨me technique', # NEW - - // F - 'form_pet_message_commentaire' => 'Un message, un commentaireÂ ?', # NEW - 'forum' => 'Forum', - 'forum_acces_refuse' => 'Vous n\'avez plus accÃ¨s Ã ces forums.', # NEW - 'forum_attention_dix_caracteres' => 'AttentionÂ ! votre message doit contenir au moins dix caractÃ¨res.', # NEW - 'forum_attention_message_non_poste' => 'Attention, vous n\'avez pas postÃ© votre message !', # NEW - 'forum_attention_trois_caracteres' => 'AttentionÂ ! votre titre doit contenir au moins trois caractÃ¨res.', # NEW - 'forum_attention_trop_caracteres' => 'AttentionÂ ! votre message est trop long (@compte@ caractÃ¨res)Â : pour pouvoir Ãªtre enregistrÃ©, il ne doit pas dÃ©passer @max@ caractÃ¨res.', # NEW - 'forum_avez_selectionne' => 'Vous avez sÃ©lectionnÃ©Â :', # NEW - 'forum_cliquer_retour' => 'Cliquez ici pour continuer.', # NEW - 'forum_forum' => 'forum', # NEW - 'forum_info_modere' => 'Ce forum est modÃ©rÃ© Ã prioriÂ : votre contribution n\'apparaÃ®tra qu\'aprÃ¨s avoir Ã©tÃ© validÃ©e par un administrateur du site.', # NEW - 'forum_lien_hyper' => 'Lien hypertexte', # NEW - 'forum_message' => 'Votre message', # NEW - 'forum_message_definitif' => 'Message dÃ©finitif : envoyer au site', # NEW - 'forum_message_trop_long' => 'Votre message est trop long. La taille maximale est de 20000 caractÃ¨res.', # NEW - 'forum_ne_repondez_pas' => 'Ne rÃ©pondez pas Ã ce mail mais sur le forum Ã l\'adresse suivante :', # NEW - 'forum_page_url' => '(Si votre message se rÃ©fÃ¨re Ã un article publiÃ© sur le Web, ou Ã une page fournissant plus d\'informations, vous pouvez indiquer ci-aprÃ¨s le titre de la page et son adresse.)', # NEW - 'forum_permalink' => 'Lien permanent vers le commentaire', # NEW - 'forum_poste_par' => 'Message postÃ©@parauteur@ Ã la suite de l\'article Â« @titre@ Â».', # NEW - 'forum_qui_etes_vous' => 'Qui Ãªtes-vous ?', # NEW - 'forum_saisie_texte_info' => 'Ce formulaire accepte les raccourcisÂ SPIP [->url] {{gras}} {italique} <quote> <code> et le codeÂ HTML <q> <del> <ins>. Pour crÃ©er des paragraphes, laissez simplement des lignes vides.', # NEW - 'forum_texte' => 'Texte de votre message', # NEW - 'forum_titre' => 'Titre', # NEW - 'forum_url' => 'Votre site web', # NEW - 'forum_valider' => 'Valider ce choix', # NEW - 'forum_voir_avant' => 'PrÃ©visualiser', # NEW - 'forum_votre_email' => 'Votre adresse email', # NEW - 'forum_votre_nom' => 'Votre nom', # NEW - 'forum_vous_enregistrer' => 'Pour participer Ã - ce forum, vous devez vous enregistrer au prÃ©alable. Merci - d\'indiquer ci-dessous l\'identifiant personnel qui vous a - Ã©tÃ© fourni. Si vous n\'Ãªtes pas enregistrÃ©, vous devez', # NEW - 'forum_vous_inscrire' => 'vous inscrire.', # NEW - - // I - 'icone_bruler_message' => 'Signaler comme Spam', # NEW - 'icone_bruler_messages' => 'Signaler comme Spam', # NEW - 'icone_legitimer_message' => 'Signaler comme licite', # NEW - 'icone_poster_message' => 'Poster un message', # NEW - 'icone_suivi_forum' => 'Suivi du forum publicÂ : @nb_forums@Â contribution(s)', # NEW - 'icone_suivi_forums' => 'Suivre/gÃ©rer les forums', # NEW - 'icone_supprimer_message' => 'Supprimer ce message', # NEW - 'icone_supprimer_messages' => 'Supprimer ces messages', # NEW - 'icone_valider_message' => 'Valider ce message', # NEW - 'icone_valider_messages' => 'Valider ces messages', # NEW - 'icone_valider_repondre_message' => 'Valider & RÃ©pondre Ã ce message', # NEW - 'info_1_message_forum' => '1 message de forum', # NEW - 'info_activer_forum_public' => 'Pour activer les forums publics, veuillez choisir leur mode - de modÃ©ration par dÃ©faut :', # NEW - 'info_appliquer_choix_moderation' => 'Appliquer ce choix de modÃ©rationÂ :', # NEW - 'info_config_forums_prive' => 'Dans lâespace privÃ© du site, vous pouvez activer plusieurs types de forumsÂ :', # NEW - 'info_config_forums_prive_admin' => 'Un forum rÃ©servÃ© aux administrateurs du siteÂ :', # NEW - 'info_config_forums_prive_global' => 'Un forum global, ouvert Ã tous les rÃ©dacteursÂ :', # NEW - 'info_config_forums_prive_objets' => 'Un forum sous chaque article, brÃ¨ve, site rÃ©fÃ©rencÃ©, etc.Â :', # NEW - 'info_desactiver_forum_public' => 'DÃ©sactiver l\'utilisation des forums - publics. Les forums publics pourront Ãªtre autorisÃ©s au cas par cas - sur les articles ; ils seront interdits sur les rubriques, brÃ¨ves, etc.', # NEW - 'info_envoi_forum' => 'Envoi des forums aux auteurs des articles', # NEW - 'info_fonctionnement_forum' => 'Fonctionnement du forumÂ :', # NEW - 'info_forums_liees_mot' => 'Les messages de forum liÃ©s Ã ce mot', # NEW - 'info_gauche_suivi_forum_2' => 'La page de suivi des forums est un outil de gestion de votre site (et non un espace de discussion ou de rÃ©daction). Elle affiche toutes les contributions des forums du site, aussi bien celles du site public que de l\'espace privÃ© et vous permet de gÃ©rer ces contributions.', # NEW - 'info_liens_syndiques_3' => 'forums', # NEW - 'info_liens_syndiques_4' => 'sont', # NEW - 'info_liens_syndiques_5' => 'forum', # NEW - 'info_liens_syndiques_6' => 'est', # NEW - 'info_liens_syndiques_7' => 'en attente de validation', # NEW - 'info_liens_texte' => 'Lien(s) contenu(s) dans le texte du message', # NEW - 'info_liens_titre' => 'Lien(s) contenu(s) dans le titre du message', # NEW - 'info_mode_fonctionnement_defaut_forum_public' => 'Mode de fonctionnement par dÃ©faut des forums publics', # NEW - 'info_nb_messages_forum' => '@nb@ messages de forum', # NEW - 'info_option_email' => 'Lorsqu\'un visiteur du site poste un nouveau message dans le forum associÃ© Ã un article, les auteurs de l\'article peuvent Ãªtre prÃ©venus de ce message par e-mail. Indiquer pour chaque type de forum s\'il faut utiliser cette option.', # NEW - 'info_pas_de_forum' => 'pas de forum', # NEW - 'info_question_visiteur_ajout_document_forum' => 'Si vous souhaitez autoriser les visiteurs Ã joindre des documents (images, sons...) Ã leurs messages de forum, indiquez ci-dessous la liste des extensions de documents autorisÃ©s pour les forums (ex: gif, jpg, png, mp3).', # NEW - 'info_question_visiteur_ajout_document_forum_format' => 'Si vous souhaitez autoriser tous les types de documents considÃ©rÃ©s comme fiables par SPIP, mettez une Ã©toile. Pour ne rien autoriser, n\'indiquez rien.', # NEW - 'interface_formulaire' => 'Interface formulaire', # NEW - 'interface_onglets' => 'Interface avec onglets', # NEW - 'item_activer_forum_administrateur' => 'Activer le forum des administrateurs', # NEW - 'item_config_forums_prive_global' => 'Activer le forum des rÃ©dacteurs', # NEW - 'item_config_forums_prive_objets' => 'Activer ces forums', # NEW - 'item_desactiver_forum_administrateur' => 'DÃ©sactiver le forum des administrateurs', # NEW - 'item_non_config_forums_prive_global' => 'DÃ©sactiver le forum des rÃ©dacteurs', # NEW - 'item_non_config_forums_prive_objets' => 'DÃ©sactiver ces forums', # NEW - - // L - 'lien_reponse_article' => 'RÃ©ponse Ã l\'article', # NEW - 'lien_reponse_breve_2' => 'RÃ©ponse Ã la brÃ¨ve', # NEW - 'lien_reponse_message' => 'RÃ©ponse au message', # NEW - 'lien_reponse_rubrique' => 'RÃ©ponse Ã la rubrique', # NEW - 'lien_reponse_site_reference' => 'RÃ©ponse au site rÃ©fÃ©rencÃ©', # NEW - - // M - 'messages_aucun' => 'Aucun', # NEW - 'messages_meme_auteur' => 'Tous les messages de cet auteur', # NEW - 'messages_meme_email' => 'Tous les messages de cet email', # NEW - 'messages_meme_ip' => 'Tous les messages de cette IP', # NEW - 'messages_off' => 'SupprimÃ©s', # NEW - 'messages_perso' => 'Personnels', # NEW - 'messages_privadm' => 'Administrateurs', # NEW - 'messages_prive' => 'PrivÃ©s', # NEW - 'messages_privoff' => 'SupprimÃ©s', # NEW - 'messages_privrac' => 'GÃ©nÃ©raux', # NEW - 'messages_prop' => 'ProposÃ©s', # NEW - 'messages_publie' => 'PubliÃ©s', # NEW - 'messages_spam' => 'Spam', # NEW - 'messages_tous' => 'Tous', # NEW - - // O - 'onglet_messages_internes' => 'Messages internes', # NEW - 'onglet_messages_publics' => 'Messages publics', # NEW - 'onglet_messages_vide' => 'Messages sans texte', # NEW - - // R - 'repondre_message' => 'RÃ©pondre Ã ce message', - - // S - 'statut_off' => 'SupprimÃ©', # NEW - 'statut_original' => 'original', # NEW - 'statut_prop' => 'ProposÃ©', # NEW - 'statut_publie' => 'PubliÃ©', # NEW - 'statut_spam' => 'Spam', # NEW - - // T - 'text_article_propose_publication_forum' => 'N\'hÃ©sitez pas Ã donner votre avis grÃ¢ce au forum attachÃ© Ã cet article (en bas de page).', # NEW - 'texte_en_cours_validation' => 'Les articles, brÃ¨ves, forums ci dessous sont proposÃ©s Ã la publication.', # NEW - 'texte_en_cours_validation_forum' => 'N\'hÃ©sitez pas Ã donner votre avis grÃ¢ce aux forums qui leur sont attachÃ©s.', # NEW - 'texte_messages_publics' => 'Messages publics sur :', # NEW - 'titre_cadre_forum_administrateur' => 'Forum privÃ© des administrateurs', # NEW - 'titre_cadre_forum_interne' => 'Forum interne', # NEW - 'titre_config_forums_prive' => 'Forums de lâespace privÃ©', # NEW - 'titre_forum' => 'Forum', # NEW - 'titre_forum_suivi' => 'Suivi des forums', # NEW - 'titre_page_forum_suivi' => 'Suivi des forums', # NEW - 'titre_selection_action' => 'SÃ©lection', # NEW - 'tout_voir' => 'Voir tous les messages', # NEW - - // V - 'voir_messages_objet' => 'voir les messages' # NEW -); - -?> diff --git a/www/plugins-dist/forum/lang/forum_ru.php b/www/plugins-dist/forum/lang/forum_ru.php index 0346882..d22b93c 100644 --- a/www/plugins-dist/forum/lang/forum_ru.php +++ b/www/plugins-dist/forum/lang/forum_ru.php @@ -13,13 +13,13 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( // B 'bouton_radio_articles_futurs' => 'ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Ð½Ð¾Ð²ÑÑ Ð¼Ð°ÑÐµÑÐ¸Ð°Ð»Ð¾Ð² (ÑÐµÐºÑÑÐ¸Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑÑ).', 'bouton_radio_articles_tous' => 'Ð´Ð»Ñ Ð²ÑÐµÑ ÑÑÐ°ÑÐµÐ¹ Ð±ÐµÐ· Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ñ.', - 'bouton_radio_articles_tous_sauf_forum_desactive' => 'Ð´Ð»Ñ Ð²ÑÐµÑ ÑÑÐ°ÑÐµÐ¹, ÐºÑÐ¾Ð¼Ðµ ÑÐµÑ, Ð² ÐºÐ¾ÑÐ¾ÑÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¾.', + 'bouton_radio_articles_tous_sauf_forum_desactive' => 'Ð´Ð»Ñ Ð²ÑÐµÑ ÑÑÐ°ÑÐµÐ¹, ÐºÑÐ¾Ð¼Ðµ ÑÐµÑ, Ð² ÐºÐ¾ÑÐ¾ÑÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ñ.', 'bouton_radio_enregistrement_obligatoire' => 'Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹. ÐÐ¾ÑÐµÑÐ¸ÑÐµÐ»Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð¿ÐµÑÐµÐ´ ÑÐµÐ¼ ÐºÐ°Ðº Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹.', 'bouton_radio_moderation_priori' => 'ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¿ÑÐ±Ð»Ð¸ÐºÑÑÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ Ð¿Ð¾ÑÐ»Ðµ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼ (Ð¿ÑÐµ-Ð¼Ð¾Ð´ÐµÑÐ°ÑÐ¸Ñ).', 'bouton_radio_modere_abonnement' => 'ÑÐ¾Ð»ÑÐºÐ¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸ ÑÐ°Ð¹ÑÐ°', 'bouton_radio_modere_posteriori' => 'ÑÐ°Ð·Ð¼ÐµÑÐ°ÑÑ Ð±ÐµÐ· Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸', 'bouton_radio_modere_priori' => 'Ð¿ÑÐ¾Ð²ÐµÑÑÑÑ Ð¿ÐµÑÐµÐ´ ÑÐ°Ð·Ð¼ÐµÑÐµÐ½Ð¸ÐµÐ¼', - 'bouton_radio_publication_immediate' => 'ÐÐ¾Ð²ÑÐµ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ ÑÑÐ°Ð·Ñ Ð¿ÑÐ±Ð»Ð¸ÐºÑÑÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ Ð±ÐµÐ· Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ (Ð¿Ð¾ÑÑ-Ð¼Ð¾Ð´ÐµÑÐ°ÑÐ¸Ñ). ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ Ð¿Ð¾ÑÐ¾Ð¼ Ð¼Ð¾Ð³ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸.', + 'bouton_radio_publication_immediate' => 'ÐÐ¾Ð²ÑÐµ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¿ÑÐ±Ð»Ð¸ÐºÑÑÑÑÑ Ð½Ð° ÑÐ°Ð¹ÑÐµ Ð±ÐµÐ· Ð¿ÑÐµÐ´Ð²Ð°ÑÐ¸ÑÐµÐ»ÑÐ½Ð¾Ð¹ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ (Ð¿Ð¾ÑÑ-Ð¼Ð¾Ð´ÐµÑÐ°ÑÐ¸Ñ). ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ Ð¼Ð¾Ð³ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¿Ð¾Ð·Ð¶Ðµ.', // D 'documents_interdits_forum' => 'ÐÐ°Ð¿ÑÐµÑÐµÐ½Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ðº ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸ÑÐ¼ ÑÐ¾ÑÑÐ¼Ð°', @@ -30,7 +30,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( // F 'form_pet_message_commentaire' => 'ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸', 'forum' => 'Ð¤Ð¾ÑÑÐ¼', - 'forum_acces_refuse' => 'ÐÑ Ð±Ð¾Ð»ÑÑÐµ Ð½Ðµ Ð¸Ð¼ÐµÐµÑÐµ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÑÐ¸Ð¼ ÑÐ¾ÑÑÐ¼Ð°Ð¼.', + 'forum_acces_refuse' => 'Ð£ Ð²Ð°Ñ Ð±Ð¾Ð»ÑÑÐµ Ð½ÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº Ð´Ð°Ð½Ð½ÑÐ¼ ÑÐ¾ÑÑÐ¼Ð°Ð¼.', 'forum_attention_dix_caracteres' => 'ÐÐ½Ð¸Ð¼Ð°Ð½Ð¸Ðµ! Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±ÑÑÑ Ð½Ðµ Ð¼ÐµÐ½ÐµÐµ Ð´ÐµÑÑÑÐ¸ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð².', 'forum_attention_message_non_poste' => 'ÐÐ½Ð¸Ð¼Ð°Ð½Ð¸Ðµ, Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð½Ðµ Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½ Ð½Ð° ÑÐ°Ð¹ÑÐµ.', 'forum_attention_nb_caracteres_mini' => 'ÐÐ½Ð¸Ð¼Ð°Ð½Ð¸ÐµÂ ! ÑÐµÐºÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑ Ð½Ðµ Ð¼ÐµÐ½ÑÑÐµ @min@ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð².', @@ -39,7 +39,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'forum_avez_selectionne' => 'ÐÑ Ð²ÑÐ±ÑÐ°Ð»Ð¸:', 'forum_cliquer_retour' => 'ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÑÑÐ´Ð° Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ.', 'forum_forum' => 'ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹', - 'forum_info_modere' => 'ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð¿ÑÐ¾Ð²ÐµÑÑÐµÑÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¸ÐµÐ¹ ÑÐ°Ð¹ÑÐ°. ÐÐ°ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ²Ð¸ÑÑÑ Ð¿Ð¾ÑÐ»Ðµ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼.', + 'forum_info_modere' => 'ÐÑÐµ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¸ Ð¿ÑÐ¾Ð²ÐµÑÑÑÑÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¸ÐµÐ¹ ÑÐ°Ð¹ÑÐ°. ÐÐ°ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð±ÑÐ´ÐµÑ Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð¿Ð¾ÑÐ»Ðµ Ð¾Ð´Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼.', 'forum_lien_hyper' => 'Ð¡ÑÑÐ»ÐºÐ°', 'forum_message' => 'ÐÐ°ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ', 'forum_message_definitif' => 'ÐÑÑ Ð²ÐµÑÐ½Ð¾. ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ!', @@ -47,9 +47,9 @@ $GLOBALS[$GLOBALS['idx_lang']] = array( 'forum_ne_repondez_pas' => 'ÐÐµ Ð¾ÑÐ²ÐµÑÐ°Ð¹ÑÐµ Ð½Ð° ÑÑÐ¾ Ð¿Ð¸ÑÑÐ¼Ð¾ - Ð¿ÐµÑÐµÐ¹Ð´Ð¸ÑÐµ Ð¿Ð¾ ÑÑÑÐ»ÐºÐµ:', 'forum_page_url' => '(ÐÑÐ»Ð¸ Ð²Ð°ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¾ÑÐ½Ð¾ÑÐ¸ÑÑÑ Ðº Ð¼Ð°ÑÐµÑÐ¸Ð°Ð»Ñ, ÑÐ°Ð·Ð¼ÐµÑÐµÐ½Ð½Ð¾Ð¼Ñ Ð² ÐÐ½ÑÐµÑÐ½ÐµÑÐµ, ÑÐºÐ°Ð¶Ð¸ÑÐµ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑÑÐ¾Ð¹ ÑÑÐ°ÑÑÐ¸ Ð¸ ÑÑÑÐ»ÐºÑ Ð½Ð° Ð½ÐµÐµ).', 'forum_permalink' => 'ÐÐ¾ÑÑÐ¾ÑÐ½Ð½Ð°Ñ ÑÑÑÐ»ÐºÐ°', - 'forum_poste_par' => '@parauteur@ Ð¿ÑÐ¾ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð» Ð²Ð°ÑÑ ÑÑÐ°ÑÑÑ.', # MODIF - 'forum_poste_par_court' => 'Message postÃ©@parauteur@.', # NEW - 'forum_poste_par_generique' => 'Message postÃ©@parauteur@ (@objet@ Â«Â @titre@Â Â»).', # NEW + 'forum_poste_par' => '@parauteur@ Ð¿ÑÐ¾ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð» Ð²Ð°ÑÑ ÑÑÐ°ÑÑÑ Â«Â @titre@Â Â».', + 'forum_poste_par_court' => 'ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑÑÐ¸Ð» @parauteur@.', + 'forum_poste_par_generique' => 'ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ ÑÐ°Ð·Ð¼ÐµÑÑÐ¸Ð» @parauteur@ (@objet@ Â«Â @titre@Â Â»).', 'forum_qui_etes_vous' => 'ÐÑÐ¾ Ð²Ñ?', 'forum_saisie_texte_info' => 'ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ»ÐµÐ´ÑÑÑÑÑ ÑÐ°Ð·Ð¼ÐµÑÐºÑ ÑÐµÐºÑÑÐ°

[->ÑÑÑÐ»ÐºÐ°] {{Ð¶Ð¸ÑÐ½ÑÐ¹}} {ÐºÑÑÑÐ¸Ð²}   Ð¸ ÑÐµÐ³Ð¸Â HTML   . Ð§ÑÐ¾ Ð±Ñ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð½Ð¾Ð²ÑÐ¹ Ð°Ð±Ð·Ð°Ñ Ð´Ð²Ð° ÑÐ°Ð·Ð° Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ enter.',
 	'forum_texte' => 'ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹:',
diff --git a/www/plugins-dist/forum/paquet.xml b/www/plugins-dist/forum/paquet.xml
index daff220..b9f1720 100644
--- a/www/plugins-dist/forum/paquet.xml
+++ b/www/plugins-dist/forum/paquet.xml
@@ -1,7 +1,7 @@
 
 
-	
+	
 	
 	
 	
diff --git a/www/plugins-dist/forum/prive/squelettes/navigation/controler_forum.html b/www/plugins-dist/forum/prive/squelettes/navigation/controler_forum.html
index b316db0..2be0595 100644
--- a/www/plugins-dist/forum/prive/squelettes/navigation/controler_forum.html
+++ b/www/plugins-dist/forum/prive/squelettes/navigation/controler_forum.html
@@ -33,7 +33,7 @@
 ]
 
 
-
+
 [(#REM)
 
 afficher la selection dans un ul class item_picked
diff --git a/www/prive/formulaires/selecteur/generique.html b/www/prive/formulaires/selecteur/generique.html
index 7889ffa..635c135 100644
--- a/www/prive/formulaires/selecteur/generique.html
+++ b/www/prive/formulaires/selecteur/generique.html
@@ -1,7 +1,8 @@
 #SET{img_unpick, #CHEMIN_IMAGE{supprimer-12.png}}
 [(#SET{label_supprimer, <:lien_supprimer:>})]
-
-
+
 [(#REM)
 
 afficher la selection dans un ul class item_picked
@@ -60,10 +61,9 @@ afficher la selection dans un ul class item_picked


 
 [(#ENV{sortable,'non'}|=={oui}|oui)
-
 
 ]
diff --git a/www/prive/formulaires/selecteur/rubriques.html b/www/prive/formulaires/selecteur/rubriques.html
index 3fee833..fa8bccd 100644
--- a/www/prive/formulaires/selecteur/rubriques.html
+++ b/www/prive/formulaires/selecteur/rubriques.html
@@ -1,5 +1,6 @@
-
-
+
 [(#REM)
 
 afficher la selection dans un ul class item_picked
@@ -26,10 +27,9 @@ afficher la selection dans un ul class item_picked


 [(#ENV{sortable,'non'}|=={oui}|oui)
-
 
 ]
\ No newline at end of file
diff --git a/www/prive/formulaires/traduire.html b/www/prive/formulaires/traduire.html
index 261722b..0e268e7 100644
--- a/www/prive/formulaires/traduire.html
+++ b/www/prive/formulaires/traduire.html
@@ -42,7 +42,7 @@
 				]
 				[(#ENV{_lister_id_trad}|non)
 				
-					<:trad_lier:>[
+					[(#ENV{_objet}|objet_info{texte_definir_comme_traduction_objet}|_T)][
 					(#ENV**{erreurs}|table_valeur{id_trad})
 					]
diff --git a/www/prive/informer_auteur_fonctions.php b/www/prive/informer_auteur_fonctions.php
index ffeabc5..d752b70 100644
--- a/www/prive/informer_auteur_fonctions.php
+++ b/www/prive/informer_auteur_fonctions.php
@@ -22,25 +22,28 @@ function informer_auteur($bof)
 	include_spip('inc/auth');
 	$login = strval(_request('var_login'));
 	$row = auth_informer_login($login);
-	if ($row AND is_array($row))
+	if ($row AND is_array($row)) {
 		unset($row['id_auteur']);
+	}
+	// permettre d'autoriser l'envoi de password non crypte lorsque
+	// l'auteur n'est pas (encore) declare dans SPIP, par exemple pour les cas
+	// de premiere authentification via SPIP a une autre application.
+	else if (defined('_AUTORISER_AUTH_FAIBLE') and _AUTORISER_AUTH_FAIBLE) {
+		$row = array();
+	}
+	// generer de fausses infos, mais credibles, pour eviter une attaque
+	// http://core.spip.org/issues/1758
 	else {
-		// permettre d'autoriser l'envoi de password non crypte lorsque
-		// l'auteur n'est pas (encore) declare dans SPIP, par exemple pour les cas
-		// de premiere authentification via SPIP a une autre application.
-		if (defined('_AUTORISER_AUTH_FAIBLE') and _AUTORISER_AUTH_FAIBLE) {
-			$row = array();
-		}
-		// piocher les infos sur un autre login
-		elseif ($n = sql_countsel('spip_auteurs',"login<>''")){
-			$n = (abs(crc32($login))%$n);
-			$row = auth_informer_login(sql_getfetsel('login','spip_auteurs',"login<>''",'','',"$n,1"));
-			if ($row AND is_array($row)){
-				unset($row['id_auteur']);
-				$row['login'] = $login;
-			}
-		}
-		else  $row = array();
+		include_spip('inc/securiser_action');
+		$fauxalea1 = md5('fauxalea'.secret_du_site().$login.floor(date('U')/86400));
+		$fauxalea2 = md5('fauxalea'.secret_du_site().$login.ceil(date('U')/86400));
+
+		$row = array('login' => $login,
+		 'cnx' => 0,
+		 'logo' => "",
+		 'alea_actuel' => substr_replace($fauxalea1,'.',24,0),
+		 'alea_futur' => substr_replace($fauxalea2,'.',24,0)
+		);
 	}
 
 	return json_export($row);
diff --git a/www/prive/javascript/ajaxCallback.js b/www/prive/javascript/ajaxCallback.js
index 27bba46..118fc31 100644
--- a/www/prive/javascript/ajaxCallback.js
+++ b/www/prive/javascript/ajaxCallback.js
@@ -78,8 +78,11 @@ if(!jQuery.spip.load_handlers) {
 	jQuery.ajax = function(type) {
 		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, type);
 		var callbackContext = s.context || s;
-		if (jQuery.ajax.caller==jQuery.spip.intercepted.load || jQuery.ajax.caller==jQuery.spip.intercepted.ajaxSubmit)
-			return jQuery.spip.intercepted.ajax(type);
+		try {
+			if (jQuery.ajax.caller==jQuery.spip.intercepted.load || jQuery.ajax.caller==jQuery.spip.intercepted.ajaxSubmit)
+				return jQuery.spip.intercepted.ajax(type);
+		}
+		catch (err){}
 		var orig_complete = s.complete || function() {};
 		type.complete = function(res,status) {
 			// Do not fire OnAjaxLoad if the dataType is not html
diff --git a/www/prive/javascript/login-sha-min.js b/www/prive/javascript/login-sha-min.js
new file mode 100644
index 0000000..14738ff
--- /dev/null
+++ b/www/prive/javascript/login-sha-min.js
@@ -0,0 +1,132 @@
+/**
+ * Fichiers sha256.js et login.js concatÃ©nÃ©s et minifiÃ©s
+ */
+var chrsz=8;
+function safe_add(x,y){
+var lsw=(x&0xFFFF)+(y&0xFFFF);
+var msw=(x>>16)+(y>>16)+(lsw>>16);
+return(msw<<16)|(lsw&0xFFFF);
+}
+function S(X,n){return(X>>>n)|(X<<(32-n));}
+function R(X,n){return(X>>>n);}
+function Ch(x,y,z){return((x&y)^((~x)&z));}
+function Maj(x,y,z){return((x&y)^(x&z)^(y&z));}
+function Sigma0256(x){return(S(x,2)^S(x,13)^S(x,22));}
+function Sigma1256(x){return(S(x,6)^S(x,11)^S(x,25));}
+function Gamma0256(x){return(S(x,7)^S(x,18)^R(x,3));}
+function Gamma1256(x){return(S(x,17)^S(x,19)^R(x,10));}
+function core_sha256(m,l){
+var K=new Array(0x428A2F98,0x71374491,0xB5C0FBCF,0xE9B5DBA5,0x3956C25B,0x59F111F1,0x923F82A4,0xAB1C5ED5,0xD807AA98,0x12835B01,0x243185BE,0x550C7DC3,0x72BE5D74,0x80DEB1FE,0x9BDC06A7,0xC19BF174,0xE49B69C1,0xEFBE4786,0xFC19DC6,0x240CA1CC,0x2DE92C6F,0x4A7484AA,0x5CB0A9DC,0x76F988DA,0x983E5152,0xA831C66D,0xB00327C8,0xBF597FC7,0xC6E00BF3,0xD5A79147,0x6CA6351,0x14292967,0x27B70A85,0x2E1B2138,0x4D2C6DFC,0x53380D13,0x650A7354,0x766A0ABB,0x81C2C92E,0x92722C85,0xA2BFE8A1,0xA81A664B,0xC24B8B70,0xC76C51A3,0xD192E819,0xD6990624,0xF40E3585,0x106AA070,0x19A4C116,0x1E376C08,0x2748774C,0x34B0BCB5,0x391C0CB3,0x4ED8AA4A,0x5B9CCA4F,0x682E6FF3,0x748F82EE,0x78A5636F,0x84C87814,0x8CC70208,0x90BEFFFA,0xA4506CEB,0xBEF9A3F7,0xC67178F2);
+var HASH=new Array(0x6A09E667,0xBB67AE85,0x3C6EF372,0xA54FF53A,0x510E527F,0x9B05688C,0x1F83D9AB,0x5BE0CD19);
+var W=new Array(64);
+var a,b,c,d,e,f,g,h,i,j;
+var T1,T2;
+m[l>>5]|=0x80<<(24-l%32);
+m[((l+32>>9)<<4)+15]=l;
+for(var i=0;i0x7F)
+chrsz=16;
+var mask=(1<>5]|=(str.charCodeAt(i/chrsz)&mask)<<(24-i%32);
+return bin;
+}
+function binb2hex(binarray){
+var hexcase=0;
+var hex_tab=hexcase?"0123456789ABCDEF":"0123456789abcdef";
+var str="";
+for(var i=0;i>2]>>((3-i%4)*8+4))&0xF)+hex_tab.charAt((binarray[i>>2]>>((3-i%4)*8))&0xF);
+}
+return str;
+}
+function hex_sha256(s){return binb2hex(core_sha256(str2binb(s),s.length*chrsz));}
+function sha256_self_test(){
+return hex_sha256("message digest")=="f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650";
+}
+function affiche_login_secure(){
+if(alea_actuel)
+jQuery('#pass_securise').show();
+else
+jQuery('#pass_securise').hide();
+}
+function informe_auteur(c){
+informe_auteur_en_cours=false;
+eval('c = '+c);
+if(c){
+alea_actuel=c.alea_actuel;
+alea_futur=c.alea_futur;
+jQuery('input#session_remember:not(.modifie)')
+.attr('checked',(c.cnx=='1')?'checked':'');
+}else{
+alea_actuel='';
+}
+if(c.logo)
+jQuery('#spip_logo_auteur').html(c.logo);
+else
+jQuery('#spip_logo_auteur').html('');
+affiche_login_secure();
+}
+function calcule_hash_pass(pass){
+if((alea_actuel||alea_futur)
+&&!pass.match(/^\{([0-9a-f]{32});([0-9a-f]{32})\}$/i)
+&&!pass.match(/^\{([0-9a-f]{64});([0-9a-f]{64});([0-9a-f]{32});([0-9a-f]{32})\}$/i)
+&&sha256_self_test()
+){
+var hash="";
+hash=hex_sha256(alea_actuel+pass);
+hash=hash+';'+hex_sha256(alea_futur+pass);
+if(window.calcMD5){
+hash=hash+';'+calcMD5(alea_actuel+pass);
+hash=hash+';'+calcMD5(alea_futur+pass);
+}
+jQuery('input[name=password]').attr('value','{'+hash+'}');
+}
+}
+function actualise_auteur(){
+if(login!=jQuery('#var_login').attr('value')){
+informe_auteur_en_cours=true;
+login=jQuery('#var_login').attr('value');
+var currentTime=new Date();
+jQuery.get(page_auteur,{var_login:login,var_compteur:currentTime.getTime()},informe_auteur);
+}
+}
+function login_submit(){
+actualise_auteur();
+var inputpass=jQuery('input[name=password]');
+pass=inputpass.attr('value');
+if(pass){
+if(informe_auteur_en_cours&&(attente_informe<5)){
+attente_informe++;
+jQuery('form#formulaire_login').animeajax().find('p.boutons input').before('.');
+setTimeout(function(){
+jQuery('form#formulaire_login').submit();
+},1000);
+return false;
+}
+if(alea_actuel||alea_futur){
+inputpass.after('').attr('value',pass);
+inputpass.attr('name','nothing').attr('value','');
+calcule_hash_pass(pass);
+}
+else if(informe_auteur_en_cours)
+jQuery('input[name=password]').attr('value','');
+}
+}
\ No newline at end of file
diff --git a/www/prive/spip_admin.css b/www/prive/spip_admin.css
index 1bc4267..9105c2e 100644
--- a/www/prive/spip_admin.css
+++ b/www/prive/spip_admin.css
@@ -19,12 +19,11 @@ a:active.spip-admin-boutons,
 .spip-admin-boutons a:active { background-color: #333; opacity: 1; }
 
 /* Style pour le mode debug */
-#spip-debug-hide { background-color: #444; color:white; font-weight:bold;}
-#spip-debug-hide a {  text-decoration:none; color:white; padding:1px 1em; display:block;}
+#spip-debug-toggle {position:absolute; top:4px; right:80px; width:24px;height:20px; cursor:pointer; z-index:1000;}
 #spip-debug, #spip-debug-header { background-color: #f0f0f0; font-family: Verdana, Geneva, sans-serif; position:absolute;top:30px;left:0;width:100%;height:100%;z-index:10000; font-size:1em; text-align:left; }
 #spip-debug ul table { font-size: 80%; }
 #spip-debug fieldset { background-color: #fff; font-family: Courier, "Courier New", monospace; font-size: 12px; margin-bottom: 1em; display: block; padding: .5em; }
-#spip-debug fieldset fieldset { background-color: #ccf; font-family: Verdana, Geneva, sans-serif; font-size: 80%; width:100%; margin-left: auto; }
+#spip-debug fieldset fieldset { background-color: #ccf; font-family: Verdana, Geneva, sans-serif; font-size: 80%; width:99%; margin-left: auto; }
 #spip-debug legend { background-color: #fff; border: solid 1px #f00; padding: 1px 1em; font-family: Verdana, Geneva, sans-serif; font-weight: bold; display: block; text-transform: none; }
 #spip-debug legend a { font-weight: normal; }
 #spip-debug fieldset fieldset legend { border: solid 1px #00F; font-weight: normal; }
diff --git a/www/prive/spip_pass.html b/www/prive/spip_pass.html
index ed318a8..ac9c55a 100644
--- a/www/prive/spip_pass.html
+++ b/www/prive/spip_pass.html
@@ -37,7 +37,7 @@
 	document.getElementById('oubli').focus()
 	/*#EVAL{chr(93)}[(#EVAL{chr(93)})]>*/


 	
diff --git a/www/prive/squelettes/contenu/configurer_multilang.html b/www/prive/squelettes/contenu/configurer_multilang.html
deleted file mode 100644
index 7fce2f4..0000000
--- a/www/prive/squelettes/contenu/configurer_multilang.html
+++ /dev/null
@@ -1,5 +0,0 @@
-[(#AUTORISER{configurer,_multilang}|sinon_interdire_acces)]
-<:info_langues:>
-
-	#FORMULAIRE_CONFIGURER_MULTILINGUISME
-
\ No newline at end of file
diff --git a/www/prive/squelettes/contenu/configurer_multilinguisme.html b/www/prive/squelettes/contenu/configurer_multilinguisme.html
new file mode 100644
index 0000000..596f8b8
--- /dev/null
+++ b/www/prive/squelettes/contenu/configurer_multilinguisme.html
@@ -0,0 +1,5 @@
+[(#AUTORISER{configurer,_multilinguisme}|sinon_interdire_acces)]
+<:info_langues:>
+
+	#FORMULAIRE_CONFIGURER_MULTILINGUISME
+
\ No newline at end of file
diff --git a/www/prive/squelettes/inclure/admin_vider_cache.html b/www/prive/squelettes/inclure/admin_vider_cache.html
index 96190d8..d8b1a42 100644
--- a/www/prive/squelettes/inclure/admin_vider_cache.html
+++ b/www/prive/squelettes/inclure/admin_vider_cache.html
@@ -21,16 +21,16 @@
 	#SET{cache_inhib,#CONFIG{cache_inhib}|sinon{0}|>{#REM|time}|oui}
 
 	[(#GET{cache_inhib}|oui)
-	Le cache est temporairement dÃ©sactivÃ©.
+	<:info_cache_desactive:>
 	
 	]
 
 #BOITE_PIED
 	[(#GET{cache_inhib}|non)
-		[(#BOUTON_ACTION{DÃ©sactiver temporairement le cache,#URL_ACTION_AUTEUR{purger,inhibe_cache,#SELF},ajax})]
+		[(#BOUTON_ACTION{<:bouton_cache_desactiver:>,#URL_ACTION_AUTEUR{purger,inhibe_cache,#SELF},ajax})]
 	]
 	[(#GET{cache_inhib}|oui)
- 		[(#BOUTON_ACTION{RÃ©activer le cache,#URL_ACTION_AUTEUR{purger,reactive_cache,#SELF},ajax})]
+ 		[(#BOUTON_ACTION{<:bouton_cache_activer:>,#URL_ACTION_AUTEUR{purger,reactive_cache,#SELF},ajax})]
 	]
 	[(#BOUTON_ACTION{<:bouton_vider_cache:>,#URL_ACTION_AUTEUR{purger,cache,#SELF},ajax})]
 #BOITE_FERMER
diff --git a/www/prive/squelettes/inclure/head.html b/www/prive/squelettes/inclure/head.html
index eb75840..422f953 100644
--- a/www/prive/squelettes/inclure/head.html
+++ b/www/prive/squelettes/inclure/head.html
@@ -5,7 +5,7 @@ Appel au script php en attendant de reecrire le head ici
 ]