cy.altern
/
porte_plume
forked from spip/porte_plume
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

PSR

master
kent1@arscenic.info 6 years ago
parent
0a34291c9b
commit
7da98fa322
7 changed files with 276 additions and 283 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      action/porte_plume_previsu.php
  2. 483
      barre_outils/edition.php
  3. 2
      barre_outils/forum.php
  4. 64
      porte_plume_fonctions.php
  5. 2
      porte_plume_ieconfig.php
  6. 2
      porte_plume_start.js_fonctions.php
  7. 4
      tests/lanceur_spip.php

2
action/porte_plume_previsu.php
Unescape View File

@ -7,7 +7,7 @@
* @package SPIP\PortePlume\Actions
*/
if (!defined("_ECRIRE_INC_VERSION")) {
if (!defined('_ECRIRE_INC_VERSION')) {
return;
}

483
barre_outils/edition.php
Unescape View File

@ -6,7 +6,7 @@
* @license GPL
* @package SPIP\PortePlume\BarreOutils
*/
if (!defined("_ECRIRE_INC_VERSION")) {
if (!defined('_ECRIRE_INC_VERSION')) {
return;
}
@ -30,360 +30,351 @@ function barre_outils_edition() {
'markupSet' => array(
// H1 - {{{
array(
"id" => 'header1',
"name" => _T('barreoutils:barre_intertitre'),
"key" => "H",
"className" => "outil_header1",
"openWith" => "\n{{{",
"closeWith" => "}}}\n",
"display" => true,
"selectionType" => "line",
'id' => 'header1',
'name' => _T('barreoutils:barre_intertitre'),
'key' => 'H',
'className' => 'outil_header1',
'openWith' => "\n{{{",
'closeWith' => "}}}\n",
'display' => true,
'selectionType' => 'line',
),
// Bold - {{
array(
"id" => 'bold',
"name" => _T('barreoutils:barre_gras'),
"key" => "B",
"className" => "outil_bold",
"replaceWith" => "function(h){ return espace_si_accolade(h, '{{', '}}');}",
//"openWith" => "{{",
'id' => 'bold',
'name' => _T('barreoutils:barre_gras'),
'key' => 'B',
'className' => 'outil_bold',
'replaceWith' => "function(h){ return espace_si_accolade(h, '{{', '}}');}",
//"openWith" => "{{",
//"closeWith" => "}}",
"display" => true,
"selectionType" => "word",
'display' => true,
'selectionType' => 'word',
),
// Italic - {
array(
"id" => 'italic',
"name" => _T('barreoutils:barre_italic'),
"key" => "I",
"className" => "outil_italic",
"replaceWith" => "function(h){ return espace_si_accolade(h, '{', '}');}",
//"openWith" => "{",
'id' => 'italic',
'name' => _T('barreoutils:barre_italic'),
'key' => 'I',
'className' => 'outil_italic',
'replaceWith' => "function(h){ return espace_si_accolade(h, '{', '}');}",
//"openWith" => "{",
//"closeWith" => "}",
"display" => true,
"selectionType" => "word",
'display' => true,
'selectionType' => 'word',
),
// montrer une suppression
array(
"id" => 'stroke_through',
"name" => _T('barreoutils:barre_barre'), // :-)
"className" => "outil_stroke_through",
"openWith" => "<del>",
"closeWith" => "</del>",
"display" => true,
"selectionType" => "word",
'id' => 'stroke_through',
'name' => _T('barreoutils:barre_barre'), // :-)
'className' => 'outil_stroke_through',
'openWith' => '<del>',
'closeWith' => '</del>',
'display' => true,
'selectionType' => 'word',
),
// listes -*
array(
"id" => 'liste_ul',
"name" => _T('barreoutils:barre_liste_ul'),
"className" => "outil_liste_ul",
"replaceWith" => "function(h){ return outil_liste(h, '*');}",
"display" => true,
"selectionType" => "line",
"forceMultiline" => true,
"dropMenu" => array(
'id' => 'liste_ul',
'name' => _T('barreoutils:barre_liste_ul'),
'className' => 'outil_liste_ul',
'replaceWith' => "function(h){ return outil_liste(h, '*');}",
'display' => true,
'selectionType' => 'line',
'forceMultiline' => true,
'dropMenu' => array(
// liste -#
array(
"id" => 'liste_ol',
"name" => _T('barreoutils:barre_liste_ol'),
"className" => "outil_liste_ol",
"replaceWith" => "function(h){ return outil_liste(h, '#');}",
"display" => true,
"selectionType" => "line",
"forceMultiline" => true,
'id' => 'liste_ol',
'name' => _T('barreoutils:barre_liste_ol'),
'className' => 'outil_liste_ol',
'replaceWith' => "function(h){ return outil_liste(h, '#');}",
'display' => true,
'selectionType' => 'line',
'forceMultiline' => true,
),
// desindenter
array(
"id" => 'desindenter',
"name" => _T('barreoutils:barre_desindenter'),
"className" => "outil_desindenter",
"replaceWith" => "function(h){return outil_desindenter(h);}",
"display" => true,
"selectionType" => "line",
"forceMultiline" => true,
'id' => 'desindenter',
'name' => _T('barreoutils:barre_desindenter'),
'className' => 'outil_desindenter',
'replaceWith' => 'function(h){return outil_desindenter(h);}',
'display' => true,
'selectionType' => 'line',
'forceMultiline' => true,
),
// indenter
array(
"id" => 'indenter',
"name" => _T('barreoutils:barre_indenter'),
"className" => "outil_indenter",
"replaceWith" => "function(h){return outil_indenter(h);}",
"display" => true,
"selectionType" => "line",
"forceMultiline" => true,
'id' => 'indenter',
'name' => _T('barreoutils:barre_indenter'),
'className' => 'outil_indenter',
'replaceWith' => 'function(h){return outil_indenter(h);}',
'display' => true,
'selectionType' => 'line',
'forceMultiline' => true,
),
),
),
// separation
array(
"id" => "sepLink", // trouver un nom correct !
"separator" => "---------------",
"display" => true,
'id' => 'sepLink', // trouver un nom correct !
'separator' => '---------------',
'display' => true,
),
// lien spip
array(
"id" => 'link',
"name" => _T('barreoutils:barre_lien'),
"key" => "L",
"className" => "outil_link",
"openWith" => "[",
"closeWith" => "->[![" . _T('barreoutils:barre_lien_input') . "]!]]",
"display" => true,
'id' => 'link',
'name' => _T('barreoutils:barre_lien'),
'key' => 'L',
'className' => 'outil_link',
'openWith' => '[',
'closeWith' => '->[![' . _T('barreoutils:barre_lien_input') . ']!]]',
'display' => true,
),
// note en bas de page spip
array(
"id" => 'notes',
"name" => _T('barreoutils:barre_note'),
"className" => "outil_notes",
"openWith" => "[[",
"closeWith" => "]]",
"display" => true,
"selectionType" => "word",
'id' => 'notes',
'name' => _T('barreoutils:barre_note'),
'className' => 'outil_notes',
'openWith' => '[[',
'closeWith' => ']]',
'display' => true,
'selectionType' => 'word',
),
// separation
array(
"id" => "sepGuillemets",
"separator" => "---------------",
"display" => true,
'id' => 'sepGuillemets',
'separator' => '---------------',
'display' => true,
),
// quote spip
// (affichee dans forum)
array(
"id" => 'quote',
"name" => _T('barreoutils:barre_quote'),
"key" => "Q",
"className" => "outil_quote",
"openWith" => "\n<quote>",
"closeWith" => "</quote>\n",
"display" => true,
"selectionType" => "word",
"dropMenu" => array(
'id' => 'quote',
'name' => _T('barreoutils:barre_quote'),
'key' => 'Q',
'className' => 'outil_quote',
'openWith' => "\n<quote>",
'closeWith' => "</quote>\n",
'display' => true,
'selectionType' => 'word',
'dropMenu' => array(
// poesie spip
array(
"id" => 'barre_poesie',
"name" => _T('barreoutils:barre_poesie'),
"className" => "outil_poesie",
"openWith" => "\n&lt;poesie&gt;",
"closeWith" => "&lt;/poesie&gt;\n",
"display" => true,
"selectionType" => "line",
'id' => 'barre_poesie',
'name' => _T('barreoutils:barre_poesie'),
'className' => 'outil_poesie',
'openWith' => "\n&lt;poesie&gt;",
'closeWith' => "&lt;/poesie&gt;\n",
'display' => true,
'selectionType' => 'line',
),
),
),
// guillemets
array(
"id" => 'guillemets',
"name" => _T('barreoutils:barre_guillemets'),
"className" => "outil_guillemets",
"openWith" => "&laquo;",
"closeWith" => "&raquo;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf', 'ar', 'es'),
"selectionType" => "word",
"dropMenu" => array(
'id' => 'guillemets',
'name' => _T('barreoutils:barre_guillemets'),
'className' => 'outil_guillemets',
'openWith' => '&laquo;',
'closeWith' => '&raquo;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf', 'ar', 'es'),
'selectionType' => 'word',
'dropMenu' => array(
// guillemets internes
array(
"id" => 'guillemets_simples',
"name" => _T('barreoutils:barre_guillemets_simples'),
"className" => "outil_guillemets_simples",
"openWith" => "&ldquo;",
"closeWith" => "&rdquo;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf', 'ar', 'es'),
"selectionType" => "word",
'id' => 'guillemets_simples',
'name' => _T('barreoutils:barre_guillemets_simples'),
'className' => 'outil_guillemets_simples',
'openWith' => '&ldquo;',
'closeWith' => '&rdquo;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf', 'ar', 'es'),
'selectionType' => 'word',
),
)
),
// guillemets de
array(
"id" => 'guillemets_de',
"name" => _T('barreoutils:barre_guillemets'),
"className" => "outil_guillemets_de",
"openWith" => "&bdquo;",
"closeWith" => "&ldquo;",
"display" => true,
"lang" => array('bg', 'de', 'pl', 'hr', 'src'),
"selectionType" => "word",
"dropMenu" => array(
'id' => 'guillemets_de',
'name' => _T('barreoutils:barre_guillemets'),
'className' => 'outil_guillemets_de',
'openWith' => '&bdquo;',
'closeWith' => '&ldquo;',
'display' => true,
'lang' => array('bg', 'de', 'pl', 'hr', 'src'),
'selectionType' => 'word',
'dropMenu' => array(
// guillemets de, simples
array(
"id" => 'guillemets_de_simples',
"name" => _T('barreoutils:barre_guillemets_simples'),
"className" => "outil_guillemets_de_simples",
"openWith" => "&sbquo;",
"closeWith" => "&lsquo;",
"display" => true,
"lang" => array('bg', 'de', 'pl', 'hr', 'src'),
"selectionType" => "word",
'id' => 'guillemets_de_simples',
'name' => _T('barreoutils:barre_guillemets_simples'),
'className' => 'outil_guillemets_de_simples',
'openWith' => '&sbquo;',
'closeWith' => '&lsquo;',
'display' => true,
'lang' => array('bg', 'de', 'pl', 'hr', 'src'),
'selectionType' => 'word',
),
)
),
// guillemets autres langues
array(
"id" => 'guillemets_autres',
"name" => _T('barreoutils:barre_guillemets'),
"className" => "outil_guillemets_simples",
"openWith" => "&ldquo;",
"closeWith" => "&rdquo;",
"display" => true,
"lang_not" => array('fr', 'eo', 'cpf', 'ar', 'es', 'bg', 'de', 'pl', 'hr', 'src'),
"selectionType" => "word",
"dropMenu" => array(
'id' => 'guillemets_autres',
'name' => _T('barreoutils:barre_guillemets'),
'className' => 'outil_guillemets_simples',
'openWith' => '&ldquo;',
'closeWith' => '&rdquo;',
'display' => true,
'lang_not' => array('fr', 'eo', 'cpf', 'ar', 'es', 'bg', 'de', 'pl', 'hr', 'src'),
'selectionType' => 'word',
'dropMenu' => array(
// guillemets simples, autres langues
array(
"id" => 'guillemets_autres_simples',
"name" => _T('barreoutils:barre_guillemets_simples'),
"className" => "outil_guillemets_uniques",
"openWith" => "&lsquo;",
"closeWith" => "&rsquo;",
"display" => true,
"lang_not" => array('fr', 'eo', 'cpf', 'ar', 'es', 'bg', 'de', 'pl', 'hr', 'src'),
"selectionType" => "word",
'id' => 'guillemets_autres_simples',
'name' => _T('barreoutils:barre_guillemets_simples'),
'className' => 'outil_guillemets_uniques',
'openWith' => '&lsquo;',
'closeWith' => '&rsquo;',
'display' => true,
'lang_not' => array('fr', 'eo', 'cpf', 'ar', 'es', 'bg', 'de', 'pl', 'hr', 'src'),
'selectionType' => 'word',
),
)
),
// separation
array(
"id" => "sepCaracteres",
"separator" => "---------------",
"display" => true,
'id' => 'sepCaracteres',
'separator' => '---------------',
'display' => true,
),
// icones clavier
array(
"id" => 'grpCaracteres',
"name" => _T('barreoutils:barre_inserer_caracteres'),
"className" => 'outil_caracteres',
"display" => true,
"dropMenu" => array(
'id' => 'grpCaracteres',
'name' => _T('barreoutils:barre_inserer_caracteres'),
'className' => 'outil_caracteres',
'display' => true,
'dropMenu' => array(
// A majuscule accent grave
array(
"id" => 'A_grave',
"name" => _T('barreoutils:barre_a_accent_grave'),
"className" => "outil_a_maj_grave",
"replaceWith" => "&Agrave;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf'),
'id' => 'A_grave',
'name' => _T('barreoutils:barre_a_accent_grave'),
'className' => 'outil_a_maj_grave',
'replaceWith' => '&Agrave;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf'),
),
// E majuscule accent aigu
array(
"id" => 'E_aigu',
"name" => _T('barreoutils:barre_e_accent_aigu'),
"className" => "outil_e_maj_aigu",
"replaceWith" => "&Eacute;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf'),
'id' => 'E_aigu',
'name' => _T('barreoutils:barre_e_accent_aigu'),
'className' => 'outil_e_maj_aigu',
'replaceWith' => '&Eacute;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf'),
),
// E majuscule accent grave
array(
"id" => 'E_grave',
"name" => _T('barreoutils:barre_e_accent_grave'),
"className" => "outil_e_maj_grave",
"replaceWith" => "&Egrave;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf'),
'id' => 'E_grave',
'name' => _T('barreoutils:barre_e_accent_grave'),
'className' => 'outil_e_maj_grave',
'replaceWith' => '&Egrave;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf'),
),
// e dans le a
array(
"id" => 'aelig',
"name" => _T('barreoutils:barre_ea'),
"className" => "outil_aelig",
"replaceWith" => "&aelig;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf'),
'id' => 'aelig',
'name' => _T('barreoutils:barre_ea'),
'className' => 'outil_aelig',
'replaceWith' => '&aelig;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf'),
),
// e dans le a majuscule
array(
"id" => 'AElig',
"name" => _T('barreoutils:barre_ea_maj'),
"className" => "outil_aelig_maj",
"replaceWith" => "&AElig;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf'),
'id' => 'AElig',
'name' => _T('barreoutils:barre_ea_maj'),
'className' => 'outil_aelig_maj',
'replaceWith' => '&AElig;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf'),
),
// oe
// oe
array(
"id" => 'oe',
"name" => _T('barreoutils:barre_eo'),
"className" => "outil_oe",
"replaceWith" => "&oelig;",
"display" => true,
"lang" => array('fr'),
'id' => 'oe',
'name' => _T('barreoutils:barre_eo'),
'className' => 'outil_oe',
'replaceWith' => '&oelig;',
'display' => true,
'lang' => array('fr'),
),
// OE
// OE
array(
"id" => 'OE',
"name" => _T('barreoutils:barre_eo_maj'),
"className" => "outil_oe_maj",
"replaceWith" => "&OElig;",
"display" => true,
"lang" => array('fr'),
'id' => 'OE',
'name' => _T('barreoutils:barre_eo_maj'),
'className' => 'outil_oe_maj',
'replaceWith' => '&OElig;',
'display' => true,
'lang' => array('fr'),
),
// c cedille majuscule
array(
"id" => 'Ccedil',
"name" => _T('barreoutils:barre_c_cedille_maj'),
"className" => "outil_ccedil_maj",
"replaceWith" => "&Ccedil;",
"display" => true,
"lang" => array('fr', 'eo', 'cpf'),
'id' => 'Ccedil',
'name' => _T('barreoutils:barre_c_cedille_maj'),
'className' => 'outil_ccedil_maj',
'replaceWith' => '&Ccedil;',
'display' => true,
'lang' => array('fr', 'eo', 'cpf'),
),
// Transformation en majuscule
array(
"id" => 'uppercase',
"name" => _T('barreoutils:barre_gestion_cr_changercassemajuscules'),
"className" => "outil_uppercase",
"replaceWith" => 'function(markitup) { return markitup.selection.toUpperCase() }',
"display" => true,
"lang" => array('fr', 'en'),
'id' => 'uppercase',
'name' => _T('barreoutils:barre_gestion_cr_changercassemajuscules'),
'className' => 'outil_uppercase',
'replaceWith' => 'function(markitup) { return markitup.selection.toUpperCase() }',
'display' => true,
'lang' => array('fr', 'en'),
),
// Transformation en minuscule
array(
"id" => 'lowercase',
"name" => _T('barreoutils:barre_gestion_cr_changercasseminuscules'),
"className" => "outil_lowercase",
"replaceWith" => 'function(markitup) { return markitup.selection.toLowerCase() }',
"display" => true,
"lang" => array('fr', 'en'),
'id' => 'lowercase',
'name' => _T('barreoutils:barre_gestion_cr_changercasseminuscules'),
'className' => 'outil_lowercase',
'replaceWith' => 'function(markitup) { return markitup.selection.toLowerCase() }',
'display' => true,
'lang' => array('fr', 'en'),
),
),
),
// Groupe de Codes informatiques.
array(
"id" => "sepCode",
"separator" => "---------------",
"display" => true,
'id' => 'sepCode',
'separator' => '---------------',
'display' => true,
),
array(
// groupe code et bouton <code>
"id" => 'grpCode',
"name" => _T('barreoutils:barre_inserer_code'),
"className" => 'outil_code',
"openWith" => "<code>",
"closeWith" => "</code>",
"display" => true,
"dropMenu" => array(
'id' => 'grpCode',
'name' => _T('barreoutils:barre_inserer_code'),
'className' => 'outil_code',
'openWith' => '<code>',
'closeWith' => '</code>',
'display' => true,
'dropMenu' => array(
// bouton <cadre>
array(
"id" => 'cadre',
"name" => _T('barreoutils:barre_inserer_cadre'),
"className" => 'outil_cadre',
"openWith" => "<cadre>\n",
"closeWith" => "\n</cadre>",
"display" => true,
'id' => 'cadre',
'name' => _T('barreoutils:barre_inserer_cadre'),
'className' => 'outil_cadre',
'openWith' => "<cadre>\n",
'closeWith' => "\n</cadre>",
'display' => true,
),
),
),
@ -441,7 +432,7 @@ function barre_outils_edition() {
}
return s;
}
// desindente des -* ou -** ou -# ou -##
function outil_desindenter(h){
if (s = h.selection) {
@ -457,7 +448,7 @@ function barre_outils_edition() {
}
return s;
}
// ajouter un espace avant, apres un {qqc} pour ne pas que
// gras {{}} suivi de italique {} donnent {{{}}}, mais { {{}} }
function espace_si_accolade(h, openWith, closeWith){
@ -474,7 +465,7 @@ function barre_outils_edition() {
}
}
return openWith + s + closeWith;
}
}
",
));

2
barre_outils/forum.php
Unescape View File

@ -6,7 +6,7 @@
* @license GPL
* @package SPIP\PortePlume\BarreOutils
*/
if (!defined("_ECRIRE_INC_VERSION")) {
if (!defined('_ECRIRE_INC_VERSION')) {
return;
}

64
porte_plume_fonctions.php
Unescape View File

@ -7,7 +7,7 @@
* @package SPIP\PortePlume\BarreOutils
*/
if (!defined("_ECRIRE_INC_VERSION")) {
if (!defined('_ECRIRE_INC_VERSION')) {
return;
}
@ -27,14 +27,14 @@ class Barre_outils {
* @todo À supprimer car non utilisé !
* @var string
*/
public $id = "";
public $id = '';
/**
* Nom de la barre d'outil
*
* @var string
*/
public $nameSpace = "";
public $nameSpace = '';
/**
* Langue
@ -42,7 +42,7 @@ class Barre_outils {
* @todo À supprimer car non utilisé !
* @var string
*/
public $lang = "";
public $lang = '';
/**
* Option de markitup : rafraîchir la prévisu ?
@ -58,7 +58,7 @@ class Barre_outils {
* @todo À supprimer car on le redéfini dans l'appel javascript !
* @var bool
*/
public $previewParserPath = "";
public $previewParserPath = '';
/**
* Option de markitup : que faire sur l'appuie de Entrée ?
@ -94,14 +94,14 @@ class Barre_outils {
*
* @var string
*/
public $beforeInsert = "";
public $beforeInsert = '';
/**
* Option de markitup : Code JS à exécuter après une insertion
*
* @var string
*/
public $afterInsert = "";
public $afterInsert = '';
/**
* Description des outils/boutons et leurs sous boutons éventuels
@ -116,7 +116,7 @@ class Barre_outils {
*
* @var string
*/
public $functions = "";
public $functions = '';
/**
* Liste des paramètres valides pour une description d'outils (markupSet)
@ -160,7 +160,8 @@ class Barre_outils {
'multiline',
// open/close sur chaque ligne (mais replace est applique sur l'ensemble de la selection)
'forceMultiline',
// pour faire comme si on faisait systematiquement un control+shift (et replace est applique sur chaque ligne de la selection)
// pour faire comme si on faisait systematiquement un control+shift
// (et replace est applique sur chaque ligne de la selection)
'separator',
@ -258,8 +259,7 @@ class Barre_outils {
public function affecter(&$tableau, $identifiant, $params = array(), $lieu = 'dedans', $plusieurs = false) {
static $cle_de_recherche = 'id'; // ou className ?
if ($tableau === null) // utile ?
{
if ($tableau === null) {// utile ?
$tableau = &$this->markupSet;
}
@ -306,7 +306,8 @@ class Barre_outils {
foreach ($tableau as $i => $v) {
if (is_array($v)) {
foreach ($v as $m => $n) {
if (is_array($n) and ($r = $this->affecter($tableau[$i][$m], $identifiant, $params, $lieu, $plusieurs))) {
if (is_array($n)
and ($r = $this->affecter($tableau[$i][$m], $identifiant, $params, $lieu, $plusieurs))) {
return $r;
}
}
@ -556,9 +557,10 @@ class Barre_outils {
foreach ($tableau as $p => &$v) {
if (isset($v['display']) and !$v['display']) {
unset($tableau[$p]);
$tableau = array_values($tableau); // remettre les cles automatiques sinon json les affiche et ça plante.
} // sinon, on lance une recursion sur les sous-menus
else {
// remettre les cles automatiques sinon json les affiche et ça plante.
$tableau = array_values($tableau);
} else {
// sinon, on lance une recursion sur les sous-menus
if (isset($v['dropMenu']) and is_array($v['dropMenu'])) {
$this->enlever_elements_non_affiches($tableau[$p]['dropMenu']);
// si le sous-menu est vide
@ -593,20 +595,21 @@ class Barre_outils {
if (isset($v['separator']) and $v['separator']) {
if (isset($tableau[$p - 1])) {
if (!isset($tableau[$p - 1]['className'])) {
$tableau[$p - 1]['className'] = "";
$tableau[$p - 1]['className'] = '';
}
$tableau[$p - 1]['className'] .= " separateur_avant";
$tableau[$p - 1]['className'] .= ' separateur_avant';
}
if (isset($tableau[$p + 1])) {
if (!isset($tableau[$p + 1]['className'])) {
$tableau[$p + 1]['className'] = "";
$tableau[$p + 1]['className'] = '';
}
$tableau[$p + 1]['className'] .= " separateur separateur_apres $v[id]";
}
unset($tableau[$p]);
$tableau = array_values($tableau); // remettre les cles automatiques sinon json les affiche et ça plante.
} // sinon, on lance une recursion sur les sous-menus
else {
// remettre les cles automatiques sinon json les affiche et ça plante.
$tableau = array_values($tableau);
} else {
// sinon, on lance une recursion sur les sous-menus
if (isset($v['dropMenu']) and is_array($v['dropMenu'])) {
#$this->enlever_separateurs($tableau[$p]['dropMenu']);
}
@ -683,22 +686,22 @@ class Barre_outils {
public function json_export($var) {
$asso = false;
switch (true) {
case is_null($var) :
case is_null($var):
return 'null';
case is_string($var) :
case is_string($var):
if (strtolower(substr(ltrim($var), 0, 8)) == 'function') {
return $var;
}
return '"' . addcslashes($var, "\"\\\n\r") . '"';
case is_bool($var) :
case is_bool($var):
return $var ? 'true' : 'false';
case is_scalar($var) :
case is_scalar($var):
return $var;
case is_object($var) :
case is_object($var):
$var = get_object_vars($var);
$asso = true;
case is_array($var) :
case is_array($var):
$keys = array_keys($var);
$ikey = count($keys);
while (!$asso && $ikey--) {
@ -726,7 +729,6 @@ class Barre_outils {
return false;
}
}
@ -744,7 +746,7 @@ class Barre_outils {
*/
function barre_outils_css_icones() {
// recuperer la liste, extraire les icones
$css = "";
$css = '';
// liste des barres
if (!$barres = barre_outils_liste()) {
@ -778,9 +780,9 @@ function barre_outils_css_icones() {
// passage en css
foreach ($classe2icone as $n => $i) {
$pos = "";
$pos = '';
if (is_array($i)) {
$pos = "background-position:" . end($i);
$pos = 'background-position:' . end($i);
$i = reset($i);
}
if (file_exists($i)) {

2
porte_plume_ieconfig.php
Unescape View File

@ -8,7 +8,7 @@
* @package SPIP\PortePlume\Pipelines
**/
if (!defined("_ECRIRE_INC_VERSION")) {
if (!defined('_ECRIRE_INC_VERSION')) {
return;
}

2
porte_plume_start.js_fonctions.php
Unescape View File

@ -7,6 +7,6 @@
* @license GPL
* @package SPIP\PortePlume\Javascript
**/
if (!defined("_ECRIRE_INC_VERSION")) {
if (!defined('_ECRIRE_INC_VERSION')) {
return;
}

4
tests/lanceur_spip.php
Unescape View File

@ -3,8 +3,8 @@
* Démarre SPIP afin d'obtenir ses fonctions depuis
* les jeux de tests unitaires de type simpletest
*/
$remonte = "../";
while (!is_dir($remonte . "ecrire")) {
$remonte = '../';
while (!is_dir($remonte . 'ecrire')) {
$remonte = "../$remonte";
}
require $remonte . 'tests/test.inc';

Write Preview
Loading…
Cancel
Save