Changeset 9764 for extensions/SmiliesSupport/smiliessupport.inc.php

Timestamp:

Mar 19, 2011, 10:27:48 AM (13 years ago)

Author:

mistic100

Message:

[extentions] Smilies Support

• active for admin in the comments page
• two new sets of smilies
• help tip on admin page (needs translation)

File:

• extensions/SmiliesSupport/smiliessupport.inc.php (modified) (8 diffs)

extensions/SmiliesSupport/smiliessupport.inc.php

@@ -6 +6 @@
         global $template, $lang, $pwg_loaded_plugins;
 
-        if (!isset($pwg_loaded_plugins['bbcode_bar']))
-        {
+        if (!isset($pwg_loaded_plugins['bbcode_bar'])) {
                 $lang['Comment'] .= SmiliesTable();
         }
@@ -14 +13 @@
 function SmiliesTable($new_conf=null)
 {
-        global $conf, $template;
+        global $conf, $template, $page;
 
         // this is for live update on admin page
-        if (empty($new_conf)) 
+        if (empty($new_conf)) {
                 $conf_smiliessupport = explode("," , $conf['smiliessupport']);
-        else
+        } else {
                 $conf_smiliessupport = $new_conf;
+        }
 
         // edit field has a different id
-        if (isset($_GET['action']) AND $_GET['action'] == 'edit_comment')
+        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');
+        }
 
         $cnt = 1;
@@ -40 +44 @@
                         if ($file != "." && $file != ".." && ( get_extension($file) == "gif" || get_extension($file) == "png"))
                         {
-                                if (( $cnt > 0 ) && ( $cnt % $conf_smiliessupport[1] == 0 ))
-                                {
+                                if (( $cnt > 0 ) && ( $cnt % $conf_smiliessupport[1] == 0 )) {
                                         $trvalue = '</tr><tr>';
                                 }
@@ -51 +54 @@
                         }
                 }
-        }
-        else
-        {
+                
+        } else {
                 array_push($page['errors'], l10n('opendir failed : '.PHPWG_ROOT_PATH.$conf_smiliessupport[0].')' ));
         }
@@ -66 +68 @@
         $conf_smiliessupport = explode("," , $conf['smiliessupport']);
         $def_path = $conf_smiliessupport[0].'/smilies.txt';
+        $accepted_ext = array('gif', 'jpg', 'png');
         
         if ($handle = opendir(PHPWG_ROOT_PATH.$conf_smiliessupport[0]))
@@ -71 +74 @@
                 while (false !== ($file = readdir($handle)))
                 { 
-                        if ($file != "." && $file != ".." && ( get_extension($file) == "gif" || get_extension($file) == "png")) {
+                        if ($file != "." && $file != ".." && in_array(get_extension($file), $accepted_ext)) {
                                 $v = ':'.get_filename_wo_extension($file).':'; 
                                 $s = '<img src="'.$conf_smiliessupport[0].'/'.$file.'" alt=":'.get_filename_wo_extension($file).':" title=":'.get_filename_wo_extension($file).':"/>';
@@ -79 +82 @@
         }
         
-        if ( file_exists($def_path) )
+        if (file_exists($def_path))
         {
                 $def = file($def_path);
@@ -85 +88 @@
                 {
                         $v = trim($v);
-                        if (preg_match('|^([^\t]*)[\t]+(.*)$|',$v,$matches))
-                        {       
+                        if (preg_match('|^([^\t]*)[\t]+(.*)$|',$v,$matches)) {  
                                 $r = '#'.preg_quote($matches[1],'/').'#';                                       
                                 $t = '<img src="'.$conf_smiliessupport[0].'/'.$matches[2].'" alt=":'.get_filename_wo_extension($matches[2]).':" title=":'.get_filename_wo_extension($matches[2]).':"/>';