Changeset 9765

Timestamp:

Mar 19, 2011, 10:35:08 AM (13 years ago)

Author:

mistic100

Message:

[extentions] BBCode Bar

• active for admin in the comments page

Location:

extensions/bbcode_bar

Files:

• admin.php (modified) (2 diffs)
• bbcode.js (modified) (1 diff)
• bbcode_bar.inc.php (modified) (5 diffs)
• bbcode_bar_admin.tpl (modified) (2 diffs)
• main.inc.php (modified) (3 diffs)

extensions/bbcode_bar/admin.php

@@ -11 +11 @@
         // nouveau tableau de config
         unset($conf_bbcode_bar);
-        for ($i=0; $i<=15; $i++)
-        {
+        for ($i=0; $i<=15; $i++) {
                 $conf_bbcode_bar[] = (isset($_POST['chkb'.sprintf("%02d", $i)])) ? $_POST['chkb'.sprintf("%02d", $i)] : 0;
         }
@@ -24 +23 @@
     pwg_query($query);
     array_push($page['infos'], l10n('Information data registered in database'));
-        
 }
 
 // Parametrage du template
-for ($i=0; $i<=15; $i++)
-{
+for ($i=0; $i<=15; $i++) {
         $template->assign('CHKB'.sprintf("%02d", $i).'_STATUS', ($conf_bbcode_bar[$i] == 1) ? 'checked="checked"' : null);
 }

extensions/bbcode_bar/bbcode.js

@@ -49 +49 @@
                 bbcode[form+field+code] = 1;
         } else {
-                ToAdd = "\n[/"+code+"]\n";
+                ToAdd = "[/li]\n[/"+code+"]\n";
                 re = new RegExp(code+"1.(\\w+)$");
                 img.src = img.src.replace(re, code+".$1");

extensions/bbcode_bar/bbcode_bar.inc.php

@@ -4 +4 @@
 function set_bbcode_bar()
 {
-        global $template, $conf, $lang, $user, $pwg_loaded_plugins;
+        global $template, $conf, $lang, $user, $pwg_loaded_plugins, $page;
         load_language('plugin.lang', dirname(__FILE__) . '/');
         $conf_bbcode_bar = explode("," , $conf['bbcode_bar']);
@@ -10 +10 @@
 
         // buttons
-        for ($i=0; $i<=15; $i++)
-        {
+        for ($i=0; $i<=15; $i++) {
                 if ($conf_bbcode_bar[$i] == 1) $template->assign('BBCode_bar_button_'.sprintf("%02d", $i), true);
         }
         $template->assign('repicon', $conf_bbcode_bar[16]);
         
-        // edit field has a different id
-        if (isset($_GET['action']) AND $_GET['action'] == 'edit_comment')
-        {
+        // edit field has different id
+        if (
+                (isset($_GET['action']) AND $_GET['action'] == 'edit_comment') 
+                OR (isset($page['body_id']) AND $page['body_id'] == 'theCommentsPage')
+        ) {
                 $template->assign('form_name', 'editComment');
-        }
-        else
-        {
+        } else {
                 $template->assign('form_name', 'addComment');
         }
 
         // smilies support
-        if (isset($pwg_loaded_plugins['SmiliesSupport']))
-        {
+        if (isset($pwg_loaded_plugins['SmiliesSupport'])) {
                 $template->assign('BBCode_bar_SmiliesSupport', array('SMILIESSUPPORT_PAGE' => SmiliesTable()));
         }
@@ -66 +64 @@
                                         while (($temp = array_pop($tags)))
                                         {
-                                                if ($temp != $tag)
-                                                {
+                                                if ($temp != $tag) {
                                                         $before_tag.='[/'.$temp.']';
-                                                }
-                                                else 
-                                                {
+                                                } else {
                                                         $before_tag.='[/'.$tag.']';
                                                         break;
@@ -78 +73 @@
                                         $end_pos += strlen($before_tag)+strlen($after_tag)-strlen($str);
                                         $str = $before_tag.$after_tag;
-                                } 
-                                else 
-                                { // push stack
+                                } else { // push stack
                                         array_push($tags,$tag);
                                 }
@@ -233 +226 @@
         return preg_replace($patterns, $replacements, $str);
 }
+
 ?>

extensions/bbcode_bar/bbcode_bar_admin.tpl

@@ -7 +7 @@
 <form method="post" action="" class="properties" ENCTYPE="multipart/form-data"> 
         <fieldset>
+                <legend>{'Parameters'|@translate}</legend>
                 <ul>
                         <li>
@@ -61 +62 @@
                         </li>
                         <li>
-                                &nbsp;
-                        </li>
-                        <li>
                                 <span class="property">{'size_help'|@translate}</span>
                                 <input type="checkbox" name="chkb13" {$CHKB13_STATUS} value="1" />

extensions/bbcode_bar/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: BBCode Bar
-Version: 2.2.0
+Version: 2.2.a
 Description: Allow use BBCode for comments and descriptions.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=140
@@ -20 +20 @@
         remove_event_handler('render_comment_content', 'render_comment_content');
         add_event_handler('render_comment_content', 'BBCodeParse');
-        add_event_handler('loc_begin_picture', 'set_bbcode_bar');
+        add_event_handler('loc_after_page_header', 'add_bbcode_bar');
+}
+
+function add_bbcode_bar() {
+        global $page;
+        if ($page['body_id'] == 'theCommentsPage' OR $page['body_id'] == 'thePicturePage') {
+                set_bbcode_bar();
+        }
 }
 
@@ -35 +42 @@
         }
 }
+
 ?>