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

Timestamp:

Apr 29, 2012, 5:00:53 PM (12 years ago)

Author:

mistic100

Message:

update for 2.4

File:

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

extensions/SmiliesSupport/smiliessupport.inc.php

@@ -8 +8 @@
   
   load_language('plugin.lang', SMILIES_PATH);
-  $conf_smiliessupport = explode(',' , $conf['smiliessupport']);
-  
-  $smilies = get_smilies($conf_smiliessupport);
-  
-  // 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');
-  
+  $conf_smiliessupport = unserialize($conf['smiliessupport']);
+
   $template->assign(array(
     'SMILIES_PATH' => SMILIES_PATH,
-    'REPRESENTANT' => PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/'.$conf_smiliessupport[2],
-    'smiliesfiles' => $smilies,
+    'REPRESENTANT' => SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/'.$conf_smiliessupport['representant'],
+    'smiliesfiles' => get_smilies($conf_smiliessupport),
   ));
   
@@ -34 +21 @@
 function set_smiliessupport_prefilter($content, &$smarty)
 {
-  $search = "<label>{'Comment'|@translate}";
+  $search = '<div id="commentAdd">';
   $replace = file_get_contents(SMILIES_PATH.'/template/smiliessupport_page.tpl').$search;
   return str_replace($search, $replace, $content);
@@ -44 +31 @@
   $accepted_ext = array('gif', 'jpg', 'png');
   
-  if ($handle = opendir(PHPWG_ROOT_PATH.$conf_smiliessupport[0]))
+  if ($handle = opendir(SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder']))
   {
     $i = 1;
@@ -52 +39 @@
       {
         $smilies[] = array(
-          'PATH' => PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/'.$file,
+          'PATH' => SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/'.$file,
           'TITLE' => ':'.get_filename_wo_extension($file).':',
-          'TR' => ($i>0 AND $i%$conf_smiliessupport[1] == 0) ? '</tr><tr>' : null,
+          'TR' => ($i>0 AND $i%$conf_smiliessupport['cols'] == 0) ? '</tr><tr>' : null,
         );
         $i++;
@@ -60 +47 @@
     }
     
+    closedir($handle);
     return $smilies;
   } 
@@ -73 +61 @@
   global $conf;
 
-  $conf_smiliessupport = explode("," , $conf['smiliessupport']);
-  $def_path = $conf_smiliessupport[0].'/smilies.txt';
+  $conf_smiliessupport = unserialize($conf['smiliessupport']);
+  $def_path = SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/smilies.txt';
   $accepted_ext = array('gif', 'jpg', 'png');
   $str = ' '.$str;
   
-  if ($handle = opendir(PHPWG_ROOT_PATH.$conf_smiliessupport[0]))
+  if ($handle = opendir(SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder']))
   {
     while (false !== ($file = readdir($handle)))
@@ -86 +74 @@
         $filename = get_filename_wo_extension($file);
         $v = ':'.$filename.':'; 
-        $s = '<img src="'.$conf_smiliessupport[0].'/'.$file.'" alt=":'.$filename.':"/>';
+        $s = '<img src="'.SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/'.$file.'" alt=":'.$filename.':"/>';
         $str = str_replace($v, $s, $str);
       }
     }
+    
+    closedir($handle);
   }
   
@@ -102 +92 @@
         $filename = get_filename_wo_extension($matches[2]);
         $v = '#([^"])'.preg_quote($matches[1],'/').'#';          
-        $t = '$1<img src="'.$conf_smiliessupport[0].'/'.$matches[2].'" alt=":'.$filename.':"/>';
+        $t = '$1<img src="'.SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/'.$matches[2].'" alt=":'.$filename.':"/>';
         $str = preg_replace($v, $t, $str);
       }