Changeset 2194

Timestamp:

04/15/10 23:52:50 (13 years ago)

Author:

Moe

Message:

@ Reply 1.4.1-alpha1 :

• call AtReplyThread?.js before atReply.js, may fix bugs with "append replies"
• moved Javascript files to js directory
• fixed bug with incorrect type of settings

Location:

plugins/atReply

Files:

• _admin.php (modified) (1 diff)
• _define.php (modified) (2 diffs)
• _public.php (modified) (6 diffs)
• gpl-3.0.txt (added)
• index.php (modified) (5 diffs)
• js (added)
• js/atReply.js (moved) (moved from plugins/atReply/atReply.js)
• js/atReplyThread.js (moved) (moved from plugins/atReply/atReplyThread.js) (2 diffs)
• locales/fr/main.po (modified) (1 diff)

plugins/atReply/_admin.php

@@ -3 +3 @@
 #
 # This file is part of @ Reply, a plugin for Dotclear 2
-# Copyright 2008,2009 Moe (http://gniark.net/) and buns
+# Copyright 2008,2009,2010 Moe (http://gniark.net/) and buns
 #
 # @ Reply is free software; you can redistribute it and/or modify

plugins/atReply/_define.php

@@ -3 +3 @@
 #
 # This file is part of @ Reply, a plugin for Dotclear 2
-# Copyright 2008,2009 Moe (http://gniark.net/) and buns
+# Copyright 2008,2009,2010 Moe (http://gniark.net/) and buns
 #
 # @ Reply is free software; you can redistribute it and/or modify
@@ -30 +30 @@
   /* Description*/  'Easily reply to comments',
   /* Author */           'Moe (http://gniark.net/) append extension by buns.fr',
-  /* Version */               '1.4',
+  /* Version */               '1.4.1-alpha1',
   /* Permissions */ 'admin'
 );

plugins/atReply/_public.php

@@ -3 +3 @@
 #
 # This file is part of @ Reply, a plugin for Dotclear 2
-# Copyright 2008,2009 Moe (http://gniark.net/) and buns
+# Copyright 2008,2009,2010 Moe (http://gniark.net/) and buns
 #
 # @ Reply is free software; you can redistribute it and/or modify
@@ -37 +37 @@
 class AtReplyTpl
 {
-     public static function templateBeforeValue(&$core,$v,$attr)
+     public static function templateBeforeValue($core,$v,$attr)
      {
           if ($v == 'CommentAuthorLink')
@@ -47 +47 @@
      }
 
-     public static function templateAfterValue(&$core,$v,$attr)
+     public static function templateAfterValue($core,$v,$attr)
      {
           if ($v == 'CommentAuthorLink')
@@ -55 +55 @@
      }
      
-     public static function publicHeadContent(&$core)
+     public static function publicHeadContent($core)
      {
-          $settings = $core->blog->settings;
+          $set = $core->blog->settings;
           
-          # default image
-          $image_url = $core->blog->getQmarkURL().'pf=atReply/img/reply.png';
-
+          $QmarkURL = $core->blog->getQmarkURL();
+          
           # personalized image
-          if (strlen($settings->atreply_color) > 1)
+          if ((strlen($set->atreply_color) > 1)
+               && (file_exists($core->blog->public_path.'/atReply/reply.png')))
           {
-               $personalized_image = $settings->public_url.
-                    '/atReply/reply.png';
-               if (file_exists($core->blog->public_path.'/atReply/reply.png'));
-               {
-                    $image_url = $personalized_image;
-               }
+               $image_url = $set->public_url.'/atReply/reply.png';
+          }
+          else
+          {
+               # default image
+               $image_url = $QmarkURL.'pf=atReply/img/reply.png';
           }
           
-          $title = (($settings->atreply_display_title) ? 'true' : 'false');
+          $title = (($set->atreply_display_title) ? 'true' : 'false');
           
-          # Javascript variables
+          # Javascript
           echo(
                '<script type="text/javascript">'."\n".
@@ -89 +89 @@
                '\'<span class="at_reply_title" style="display:none;">\'+'.
                     'atReplyTitle+\'</span></a>\';'."\n".
-               'var atreply_append = '.($core->blog->settings->atreply_append ? '1' : '0').';'."\n".
-               'var atreply_show_switch = '.($core->blog->settings->atreply_show_switch ? '1' : '0').';'."\n".
+               'var atreply_append = '.($set->atreply_append ? '1' : '0').';'."\n".
+               'var atreply_show_switch = '.($set->atreply_show_switch ? '1' : '0').';'."\n".
                '//]]>'."\n".
-               '</script>'."\n".
-               '<script type="text/javascript" src="'.$core->blog->getQmarkURL().
-               'pf=atReply/atReply.js'.'"></script>'."\n");
+               '</script>'."\n"
+          );
           
-          if ($core->blog->settings->atreply_append)
+          if ($set->atreply_append)
           {
                echo ( 
-                    '<script type="text/javascript" src="'.$core->blog->getQmarkURL().
-                    'pf=atReply/atReplyThread.js'.'"></script>'."\n".
+                    '<script type="text/javascript" src="'.$QmarkURL.
+                    'pf=atReply/js/atReplyThread.js'.'"></script>'."\n".
                     '<style type="text/css">
                     <!--
@@ -117 +116 @@
                     }
                     -->
-                    </style>'.
-                    "\n");
+                    </style>'."\n"
+               );
           }
+          
+          echo('<script type="text/javascript" src="'.$QmarkURL.
+               'pf=atReply/js/atReply.js'.'"></script>'."\n");
      }
      
-     public static function publicCommentBeforeContent(&$core, &$ctx)
+     public static function publicCommentBeforeContent($core,$ctx)
      {
-               echo '<span id="atReplyComment'.$ctx->comments->f('comment_id').'" style="display:none;"></span>';
-          
+               echo '<span id="atReplyComment'.$ctx->comments->f('comment_id').
+                    '" style="display:none;"></span>';
      }
 }

plugins/atReply/index.php

@@ -3 +3 @@
 #
 # This file is part of @ Reply, a plugin for Dotclear 2
-# Copyright 2008,2009 Moe (http://gniark.net/) and buns
+# Copyright 2008,2009,2010 Moe (http://gniark.net/) and buns
 #
 # @ Reply is free software; you can redistribute it and/or modify
@@ -44 +44 @@
                'string','@ Reply arrow\'s color');
           $settings->put('atreply_append',!empty($_POST['atreply_append']),
-               'string','Append replies to appropriate comments');
+               'boolean','Append replies to appropriate comments');
           $settings->put('atreply_show_switch',!empty($_POST['atreply_show_switch']),
-               'string','Display a switch to toggle threading');
+               'boolean','Display a switch to toggle threading');
 
           # inspired by lightbox/admin.php
@@ -152 +152 @@
                # public_path is located at the root of the website
                $image_url = $core->blog->host.'/'.$personalized_image;
+          }
+          elseif (substr($settings->public_url,0,4) == 'http')
+          {
+               $image_url = $personalized_image;
           } else {
                $image_url = $core->blog->url.$personalized_image;
@@ -207 +211 @@
                     </label>
                </p>
+               <p class="form-note">
+                    <?php printf(__('Requires %s.'),
+                         __('Append replies to appropriate comments')); ?>
+               </p>
                
                <p>
@@ -216 +224 @@
                </p>
                <p class="form-note">
-                    <?php echo(__('Leave empty to cancel this feature.').' '.
+                    <?php echo(__('Leave blank to disable this feature.').' '.
                          __('The default image will be used.')); ?>
                </p>

plugins/atReply/js/atReplyThread.js

@@ -7 +7 @@
 
 $(document).ready(function () {
-     if (atreply_show_switch) setSwitchTag();
+     if (atreply_show_switch) {setSwitchTag();}
      getCommentsChildren();
-     if (atreply_append) appendReplies(atreply_append);
+     if (atreply_append) {appendReplies(atreply_append);}
 });
 
@@ -147 +147 @@
           }
      }
-     atReplySimple();
+     //atReplySimple();
 }
 

plugins/atReply/locales/fr/main.po

@@ -85 +85 @@
 msgstr "Enregistrer la configuration"
 
-#~ msgid "Enable %s"
-#~ msgstr "Activer %s"
+msgid "Requires %s."
+msgstr "Nécessite %s."