Changeset 100287 in spip-zone for _plugins_/info_sites/branches/v1


Ignore:
Timestamp:
Oct 31, 2016, 9:36:17 AM (2 years ago)
Author:
teddy.spip@…
Message:

Import d'un correctif du trunk sur l'installation (pierretux/RealET)

Location:
_plugins_/info_sites/branches/v1
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed
  • _plugins_/info_sites/branches/v1

  • _plugins_/info_sites/branches/v1/info_sites_administrations.php

    r100283 r100287  
    3939                ),
    4040        );
     41        include_spip('inc/cextras');
     42        include_spip('base/info_sites_extras');
    4143        cextras_api_upgrade(info_sites_declarer_champs_extras(), $maj['1.1.0']);
    4244
  • _plugins_/info_sites/branches/v1/lang/info_sites_fr.php

    r100283 r100287  
    215215        // W
    216216        'webservice_consultation' => 'Consultation du webservice',
     217        'werbservice_inaccessible' => 'Webservice innaccessible',
    217218
    218219        // Z
  • _plugins_/info_sites/branches/v1/paquet.xml

    r100283 r100287  
    22        prefix="info_sites"
    33        categorie="outil"
    4         version="1.14.0"
     4        version="1.14.1"
    55        etat="test"
    66        compatibilite="[3.0.8;3.1.*]"
  • _plugins_/info_sites/branches/v1/squelettes/article.html

    r96690 r100287  
    11<?php if ($auteur_session) { ?>
    2 <BOUCLE_principale_article(ARTICLES){id_article}>
     2<BOUCLE_principale (ARTICLES){id_article}>
    33<INCLURE{fond=structure,env,id_rubrique=#ENV{id_rubrique,#ID_RUBRIQUE},id_secteur=#ID_SECTEUR,type-page=article,composition=#COMPOSITION} />
    4 </BOUCLE_principale_article>
     4</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/auteur.html

    r96690 r100287  
    11<?php if ($auteur_session) { ?>
    2 <BOUCLE_principale_auteur(AUTEURS){id_auteur} {tout}>
     2<BOUCLE_principale (AUTEURS){id_auteur} {tout}>
    33<INCLURE{fond=structure,env,type-page=auteur,composition=#COMPOSITION} />
    4 </BOUCLE_principale_auteur>
     4</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
     11
    512<?php } else { ?>
    613[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/commit.html

    r96690 r100287  
    33<INCLURE{fond=structure,env,type-page=commit,composition=#COMPOSITION} />
    44</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/contact.html

    r96690 r100287  
    11<?php if ($auteur_session) { ?>
    2 <BOUCLE_principal (CONTACTS) {id_contact} {tous}>
     2<BOUCLE_principale (CONTACTS) {id_contact} {tous}>
    33<INCLURE{fond=structure,env,type-page=contact,composition=#COMPOSITION} />
    4 </BOUCLE_principal>
     4</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/content/webservice.html

    r98661 r100287  
    77
    88[<div class="coloration_code cadre">
    9 <pre class="prettyprint xml">(#WEBSERVICE*|url_webservice_xml{#FO_LOGIN, #FO_PASSWORD}|echapper_tags)</pre>
     9<pre class="prettyprint xml">(#WEBSERVICE*|url_webservice_xml{#FO_LOGIN, #FO_PASSWORD}|sinon{<:info_sites:werbservice_inaccessible:>}|echapper_tags)</pre>
    1010</div>]
    1111[(#BOITE_FERMER)]
  • _plugins_/info_sites/branches/v1/squelettes/mot.html

    r96690 r100287  
    33<INCLURE{fond=structure,env,type-page=mot,composition=#COMPOSITION} />
    44</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/organisation.html

    r96690 r100287  
    33<INCLURE{fond=structure,env,type-page=organisation,composition=#COMPOSITION} />
    44</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/projet.html

    r96690 r100287  
    11<?php if ($auteur_session) { ?>#CACHE{0}
    2 <BOUCLE_principale_projet (PROJETS) {id_projet} {tout}>
     2<BOUCLE_principale (PROJETS) {id_projet} {tout}>
    33<INCLURE{fond=structure,env,type-page=projet,composition=#COMPOSITION} />
    4 </BOUCLE_principale_projet>
     4</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/projets_cadre.html

    r96690 r100287  
    11<?php if ($auteur_session) { ?>
    2 <BOUCLE_principal (PROJETS_CADRES) {id_projets_cadre} {tout}>
     2<BOUCLE_principale (PROJETS_CADRES) {id_projets_cadre} {tout}>
    33<INCLURE{fond=structure,env,type-page=projets_cadre,composition=#COMPOSITION} />
    4 </BOUCLE_principal>
     4</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/projets_site.html

    r97648 r100287  
    11<?php if ($auteur_session) { ?>
    2 <BOUCLE_principal (PROJETS_SITES) {id_projets_site} {tout}>
     2<BOUCLE_principale (PROJETS_SITES) {id_projets_site} {tout}>
    33<INCLURE{fond=structure,env,type-page=projets_site,composition=#COMPOSITION} />
    4 </BOUCLE_principal>
     4</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/rubrique.html

    r96690 r100287  
    11<?php if ($auteur_session) { ?>
    2 <BOUCLE_principale_rubrique(RUBRIQUES){id_rubrique}>
     2<BOUCLE_principale (RUBRIQUES){id_rubrique}>
    33<INCLURE{fond=structure,env,id_secteur=#ID_SECTEUR,type-page=rubrique,composition=#COMPOSITION} />
    4 </BOUCLE_principale_rubrique>
     4</BOUCLE_principale>
     5</B_principale>
     6#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     7#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     8#HTTP_HEADER{Pragma: no-cache}
     9<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     10<//B_principale>
    511<?php } else { ?>
    612[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
  • _plugins_/info_sites/branches/v1/squelettes/site.html

    r96690 r100287  
    33]#CACHE{3600}
    44<?php if ($auteur_session) { ?>
    5 <BOUCLE_site(SITES){id_syndic}>
     5<BOUCLE_principale (SITES) {id_syndic}>
    66<INCLURE{fond=structure,env,id_rubrique=#ENV{id_rubrique,#ID_RUBRIQUE},type-page=site,composition=#COMPOSITION} />
    7 </BOUCLE_site>
     7</BOUCLE_principale>
     8</B_principale>
     9#HTTP_HEADER{#VAL{"HTTP/1.0 "}|concat{#ENV{code,"404 Not Found"}}}
     10#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
     11#HTTP_HEADER{Pragma: no-cache}
     12<INCLURE{fond=structure,env,type-page=#ENV{status,404}} />
     13<//B_principale>
    814<?php } else { ?>
    915[(#SET{url, [(#ENV{url}|?{#ENV{url},#SELF})]})]
Note: See TracChangeset for help on using the changeset viewer.