Changeset 23234 for extensions/SmiliesSupport/include/smiliessupport.inc.php

Timestamp:

Jun 15, 2013, 6:52:37 PM (11 years ago)

Author:

mistic100

Message:

rewrite admin page
new set from Pidgin

Location:

extensions/SmiliesSupport/include

Files:

• . (added)
• smiliessupport.inc.php (moved) (moved from extensions/SmiliesSupport/smiliessupport.inc.php) (4 diffs)

extensions/SmiliesSupport/include/smiliessupport.inc.php

@@ -5 +5 @@
 function set_smiliessupport($prefilter='picture', $textarea_id='contentid')
 {
-  global $conf, $template, $page;
-  
-  load_language('plugin.lang', SMILIES_PATH);
-  $conf_smiliessupport = unserialize($conf['smiliessupport']);
+  global $conf, $template;
 
   $template->assign(array(
     'SMILIES_PATH' => SMILIES_PATH,
-    'SMILIES_ID' => $textarea_id,
-    'REPRESENTANT' => SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/'.$conf_smiliessupport['representant'],
-    'smiliesfiles' => get_smilies($conf_smiliessupport),
+    'SMILIES_ID' =>   $textarea_id,
+    'REPRESENTANT' => SMILIES_DIR.$conf['smiliessupport']['folder'].'/'.$conf['smiliessupport']['representant'],
+    'smiliesfiles' => get_smilies(),
   ));
   
@@ -27 +24 @@
 }
 
-// return an array with available smilies (name and path) ## must received the unserialized configuration array
-function get_smilies($conf_smiliessupport)
+// return an array with available smilies (name and path)
+function get_smilies()
 {
-  $accepted_ext = array('gif', 'jpg', 'png');
+  global $conf;
   
-  if ($handle = opendir(SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder']))
+  if ($handle = opendir(SMILIES_DIR.$conf['smiliessupport']['folder']))
   {
     $i = 1;
     while (false !== ($file = readdir($handle)))
     {
-      if ($file != '.' AND $file != '..' AND in_array(get_extension($file), $accepted_ext))
+      if ($file != '.' and $file != '..' and in_array(get_extension($file), $conf['smiliessupport']['ext']))
       {
         $smilies[] = array(
-          'PATH' => SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/'.$file,
+          'PATH' => SMILIES_DIR.$conf['smiliessupport']['folder'].'/'.$file,
           'TITLE' => ':'.get_filename_wo_extension($file).':',
-          'TR' => ($i>0 AND $i%$conf_smiliessupport['cols'] == 0) ? '</tr><tr>' : null,
+          'TR' => ($i>0 and $i%$conf['smiliessupport']['cols'] == 0) ? '</tr><tr>' : null,
         );
         $i++;
@@ -61 +58 @@
 {
   global $conf;
-
-  $conf_smiliessupport = unserialize($conf['smiliessupport']);
-  $folder = get_absolute_root_url().SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'];
-  $def_path = SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder'].'/smilies.txt';
-  $accepted_ext = array('gif', 'jpg', 'png');
+  
+  $root_path = get_absolute_root_url();
+  $folder = SMILIES_DIR.$conf['smiliessupport']['folder'].'/';
   $str = ' '.$str;
   
-  if ($handle = opendir(SMILIES_PATH.'smilies/'.$conf_smiliessupport['folder']))
+  if ($handle = opendir($folder))
   {
     while (false !== ($file = readdir($handle)))
     { 
-      if ($file != "." && $file != ".." && in_array(get_extension($file), $accepted_ext)) 
+      if ($file != "." && $file != ".." && in_array(get_extension($file), $conf['smiliessupport']['ext'])) 
       {
         $filename = get_filename_wo_extension($file);
         $v = ':'.$filename.':'; 
-        $s = '<img src="'.$folder.'/'.$file.'" alt=":'.$filename.':"/>';
+        $s = '<img src="'.$root_path.$folder.$file.'" alt=":'.$filename.':"/>';
         $str = str_replace($v, $s, $str);
       }
@@ -84 +79 @@
   }
   
-  if (file_exists($def_path))
+  if (file_exists($folder.'smilies.txt'))
   {
-    $def = file($def_path);
-    foreach($def as $v)
+    foreach (file($folder.'smilies.txt', FILE_IGNORE_NEW_LINES) as $v)
     {
       $v = trim($v);
-      if (preg_match('#^([^\t]+)[ \t]+(.+)$#', $v, $matches)) 
+      if (preg_match('#^([^\s]+)[\s]+(.+)$#', $v, $matches)) 
       {  
         $filename = get_filename_wo_extension($matches[2]);
         $v = '#([^"])'.preg_quote($matches[1],'/').'#';          
-        $t = '$1<img src="'.$folder.'/'.$matches[2].'" alt=":'.$filename.':"/>';
+        $t = '$1<img src="'.$root_path.$folder.$matches[2].'" alt=":'.$filename.':"/>';
         $str = preg_replace($v, $t, $str);
       }