[SPIP][PLUGINS] v3.0-->v3.2

[lhc/web/www.git] / www / plugins-dist / revisions / formulaires / reviser.php

diff --git a/www/plugins-dist/revisions/formulaires/reviser.php b/www/plugins-dist/revisions/formulaires/reviser.php
index 205b3a2..6814a50 100644 (file)
--- a/www/plugins-dist/revisions/formulaires/reviser.php
+++ b/www/plugins-dist/revisions/formulaires/reviser.php
@@ -10,96 +10,111 @@
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined("_ECRIRE_INC_VERSION")) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
 
 include_spip('base/abstract_sql');
 
-function trouver_version_inf($objet,$id_objet,$cond=""){
+function trouver_version_inf($objet, $id_objet, $cond = '') {
        return sql_getfetsel(
-                               'id_version',
-                               'spip_versions',
-                               ($cond?"$cond AND ":"")."objet=".sql_quote($objet)." AND id_objet=".intval($id_objet),
-                               '',
-                               'id_version DESC',
-                               '0,1'
-                         );
+               'id_version',
+               'spip_versions',
+               ($cond ? "$cond AND " : '') . 'objet=' . sql_quote($objet) . ' AND id_objet=' . intval($id_objet),
+               '',
+               'id_version DESC',
+               '0,1'
+       );
 }
-function check_version_diff($objet, $id_objet, $id_version, $id_diff, $last_version=0){
-       if (!$last_version)
-               $last_version = trouver_version_inf($objet,$id_objet);
+
+function check_version_diff($objet, $id_objet, $id_version, $id_diff, $last_version = 0) {
+       if (!$last_version) {
+               $last_version = trouver_version_inf($objet, $id_objet);
+       }
 
        // si pas de diff possible, on renvoi 0,0
-       if (!$last_version)
-               return array(0,0);
+       if (!$last_version) {
+               return array(0, 0);
+       }
 
-       if ($last_version==1)
-               return array(1,0);
+       if ($last_version == 1) {
+               return array(1, 0);
+       }
 
-       $id_version = max($id_version,2);
-       $id_version = min($id_version,$last_version);
+       $id_version = max($id_version, 2);
+       $id_version = min($id_version, $last_version);
 
        // verifier id_version
-       $id_version = trouver_version_inf($objet,$id_objet,"id_version<=".intval($id_version));
+       $id_version = trouver_version_inf($objet, $id_objet, 'id_version <= ' . intval($id_version));
 
        // si rien trouve on prend la derniere
-       if (!$id_version)
+       if (!$id_version) {
                $id_version = $last_version;
+       }
 
        // minorer id_diff en fonction de id_version
-       $id_diff = min($id_diff,$id_version-1);
+       $id_diff = min($id_diff, $id_version - 1);
        // verifier id_diff
-       $id_diff = trouver_version_inf($objet,$id_objet,"id_version<=".intval($id_diff));
+       $id_diff = trouver_version_inf($objet, $id_objet, 'id_version <= ' . intval($id_diff));
 
-       if (!$id_diff)
-               $id_diff = trouver_version_inf($objet,$id_objet,"id_version<".intval($id_version));
+       if (!$id_diff) {
+               $id_diff = trouver_version_inf($objet, $id_objet, 'id_version < ' . intval($id_version));
+       }
 
        // echec, on renvoi ce qu'on peut
-       if (!$id_diff)
-               $id_diff = $id_version-1;
+       if (!$id_diff) {
+               $id_diff = $id_version - 1;
+       }
 
        return array($id_version, $id_diff);
 }
 
-function formulaires_reviser_charger_dist($objet,$id_objet,$id_version,$id_diff){
-       if (!$objets = unserialize($GLOBALS['meta']['objets_versions']))
+function formulaires_reviser_charger_dist($objet, $id_objet, $id_version, $id_diff) {
+       if (!$objets = unserialize($GLOBALS['meta']['objets_versions'])) {
                $objets = array();
+       }
 
-       if (!in_array(table_objet_sql($objet),$objets))
+       if (!in_array(table_objet_sql($objet), $objets)) {
                return false;
+       }
 
-       $last_version = trouver_version_inf($objet,$id_objet);
-       list($id_version,$id_diff) = check_version_diff($objet,$id_objet,$id_version,$id_diff,$last_version);
-       if (!$id_version)
+       $last_version = trouver_version_inf($objet, $id_objet);
+       list($id_version, $id_diff) = check_version_diff($objet, $id_objet, $id_version, $id_diff, $last_version);
+       if (!$id_version) {
                return false;
-       
+       }
+
        $valeurs = array(
-               '_last_version'=>$last_version,
-               '_objet'=>$objet,
-               '_id_objet'=>$id_objet,
-               'id_version'=>$id_version,
-               'id_diff'=>$id_diff,
+               '_last_version' => $last_version,
+               '_objet' => $objet,
+               '_id_objet' => $id_objet,
+               'id_version' => $id_version,
+               'id_diff' => $id_diff,
        );
 
        return $valeurs;
 }
 
-function formulaires_reviser_verifier_dist($objet,$id_objet,$id_version,$id_diff){
+function formulaires_reviser_verifier_dist($objet, $id_objet, $id_version, $id_diff) {
        $erreurs = array();
-       list($id_version,$id_diff) = check_version_diff($objet,$id_objet,_request('id_version'),_request('id_diff'));
-       set_request('id_version',$id_version);
-       set_request('id_diff',$id_diff);
+       list($id_version, $id_diff) = check_version_diff($objet, $id_objet, _request('id_version'), _request('id_diff'));
+       set_request('id_version', $id_version);
+       set_request('id_diff', $id_diff);
+
        return $erreurs;
 }
 
-function formulaires_reviser_traiter_dist($objet,$id_objet,$id_version,$id_diff){
-       $res = array('message_ok'=>'','editable'=>true);
+function formulaires_reviser_traiter_dist($objet, $id_objet, $id_version, $id_diff) {
+       $res = array('message_ok' => '', 'editable' => true);
 
        $id_version = _request('id_version');
        $id_diff = _request('id_diff');
 
-       if (_AJAX)
-               $res['message_ok'].="<script type='text/javascript'>if (window.jQuery) jQuery('#wysiwyg.revision').ajaxReload({args:{id_version:$id_version,id_diff:$id_diff},history:true});</script>";
-       else
-               $res['redirect'] = parametre_url(parametre_url(self(),'id_version',$id_version),'id_diff',$id_diff,'&');
+       if (_AJAX) {
+               $res['message_ok'] .= "<script type='text/javascript'>if (window.jQuery) jQuery('#wysiwyg.revision').ajaxReload({args:{id_version:$id_version,id_diff:$id_diff},history:true});</script>";
+       } else {
+               $res['redirect'] = parametre_url(parametre_url(self(), 'id_version', $id_version), 'id_diff', $id_diff, '&');
+       }
+
        return $res;
 }