Changeset 10986

Timestamp:

05/22/11 12:48:18 (2 years ago)

Author:

mistic100

Message:

code cleanup

Location:

extensions/SmiliesSupport

Files:

• admin.php (modified) (2 diffs)
• language/ar_SA/plugin.lang.php (modified) (1 diff)
• language/cs_CZ/plugin.lang.php (modified) (1 diff)
• language/de_DE/plugin.lang.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• language/hu_HU/plugin.lang.php (modified) (1 diff)
• language/it_IT/plugin.lang.php (modified) (1 diff)
• language/lv_LV/plugin.lang.php (modified) (1 diff)
• language/nl_NL/description.txt (modified) (1 diff)
• language/nl_NL/plugin.lang.php (modified) (1 diff)
• language/no_NO/plugin.lang.php (modified) (1 diff)
• language/pl_PL/plugin.lang.php (modified) (1 diff)
• language/ru_RU/plugin.lang.php (modified) (1 diff)
• language/sk_SK/plugin.lang.php (modified) (1 diff)
• language/sv_SE/plugin.lang.php (modified) (1 diff)
• language/tr_TR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (1 diff)
• smiliessupport.inc.php (modified) (4 diffs)
• template/smiliessupport_admin.tpl (modified) (2 diffs)
• template/smiliessupport_page.tpl (modified) (2 diffs)

extensions/SmiliesSupport/admin.php

@@ -9 +9 @@
 if (isset($_POST['submit']))
 {
-        // the smilies.txt file is not saved if the directory is changed
-        if (isset($_POST['text1']) AND $_POST['text1'] != $conf_smiliessupport[0]) 
-        {
-                $not_save_file = true;
-        }
-        
-        // new configuration
-        $conf_smiliessupport = array(
-                isset($_POST['text1']) ? $_POST['text1'] : 'plugins/SmiliesSupport/smilies_1',
-                isset($_POST['text2']) ? $_POST['text2'] : '6',
-                isset($_POST['text3']) ? $_POST['text3'] : 'smile.png',
-        );
-        if (empty($_POST['text'])) $_POST['text'] = ':)         smile.png';
-                
-    $new_value_smiliessupport = implode(",", $conf_smiliessupport);
-    $query = "UPDATE " . CONFIG_TABLE . "
-                SET value='" . $new_value_smiliessupport . "'
-                WHERE param='smiliessupport'";
-    pwg_query($query);
-        
-        // new definitions file
-        if (!isset($not_save_file)) 
-        {
-                $smilies_file = PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/smilies.txt';     
+  // the smilies.txt file is not saved if the directory is changed
+  if (isset($_POST['text1']) AND $_POST['text1'] != $conf_smiliessupport[0]) 
+  {
+    $not_save_file = true;
+  }
+  
+  // new configuration
+  $conf_smiliessupport = array(
+    isset($_POST['text1']) ? $_POST['text1'] : 'plugins/SmiliesSupport/smilies_1',
+    isset($_POST['text2']) ? $_POST['text2'] : '6',
+    isset($_POST['text3']) ? $_POST['text3'] : 'smile.png',
+  );
+  if (empty($_POST['text'])) $_POST['text'] = ':)    smile.png';
+    
+  conf_update_param('smiliessupport', implode(",", $conf_smiliessupport));
+  array_push($page['infos'], l10n('Information data registered in database'));
+  
+  // new definitions file
+  if (!isset($not_save_file)) 
+  {
+    $smilies_file = PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/smilies.txt';      
 
-                if (file_exists($smilies_file)) {
-                        @copy($smilies_file, get_filename_wo_extension($smilies_file).'.bak');
-                }
-                
-                if (@file_put_contents($smilies_file, stripslashes($_POST['text']))) {  
-                        $page['infos'][] = l10n('Information data registered in database');
-                } else {
-                        $page['errors'][] = l10n('File/directory read error').' : '.$smilies_file;
-                }
-        }
+    if (file_exists($smilies_file)) {
+      @copy($smilies_file, get_filename_wo_extension($smilies_file).'.bak');
+    }
+    
+    if (@!file_put_contents($smilies_file, stripslashes($_POST['text']))) {  
+      array_push($page['errors'], l10n('File/directory read error').' : '.$smilies_file);
+    }
+  }
 }
 
 // check if the representant exists
 if (!file_exists(PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/'.$conf_smiliessupport[2])) {
-        $page['errors'][] = l10n('File/directory read error').' : '.$conf_smiliessupport[0].'/'.$conf_smiliessupport[2];
+  array_push($page['errors'], l10n('File/directory read error').' : '.$conf_smiliessupport[0].'/'.$conf_smiliessupport[2]);
 }
 
 $template->assign(array(
-        'TEXT1_VALUE' => $conf_smiliessupport[0],
-        'TEXT2_VALUE' => $conf_smiliessupport[1],
-        'TEXT3_VALUE' => $conf_smiliessupport[2],
+  'TEXT1_VALUE' => $conf_smiliessupport[0],
+  'TEXT2_VALUE' => $conf_smiliessupport[1],
+  'TEXT3_VALUE' => $conf_smiliessupport[2],
 ));
 
@@ -64 +59 @@
 $smilies_file = PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/smilies.txt';
 if (file_exists($smilies_file)) {
-        $content_file = file_get_contents($smilies_file);
-        $template->assign(array('CONTENT_FILE' => $content_file));
+  $content_file = file_get_contents($smilies_file);
+  $template->assign(array('CONTENT_FILE' => $content_file));
 }
-        
+  
 $template->assign('SMILIES_PATH', SMILIES_PATH);
 $template->set_filename('smiliessupport_conf', dirname(__FILE__).'/template/smiliessupport_admin.tpl');

extensions/SmiliesSupport/language/ar_SA/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "كل الوجوه التعبيرية";
 $lang['smilies_file_help'] = "افتراضيا عندما ينقر المستخدم على  الوجوه التعبيرية، دعم الوجوه التعبيرية يضيف مطابقة الكلمات لاسم الملف (smile.png -> :smile:).<br>
-    ولكن هنا يمكنك تكوين كلمات أخرى لتحل محلها. كل الوجوه التعبيرية في مجلد لها خاصيتها<i>smilies.txt</i> file.";
+  ولكن هنا يمكنك تكوين كلمات أخرى لتحل محلها. كل الوجوه التعبيرية في مجلد لها خاصيتها<i>smilies.txt</i> file.";
 
 ?>

extensions/SmiliesSupport/language/cs_CZ/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "All Smilies";
 $lang['smilies_file_help'] = "By default when a user clicks on a smiley, Smilies Support adds a keyword matching the name of the file (smile.png -> :smile:).<br>
-        But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
+  But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
 
 ?>

extensions/SmiliesSupport/language/de_DE/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "Alle Smilies";
 $lang['smilies_file_help'] = "By default when a user clicks on a smiley, Smilies Support adds a keyword matching the name of the file (smile.png -> :smile:).<br>
-        But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
+  But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
 
 ?>

extensions/SmiliesSupport/language/en_UK/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "All Smilies";
 $lang['smilies_file_help'] = "By default when a user clicks on a smiley, Smilies Support adds a keyword matching the name of the file (smile.png -> :smile:).<br>
-        But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
+  But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
 
 ?>

extensions/SmiliesSupport/language/fr_FR/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "Tous les smileys";
 $lang['smilies_file_help'] = "Par défaut quand l'utilisateur clique sur un smiley, Smilies Support ajoute un mot clef correspondant au nom du fichier (smile.png -> :smile:).<br>
-        Mais vous pouvez configurer ici d'autres chaînes de caractères qui seront remplacées. Chaque dossier de smileys a son propre fichier <i>smilies.txt</i>.";
+  Mais vous pouvez configurer ici d'autres chaînes de caractères qui seront remplacées. Chaque dossier de smileys a son propre fichier <i>smilies.txt</i>.";
 
 ?>

extensions/SmiliesSupport/language/hu_HU/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "Összes hangulatjel";
 $lang['smilies_file_help'] = "Alapértelmezésben, amikor egy felhasználó rákattint egy hangulatjelre, a Smilies Support hozzáad egy kulcsszóegyezőséget a fájl nevéhez. (smile.png -> :smile:).<br>
-        Lehetőség van beállítani másik stringet a kicseréléséhez. Minden egyes hangulatjel könyvtár rendelkezik egy saját <i>smilies.txt</i> fájllal.";
+  Lehetőség van beállítani másik stringet a kicseréléséhez. Minden egyes hangulatjel könyvtár rendelkezik egy saját <i>smilies.txt</i> fájllal.";
 
 ?>

extensions/SmiliesSupport/language/it_IT/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = 'Tutti gli smiley';
 $lang['smilies_file_help'] = 'Di default, quando un utente clicca su un smiley, SmiliesSupport aggiunge una keyword corrispondente al nome del fine (smile.png -> :smile:).<br>
-        Ma potete configurare qui altre serie di caratteri che saranno rimpiazzate. Ogni cartella di smileys ha il suo file <i>smilies.txt</i>';
+  Ma potete configurare qui altre serie di caratteri che saranno rimpiazzate. Ogni cartella di smileys ha il suo file <i>smilies.txt</i>';
 
 ?>

extensions/SmiliesSupport/language/lv_LV/plugin.lang.php

@@ -5 +5 @@
 $lang['representant'] = "Parstavošs";
 $lang['All Smilies'] = "Visi Smailini";
-$lang['smilies_file_help'] = "Pēc noklusēšanas, ja klikšķiniet uz smaidiņa, Smaidiņu Atbalsts (Smilies Support) pievieno ar faila (smile.png -> :smile:) nosaukumu sakrītošu atslēgvārdu.<br>      Ir iespējams nokonfigurēt arī citus variantus. Katrai smailiju mapei ir pašai savs <i>smilies.txt</i> fails.";
+$lang['smilies_file_help'] = "Pēc noklusēšanas, ja klikšķiniet uz smaidiņa, Smaidiņu Atbalsts (Smilies Support) pievieno ar faila (smile.png -> :smile:) nosaukumu sakrītošu atslēgvārdu.<br>
+  Ir iespējams nokonfigurēt arī citus variantus. Katrai smailiju mapei ir pašai savs <i>smilies.txt</i> fails.";
 
 ?>

extensions/SmiliesSupport/language/nl_NL/description.txt

@@ -1 @@
-Laat smileys toe voor reacties en beschrijvingen.
+Allow add Smilies for comments and descriptions.

extensions/SmiliesSupport/language/nl_NL/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = 'Alle Smileys';
 $lang['smilies_file_help'] = 'Als een gebruiker op een smiley klikt, voegt de Smilies Support standaard een trefwoord toe die overeenkomt met de naam van het bestand (smile.png -> :smile:). <br>
-Maar hier kan je andere trefwoorden instellen. Elke smiley map heeft zijn eigen <i>smilies.txt</i> bestand.';
+  Maar hier kan je andere trefwoorden instellen. Elke smiley map heeft zijn eigen <i>smilies.txt</i> bestand.';
 ?>

extensions/SmiliesSupport/language/no_NO/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "All Smilies";
 $lang['smilies_file_help'] = "By default when a user clicks on a smiley, Smilies Support adds a keyword matching the name of the file (smile.png -> :smile:).<br>
-        But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
+  But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
 
 ?>

extensions/SmiliesSupport/language/pl_PL/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = 'Wszystkie emotikony';
 $lang['smilies_file_help'] = 'Domyślnie, gdy użytkownik kliknie w emotikon, Smilies Support doda słowo kluczowe odpowiadające nazwie danego pliku z emotikonem (smile.png -> :smile:). <br>
-    Jednak w tym miejscu możesz także skonfigurować inne ciągi znaków. Każdy folder z emotikonami ma swój własny <i>smilies.txt</i> plik ';
+  Jednak w tym miejscu możesz także skonfigurować inne ciągi znaków. Każdy folder z emotikonami ma swój własny <i>smilies.txt</i> plik ';
 
 ?>

extensions/SmiliesSupport/language/ru_RU/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "All Smilies";
 $lang['smilies_file_help'] = "By default when a user clicks on a smiley, Smilies Support adds a keyword matching the name of the file (smile.png -> :smile:).<br>
-        But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
+  But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
 
 ?>

extensions/SmiliesSupport/language/sk_SK/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "Všetky smajlíky";
 $lang['smilies_file_help'] = 'Predvolene, ak používateľ klikne na smajlíka, podpora smajlíkov pridá kľúčové slovo spárované s menom súboru (smile.png -> :smile:).<br>
-    Ale môžete konfigurovať iné reťazce na prepísanie. Každý adresár smajlíka má vlastný <i>smilies.txt</i> súbor.';
-
+  Ale môžete konfigurovať iné reťazce na prepísanie. Každý adresár smajlíka má vlastný <i>smilies.txt</i> súbor.';
+    
 ?>

extensions/SmiliesSupport/language/sv_SE/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "Alla Smilies";
 $lang['smilies_file_help'] = "Som standard när en användare klickar på en smiley, tillägger Smilies Stödja ett sökord som matchar namnet på filen (smile.png -> :smile:).<br>
-        Men här kan du konfigurera andra strängar som ska ersättas. Varje smilies mapp har sin egen <i>smilies.txt</i> fil.";
+  Men här kan du konfigurera andra strängar som ska ersättas. Varje smilies mapp har sin egen <i>smilies.txt</i> fil.";
 
 ?>

extensions/SmiliesSupport/language/tr_TR/plugin.lang.php

@@ -6 +6 @@
 $lang['All Smilies'] = "Tüm İfadeler";
 $lang['smilies_file_help'] = "By default when a user clicks on a smiley, Smilies Support adds a keyword matching the name of the file (smile.png -> :smile:).<br>
-        But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
+  But here you can configure other strings to be replaced. Each smilies folder has its own <i>smilies.txt</i> file.";
 
 ?>

extensions/SmiliesSupport/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Smilies Support
-Version: 2.2.a
+Version: auto
 Description: Allow add Smilies for comments and descriptions.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=159
@@ -19 +19 @@
 
 function add_smiliessupport() {
-        global $page, $pwg_loaded_plugins;
-        
-        if (!isset($pwg_loaded_plugins['bbcode_bar']) 
-                AND isset($page['body_id']) AND $page['body_id'] == 'thePicturePage')
-        {
-                set_smiliessupport();
-        }
+  global $page, $pwg_loaded_plugins;
+  
+  if (!isset($pwg_loaded_plugins['bbcode_bar']) 
+    AND isset($page['body_id']) AND $page['body_id'] == 'thePicturePage')
+  {
+    set_smiliessupport();
+  }
 }
 
 if (script_basename() == 'admin')
 {
-        add_event_handler('get_admin_plugin_menu_links', 'smiliessupport_admin_menu');
-        function smiliessupport_admin_menu($menu) 
-        {
-                array_push($menu, array(
-                        'NAME' => 'Smilies Support',
-                        'URL' => get_root_url().'admin.php?page=plugin-' . SMILIES_DIR));
-                return $menu;
-        }
+  add_event_handler('get_admin_plugin_menu_links', 'smiliessupport_admin_menu');
+  function smiliessupport_admin_menu($menu) 
+  {
+    array_push($menu, array(
+      'NAME' => 'Smilies Support',
+      'URL' => get_root_url().'admin.php?page=plugin-' . SMILIES_DIR));
+    return $menu;
+  }
 }
 ?>

extensions/SmiliesSupport/maintain.inc.php

@@ -4 +4 @@
 function plugin_install()
 {
-        global $conf;
+  global $conf;
 
-        if (!isset($conf['smiliessupport'])) {
-                $q = 'INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
-                        VALUES ("smiliessupport","plugins/SmiliesSupport/smilies_1,6,smile.png","Parametres SmiliesSupport");';
-                pwg_query($q);
-        }
+  if (!isset($conf['smiliessupport'])) {
+    $q = 'INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
+      VALUES ("smiliessupport","plugins/SmiliesSupport/smilies_1,6,smile.png","Parametres SmiliesSupport");';
+    pwg_query($q);
+  }
 }
 
 function plugin_uninstall()
 {
-        global $conf;
+  global $conf;
 
-        if (isset($conf['smiliessupport'])) {
-                pwg_query('DELETE FROM ' . CONFIG_TABLE . ' WHERE param="smiliessupport" LIMIT 1;');
-        }
+  if (isset($conf['smiliessupport'])) {
+    pwg_query('DELETE FROM ' . CONFIG_TABLE . ' WHERE param="smiliessupport" LIMIT 1;');
+  }
 }
 

extensions/SmiliesSupport/smiliessupport.inc.php

@@ -5 +5 @@
 function set_smiliessupport()
 {
-        global $conf, $lang;
-        $conf_smiliessupport = explode(',' , $conf['smiliessupport']);
-        
-        $smilies = get_smilies($conf_smiliessupport);
-        $lang['Comment'] .= SmiliesTable($conf_smiliessupport, $smilies);       
+  global $conf, $lang;
+  $conf_smiliessupport = explode(',' , $conf['smiliessupport']);
+  
+  $smilies = get_smilies($conf_smiliessupport);
+  $lang['Comment'] .= SmiliesTable($conf_smiliessupport, $smilies);  
 }
 
@@ -15 +15 @@
 function get_smilies($conf_smiliessupport)
 {
-        $accepted_ext = array('gif', 'jpg', 'png');
-        
-        if ($handle = opendir(PHPWG_ROOT_PATH.$conf_smiliessupport[0]))
-        {
-                $i = 1;
-                while (false !== ($file = readdir($handle)))
-                {
-                        if ($file != '.' AND $file != '..' AND in_array(get_extension($file), $accepted_ext))
-                        {
-                                $smilies[] = array(
-                                        'PATH' => PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/'.$file,
-                                        'TITLE' => ':'.get_filename_wo_extension($file).':',
-                                        'TR' => ($i>0 AND $i%$conf_smiliessupport[1] == 0) ? '</tr><tr>' : null,
-                                );
-                                $i++;
-                        }
-                }
-                
-                return $smilies;
-        } else {
-                return false;
-        }
+  $accepted_ext = array('gif', 'jpg', 'png');
+  
+  if ($handle = opendir(PHPWG_ROOT_PATH.$conf_smiliessupport[0]))
+  {
+    $i = 1;
+    while (false !== ($file = readdir($handle)))
+    {
+      if ($file != '.' AND $file != '..' AND in_array(get_extension($file), $accepted_ext))
+      {
+        $smilies[] = array(
+          'PATH' => PHPWG_ROOT_PATH.$conf_smiliessupport[0].'/'.$file,
+          'TITLE' => ':'.get_filename_wo_extension($file).':',
+          'TR' => ($i>0 AND $i%$conf_smiliessupport[1] == 0) ? '</tr><tr>' : null,
+        );
+        $i++;
+      }
+    }
+    
+    return $smilies;
+  } else {
+    return false;
+  }
 }
 
@@ -42 +42 @@
 function SmiliesTable($conf_smiliessupport, $smilies)
 {
-        global $template;
-        load_language('plugin.lang', SMILIES_PATH);
+  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');
+  // 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);
+  $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);
 }
 
@@ -69 +69 @@
 function SmiliesParse($str)
 {
-        global $conf;
+  global $conf;
 
-        $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]))
-        {
-                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).':"/>';
-                                $str = str_replace($v, $s, $str);
-                        }
-                }
-        }
-        
-        if (file_exists($def_path))
-        {
-                $def = file($def_path);
-                foreach($def as $v)
-                {
-                        $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);
-                        }
-                }
-        } 
-        
-        return $str;
+  $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]))
+  {
+    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).':"/>';
+        $str = str_replace($v, $s, $str);
+      }
+    }
+  }
+  
+  if (file_exists($def_path))
+  {
+    $def = file($def_path);
+    foreach($def as $v)
+    {
+      $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);
+      }
+    }
+  } 
+  
+  return $str;
 }
 

extensions/SmiliesSupport/template/smiliessupport_admin.tpl

@@ -4 +4 @@
 {footer_script require="jquery.cluetip"}
 {literal}
-        jQuery().ready(function(){
-                // Cluetip
-                jQuery('.cluetip').cluetip({
-                        width: 550,
-                        splitTitle: '|'
-                });
-        });
+  jQuery().ready(function(){
+    // Cluetip
+    jQuery('.cluetip').cluetip({
+      width: 550,
+      splitTitle: '|'
+    });
+  });
 {/literal}
 {/footer_script}
@@ -16 +16 @@
 {html_head}
 <style type="text/css">
-        legend .cluetip {ldelim}
-                text-align:center;
-                margin:20px 0 -10px 0;
-                font-size:1.2em;
-        }
-        .cluetip:after {ldelim}
-                margin-left:5px;
-                vertical-align:top;
-                content:url('{$themeconf.admin_icon_dir}/help.png');
-        }
-        .properties textarea {ldelim}
-                width:60%;
-                margin:0 20%;
-        }
+  legend .cluetip {ldelim}
+    text-align:center;
+    margin:20px 0 -10px 0;
+    font-size:1.2em;
+  }
+  .cluetip:after {ldelim}
+    margin-left:5px;
+    vertical-align:top;
+    content:url('{$themeconf.admin_icon_dir}/help.png');
+  }
+  .properties textarea {ldelim}
+    width:60%;
+    margin:0 20%;
+  }
 </style>
 {/html_head}
 
 <div class="titrePage">
-        <h2>Smilies Support</h2>
+  <h2>Smilies Support</h2>
 </div>
 
 <form method="post" action="" class="properties" ENCTYPE="multipart/form-data"> 
-        <fieldset>
-      <legend>{'Configuration'|@translate}</legend>       
-          <ul>                  
-                <li>
-                        <span class="property">{'smilies_dir'|@translate}</span>
-                        <input type="text" size="40" name="text1" value="{$TEXT1_VALUE}" />
-                </li>
-                <li>
-                        <span class="property">{'nb_columns'|@translate}</span>
-                        <input type="text" size="3" name="text2" value="{$TEXT2_VALUE}" />
-                </li>           
-                <li>
-                        <span class="property">{'representant'|@translate}</span>
-                        <input type="text" size="20" name="text3" value="{$TEXT3_VALUE}" />
-                </li>
-                <li>
-                        <table><tr>
-                        {foreach from=$smiliesfiles item=smileyfile} 
-                                <td><a href="#" title="{$smileyfile.TITLE}"><img src="{$smileyfile.PATH}"/></a></td>
-                                {$smileyfile.TR}
-                        {/foreach}
-                        </tr></table>
-                </li>
+  <fieldset>
+      <legend>{'Configuration'|@translate}</legend>    
+    <ul>      
+    <li>
+      <span class="property">{'smilies_dir'|@translate}</span>
+      <input type="text" size="40" name="text1" value="{$TEXT1_VALUE}" />
+    </li>
+    <li>
+      <span class="property">{'nb_columns'|@translate}</span>
+      <input type="text" size="3" name="text2" value="{$TEXT2_VALUE}" />
+    </li>    
+    <li>
+      <span class="property">{'representant'|@translate}</span>
+      <input type="text" size="20" name="text3" value="{$TEXT3_VALUE}" />
+    </li>
+    <li>
+      <table><tr>
+      {foreach from=$smiliesfiles item=smileyfile} 
+        <td><a href="#" title="{$smileyfile.TITLE}"><img src="{$smileyfile.PATH}"/></a></td>
+        {$smileyfile.TR}
+      {/foreach}
+      </tr></table>
+    </li>
     </ul>
-        </fieldset>
-        
-        <fieldset>
-                <legend><span class="cluetip" title="smilies.txt|{'smilies_file_help'|@translate}">smilies.txt</legend>
-                <textarea rows="5" name="text">{$CONTENT_FILE}</textarea>
-        </fieldset>     
-        
-        <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" /></p>
+  </fieldset>
+  
+  <fieldset>
+    <legend><span class="cluetip" title="smilies.txt|{'smilies_file_help'|@translate}">smilies.txt</legend>
+    <textarea rows="5" name="text">{$CONTENT_FILE}</textarea>
+  </fieldset>  
+  
+  <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" /></p>
 </form>

extensions/SmiliesSupport/template/smiliessupport_page.tpl

@@ -5 +5 @@
 {literal}
 jQuery(document).ready(function() {
-        if (jQuery('.markItUp').length == 0) {
-                jQuery('#{/literal}{$form_name}{literal} textarea').markItUp({markupSet: []});
-        }
-        jQuery('#SmiliesSupport').appendTo('.markItUpHeader ul:first-child');
-        jQuery('#allsmilies').mouseover(function(){ 
-                jQuery("#{/literal}{$form_name}{literal} textarea").focus();
-                jQuery('#smiliesdiv').css('display',''); 
-        });
-        jQuery('#smiliesdiv a').click(function() {
-                emoticon = jQuery(this).attr("href");
-                jQuery.markItUp({ replaceWith:emoticon });
-                jQuery('#smiliesdiv').css('display','none');
-                return false;
-        });
+  if (jQuery('.markItUp').length == 0) {
+    jQuery('#{/literal}{$form_name}{literal} textarea').markItUp({markupSet: []});
+  }
+  jQuery('#SmiliesSupport').appendTo('.markItUpHeader ul:first-child');
+  jQuery('#allsmilies').mouseover(function(){ 
+    jQuery("#{/literal}{$form_name}{literal} textarea").focus();
+    jQuery('#smiliesdiv').css('display',''); 
+  });
+  jQuery('#smiliesdiv a').click(function() {
+    emoticon = jQuery(this).attr("href");
+    jQuery.markItUp({ replaceWith:emoticon });
+    jQuery('#smiliesdiv').css('display','none');
+    return false;
+  });
 });
 {/literal}
@@ -25 +25 @@
 <ul style="display:none;">
 <li id="SmiliesSupport" class="markItUpButton markItUpDropMenu">
-        <a id="allsmilies" style="background-image:url({$REPRESENTANT});" title="{'All Smilies'|@translate}"></a>
+  <a id="allsmilies" style="background-image:url({$REPRESENTANT});" title="{'All Smilies'|@translate}"></a>
 
-        <ul id="smiliesdiv">
-                <li><table><tr>
-                {foreach from=$smiliesfiles item=smileyfile} 
-                        <td><a href="{$smileyfile.TITLE}"><img src="{$smileyfile.PATH}"/></a></td>
-                        {$smileyfile.TR}
-                {/foreach}
-                </tr></table></li>
-        </ul>
+  <ul id="smiliesdiv">
+    <li><table><tr>
+    {foreach from=$smiliesfiles item=smileyfile} 
+      <td><a href="{$smileyfile.TITLE}"><img src="{$smileyfile.PATH}"/></a></td>
+      {$smileyfile.TR}
+    {/foreach}
+    </tr></table></li>
+  </ul>
 </li>
 </ul>