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

Timestamp:

Jun 10, 2011, 9:02:29 PM (13 years ago)

Author:

mistic100

Message:

parsing bug fixed, works with theme 'Simple'

File:

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

extensions/SmiliesSupport/smiliessupport.inc.php

@@ -5 +5 @@
 function set_smiliessupport()
 {
-  global $conf, $lang;
+  global $conf, $template, $page;
+  
+  load_language('plugin.lang', SMILIES_PATH);
   $conf_smiliessupport = explode(',' , $conf['smiliessupport']);
   
   $smilies = get_smilies($conf_smiliessupport);
-  $lang['Comment'] .= SmiliesTable($conf_smiliessupport, $smilies);  
+  
+  // 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('smilies_textarea', 'contenteditid');
+  // } else {
+    // $template->assign('smilies_textarea', 'contentid');
+  // }
+  $template->assign('smilies_textarea', 'contentid');
+  
+  $template->assign(array(
+    'SMILIES_PATH' => SMILIES_PATH,
+    'REPRESENTANT' => PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/'.$conf_smiliessupport[2],
+    'smiliesfiles' => $smilies,
+  ));
+  
+  $template->set_prefilter('picture', 'set_smiliessupport_prefilter');  
+}
+
+function set_smiliessupport_prefilter($content, &$smarty)
+{
+  $search = "<label>{'Comment'|@translate}";
+  $replace = file_get_contents(SMILIES_PATH.'/template/smiliessupport_page.tpl').$search;
+  return str_replace($search, $replace, $content);
 }
 
@@ -34 +61 @@
     
     return $smilies;
-  } else {
+  } 
+  else 
+  {
     return false;
   }
-}
-
-// get the smilies button ## must received the unserialized configuration array AND the smilies array
-function SmiliesTable($conf_smiliessupport, $smilies)
-{
-  global $template;
-  load_language('plugin.lang', SMILIES_PATH);
-
-  // 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 {
-    // $template->assign('form_name', 'addComment');
-  // }
-  $template->assign('form_name', 'addComment');
-
-  $template->assign(array(
-    'SMILIES_PATH' => SMILIES_PATH,
-    'REPRESENTANT' => PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/'.$conf_smiliessupport[2],
-    'smiliesfiles' => $smilies,
-  ));
-  
-  $template->set_filename('smiliessupport_page', dirname(__FILE__).'/template/smiliessupport_page.tpl');
-  return $template->parse('smiliessupport_page', true);
 }
 
@@ -74 +76 @@
   $def_path = $conf_smiliessupport[0].'/smilies.txt';
   $accepted_ext = array('gif', 'jpg', 'png');
+  $str = ' '.$str;
   
   if ($handle = opendir(PHPWG_ROOT_PATH.$conf_smiliessupport[0]))
@@ -79 +82 @@
     while (false !== ($file = readdir($handle)))
     { 
-      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).':"/>';
+      if ($file != "." && $file != ".." && in_array(get_extension($file), $accepted_ext)) 
+      {
+        $filename = get_filename_wo_extension($file);
+        $v = ':'.$filename.':'; 
+        $s = '<img src="'.$conf_smiliessupport[0].'/'.$file.'" alt=":'.$filename.':"/>';
         $str = str_replace($v, $s, $str);
       }
@@ -93 +98 @@
     {
       $v = trim($v);
-      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]).':"/>';
-        $str = preg_replace($r, $t, $str);
+      if (preg_match('#^([^\t]+)[ \t]+(.+)$#', $v, $matches)) 
+      {  
+        $filename = get_filename_wo_extension($matches[2]);
+        $v = '#[^"]'.preg_quote($matches[1],'/').'#';          
+        $t = '<img src="'.$conf_smiliessupport[0].'/'.$matches[2].'" alt=":'.$filename.':"/>';
+        $str = preg_replace($v, $t, $str);
       }
     }
   } 
   
-  return $str;
+  return trim($str);
 }