Changeset 3443 for extensions/CommentEditor

Timestamp:

Jun 23, 2009, 12:22:43 AM (15 years ago)

Author:

Criss

Message:

Deactivate anti-flood on update
Adviser can edit only its comments
Language file converted in UTF-8
Add home link in edit and message block title bar

Location:

extensions/CommentEditor

Files:

• classes/ce_plugin.class.php (modified) (10 diffs)
• include/ce_common.inc.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (4 diffs)
• template/edit.tpl (modified) (2 diffs)
• template/message.tpl (modified) (1 diff)

extensions/CommentEditor/classes/ce_plugin.class.php

@@ -1 +1 @@
 <?php
-/* $Id: ce_plugin.class.php,v 1.7 2009/06/22 12:25:04 Criss Exp $ */
+/* $Id: ce_plugin.class.php,v 1.8 2009/06/22 22:18:14 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
@@ -11 +11 @@
 
     var $comments_ids;
-    private static $url_prefix = null;
-
-
-    function CE_Plugin() {
-        if (null == self::$url_prefix) {
-            self::$url_prefix = get_root_url() . 'index.php?' . CE_ACTION . '=';
-        }
-    }
 
     /* ************************ */
@@ -68 +60 @@
             if (isset($this->comments_ids[$key])) {
                 // User allowed to have edit link
-                $comments[$key]['U_ID'] =  $this->comments_ids[$key];
-                $comments[$key]['DATE'] .= ' - <a href="' . $this->getEditUrlPrefix();
-                $comments[$key]['DATE'] .= $comments[$key]['U_ID'] . '">';
+                $current_id = $this->comments_ids[$key];
+                $comments[$key]['U_ID'] =  $current_id;
+                $comments[$key]['DATE'] .= ' - <a href="';
+                $comments[$key]['DATE'] .= $this->getEditUrl($current_id);
+                $comments[$key]['DATE'] .= '">';
                 $comments[$key]['DATE'] .= 'Edit';
                 $comments[$key]['DATE'] .= '</a>';
@@ -81 +75 @@
      * Check whether a comment edit or update is requested.
      */
-    function loc_end_index() {
+    function loc_begin_index() {
         $comment_id = "";
         $action = $this->isCommentEdit($_SERVER['QUERY_STRING'], $comment_id);
@@ -146 +140 @@
             return false;
         }
-        if (is_admin()) {
+        if (is_admin() and !is_adviser()) {
             return true;
         }
@@ -213 +207 @@
             'comment_id'    => $comment->getInfo('comment_id'),
         );
+
+        // Deactivate anti-flood system
+        global $conf;
+        $old_anti_flood = $conf['anti-flood_time'];
+        $conf['anti-flood_time'] = 0;
+
         $comment_action = update_user_comment($comment_array, @$_POST['key'], $infos );
+
+        // Reactivate anti-flood system
+        $conf['anti-flood_time'] = $old_anti_flood;
 
         switch ($comment_action) {
@@ -284 +287 @@
 
         global $template;
+        if ("" == $template->get_template_vars('U_HOME')) {
+            $template->assign('U_HOME', make_index_url());
+        }
         $template->set_filenames(array('ce_message'=>$this->getTemplate('message.tpl')));
         $template->block_html_head( '',
@@ -297 +303 @@
     function displayComment($p_comment) {
         global $template;
-
         $template->set_filenames(array('ce_edit'=>$this->getTemplate()));
         $template->block_html_head( '',
@@ -306 +311 @@
         $template->assign($begin, null);
         $template->assign($end, null);
-        $tplComment = array(
+        $tpl_comment = array(
             'CONTENT'   => $p_comment->getInfo('content'),
             'KEY'       => $p_comment->getInfo('comment_id'),
@@ -313 +318 @@
             'DISABLED'  => !is_admin(),
             'USERS'     => CE_Comment::getUsers(),
-            'F_ACTION'  => $this->getUpdateUrlPrefix(),
+            'F_ACTION'  => $this->getUpdateUrl(),
             'FREEAUTHOR'=> ($p_comment->isKnownAuthor())?'':'checked="checked"'
         );
-        $template->assign('comment', $tplComment);
+        if ("" == $template->get_template_vars('U_HOME')) {
+            $template->assign('U_HOME', make_index_url());
+        }
+        $template->assign('comment', $tpl_comment);
         $template->concat($begin, $template->parse('ce_edit', true));
-    }
-
-    function getEditUrlPrefix() {
-        return self::$url_prefix . CE_ACTION_EDIT . '&' . CE_ID . '=';
-    }
-
-    function getUpdateUrlPrefix() {
-        return self::$url_prefix . CE_ACTION_UPDATE;
+
+    }
+
+    function getScriptName() {
+        // By now, still in index page
+        // return script_basename();
+        return 'index';
+    }
+
+    function getEditUrl($comment_id) {
+        $url  = get_root_url() . $this->getScriptName() . '.php';
+        // By now, still in index pages without params
+        // $url .= get_query_string_diff(array(CE_ACTION, CE_ID));
+        $url = add_url_params(  $url,
+                                array(
+                                    CE_ACTION => CE_ACTION_EDIT,
+                                    CE_ID=>$comment_id
+                                )
+        );
+        return $url;
+    }
+
+    function getUpdateUrl() {
+        $url  = get_root_url() . script_basename() .'.php';
+        // By now, still in index pages without params
+        // $url .= get_query_string_diff(array(CE_ACTION, CE_ID));
+        $url = add_url_params(  $url,
+                                array(
+                                    CE_ACTION => CE_ACTION_UPDATE
+                                )
+        );
+        return $url;
     }
 

extensions/CommentEditor/include/ce_common.inc.php

@@ -1 +1 @@
 <?php
-/* $Id: ce_common.inc.php,v 1.5 2009/06/18 21:02:12 Criss Exp $ */
+/* $Id: ce_common.inc.php,v 1.8 2009/06/22 22:18:13 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('CE_VERSION',       '1.0.f');
 define('CE_INCLUDE_DIR',   'include/');
 define('CE_CLASSES_DIR',   'classes/');

extensions/CommentEditor/language/fr_FR/plugin.lang.php

@@ -1 +1 @@
 <?php
-/* $Id: plugin.lang.php,v 1.3 2009/06/17 19:08:24 Criss Exp $ */
+/* $Id: plugin.lang.php,v 1.4 2009/06/22 22:18:12 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $lang;
+
 
 $lang['comment_edit'] = 'Edition de commentaire';
@@ -11 +12 @@
 $lang[CE_TYPE_INFO] = 'Information';
 $lang[CE_TYPE_ERROR] = 'Erreur';
-$lang['comment_edit_forbidden'] = 'Vous n\'&ecirc;tes pas autoris&eacute; &agrave; &eacute;diter ce commentaire';
-$lang['comment_access_invalid'] = 'Acc&egrave;s invalide';
+$lang['comment_edit_forbidden'] = 'Vous n\'êtes pas autorisé à éditer ce commentaire';
+$lang['comment_access_invalid'] = 'Accès invalide';
 ?>

extensions/CommentEditor/main.inc.php

@@ -1 +1 @@
 <?php
-/* $Id: main.inc.php,v 1.8 2009/06/22 12:25:04 Criss Exp $ */
+/* $Id: main.inc.php,v 1.9 2009/06/22 22:18:14 Criss Exp $ */
 /*
  Plugin Name: Comment Editor
- Version: 1.0.f
+ Version: 1.0.g
  Description: Allow to edit comment
  Plugin URI: http://piwigo.org/ext/extension_view.php?eid=296
@@ -11 +11 @@
 
 /** History **
+
+    2009-06-22 1.0.g
+                        Deactivate anti-flood on update
+                        Adviser can edit only its comments
+                        Language file converted in UTF-8
+                        Add home link in edit and message block title bar
 
     2009-06-22 1.0.f
@@ -34 +40 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
+define('CE_VERSION',       '1.0.g');
 define('CE_PATH', PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
 define('CE_ROOT', dirname(__FILE__).'/');
@@ -45 +52 @@
                     array(&$ce_plugin, 'loc_begin_page_header'));
 add_event_handler(  'loc_begin_index',
-                    array(&$ce_plugin, 'loc_end_index'), 1);
+                    array(&$ce_plugin, 'loc_begin_index'), 1);
 
 set_plugin_data($plugin['id'], $ce_plugin);

extensions/CommentEditor/template/edit.tpl

@@ -1 @@
-{* $Id: edit.tpl,v 1.3 2009/06/17 19:08:24 Criss Exp $ *}
+{* $Id: edit.tpl,v 1.4 2009/06/22 22:18:13 Criss Exp $ *}
 {if !$comment.DISABLED}
 <script type="text/javascript">
@@ -13 +13 @@
 <div id="content" class="content">
     <div class="titrePage">
+        <ul class="categoryActions">
+            <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
+        </ul>
         <h2>{'comment_edit'|@translate}</h2>
     </div>

extensions/CommentEditor/template/message.tpl

@@ -1 @@
-{* $Id: message.tpl,v 1.3 2009/06/17 19:08:24 Criss Exp $ *}
+{* $Id: message.tpl,v 1.4 2009/06/22 22:18:13 Criss Exp $ *}
 <div class="content" id="message-block">
     <div class="titrePage">
+        <ul class="categoryActions">
+            <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
+        </ul>
         <h2 id="message-header">{'CommentEditor'|@translate} - {$message.TITLE}</h2>
     </div>