diff -aruN smileys-cvs/examples.mysql smileys/examples.mysql --- smileys-cvs/examples.mysql 2003-05-27 00:16:56.000000000 -0500 +++ smileys/examples.mysql 2006-06-12 09:28:30.000000000 -0500 @@ -1,14 +1,14 @@ # This file contains an example setup for the smileys provided. # -INSERT INTO smileys VALUES (1, ':) :-) :smile:', 'misc/smileys/smile.png','Smiling',1); -INSERT INTO smileys VALUES (2, ';) ;-) :wink:', 'misc/smileys/wink.png','Eye-wink',1); -INSERT INTO smileys VALUES (3, ':( :-( :sad:', 'misc/smileys/sad.png','Sad',1); -INSERT INTO smileys VALUES (4, ':D :-D :lol:', 'misc/smileys/lol.png','Laughing out loud',1); -INSERT INTO smileys VALUES (5, '}:) }:-) :evil:', 'misc/smileys/evil.png','Evil',1); -INSERT INTO smileys VALUES (6, ':P :-P :tongue:', 'misc/smileys/tongue.png','Sticking out tongue',1); -INSERT INTO smileys VALUES (7, ':O :-O :shocked:', 'misc/smileys/shock.png','Shocked',1); -INSERT INTO smileys VALUES (8, ':? :-? :puzzled:', 'misc/smileys/puzzled.png','Puzzled',1); -INSERT INTO smileys VALUES (9, '8) 8-) :cool:', 'misc/smileys/cool.png','Cool',1); -INSERT INTO smileys VALUES (10,':jawdrop:', 'misc/smileys/jawdrop.gif','Jawdropping!',1); -INSERT INTO smileys VALUES (11,':sick: :barf:', 'misc/smileys/barf.gif','Barf!',1); +INSERT INTO smileys VALUES (1, ':) :-) :smile:', '/files/smileys/smile.png','Smiling',1); +INSERT INTO smileys VALUES (2, ';) ;-) :wink:', '/files/smileys/wink.png','Eye-wink',1); +INSERT INTO smileys VALUES (3, ':( :-( :sad:', '/files/smileys/sad.png','Sad',1); +INSERT INTO smileys VALUES (4, ':D :-D :lol:', '/files/smileys/lol.png','Laughing out loud',1); +INSERT INTO smileys VALUES (5, '}:) }:-) :evil:', '/files/smileys/evil.png','Evil',1); +INSERT INTO smileys VALUES (6, ':P :-P :tongue:', '/files/smileys/tongue.png','Sticking out tongue',1); +INSERT INTO smileys VALUES (7, ':O :-O :shocked:', '/files/smileys/shock.png','Shocked',1); +INSERT INTO smileys VALUES (8, ':? :-? :puzzled:', '/files/smileys/puzzled.png','Puzzled',1); +INSERT INTO smileys VALUES (9, '8) 8-) :cool:', '/files/smileys/cool.png','Cool',1); +INSERT INTO smileys VALUES (10,':jawdrop:', '/files/smileys/jawdrop.gif','Jawdropping!',1); +INSERT INTO smileys VALUES (11,':sick: :barf:', '/files/smileys/barf.gif','Barf!',1); diff -aruN smileys-cvs/examples.pgsql smileys/examples.pgsql --- smileys-cvs/examples.pgsql 2004-07-20 22:10:37.000000000 -0500 +++ smileys/examples.pgsql 2006-06-12 09:28:57.000000000 -0500 @@ -1,14 +1,14 @@ -- This file contains an example setup for the smileys provided. -- -INSERT INTO smileys VALUES (1, ':) :-) :smile:', 'misc/smileys/smile.png','Smiling',1); -INSERT INTO smileys VALUES (2, ';) ;-) :wink:', 'misc/smileys/wink.png','Eye-wink',1); -INSERT INTO smileys VALUES (3, ':( :-( :sad:', 'misc/smileys/sad.png','Sad',1); -INSERT INTO smileys VALUES (4, ':D :-D :lol:', 'misc/smileys/lol.png','Laughing out loud',1); -INSERT INTO smileys VALUES (5, '}:) }:-) :evil:', 'misc/smileys/evil.png','Evil',1); -INSERT INTO smileys VALUES (6, ':P :-P :tongue:', 'misc/smileys/tongue.png','Sticking out tongue',1); -INSERT INTO smileys VALUES (7, ':O :-O :shocked:', 'misc/smileys/shock.png','Shocked',1); -INSERT INTO smileys VALUES (8, ':? :-? :puzzled:', 'misc/smileys/puzzled.png','Puzzled',1); -INSERT INTO smileys VALUES (9, '8) 8-) :cool:', 'misc/smileys/cool.png','Cool',1); -INSERT INTO smileys VALUES (10,':jawdrop:', 'misc/smileys/jawdrop.gif','Jawdropping!',1); -INSERT INTO smileys VALUES (11,':sick: :barf:', 'misc/smileys/barf.gif','Barf!',1); +INSERT INTO smileys VALUES (1, ':) :-) :smile:', '/files/smileys/smile.png','Smiling',1); +INSERT INTO smileys VALUES (2, ';) ;-) :wink:', '/files/smileys/wink.png','Eye-wink',1); +INSERT INTO smileys VALUES (3, ':( :-( :sad:', '/files/smileys/sad.png','Sad',1); +INSERT INTO smileys VALUES (4, ':D :-D :lol:', '/files/smileys/lol.png','Laughing out loud',1); +INSERT INTO smileys VALUES (5, '}:) }:-) :evil:', '/files/smileys/evil.png','Evil',1); +INSERT INTO smileys VALUES (6, ':P :-P :tongue:', '/files/smileys/tongue.png','Sticking out tongue',1); +INSERT INTO smileys VALUES (7, ':O :-O :shocked:', '/files/smileys/shock.png','Shocked',1); +INSERT INTO smileys VALUES (8, ':? :-? :puzzled:', '/files/smileys/puzzled.png','Puzzled',1); +INSERT INTO smileys VALUES (9, '8) 8-) :cool:', '/files/smileys/cool.png','Cool',1); +INSERT INTO smileys VALUES (10,':jawdrop:', '/files/smileys/jawdrop.gif','Jawdropping!',1); +INSERT INTO smileys VALUES (11,':sick: :barf:', '/files/smileys/barf.gif','Barf!',1); diff -aruN smileys-cvs/po/ca.po smileys/po/ca.po --- smileys-cvs/po/ca.po 2006-05-13 12:10:14.000000000 -0500 +++ smileys/po/ca.po 1969-12-31 18:00:00.000000000 -0600 @@ -1,59 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: Drupal en catalˆ\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2005-12-29 00:42+0100\n" -"Last-Translator: \n" -"Language-Team: Softcatalˆ \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Catalan\n" - -#: smileys.module:9 -msgid "Replaces smileys (emoticons) inside posts with images." -msgstr "Reemplaa les emoticones (smileys) dins dels enviaments amb imatges." - -#: smileys.module:11 -msgid "Here you can edit the smileys that are recognised by your site. You can add new smileys if you wish." -msgstr "Ac’ podeu editar les emoticones que reconeix el vostre lloc web. Podeu afegir-hi noves emoticones si aix’ ho desitgeu." - -#: smileys.module:14 -msgid "Textual smileys will be replaced with graphical emoticons" -msgstr "Les emoticones textuals es reemplaaran amb emoticones grˆfiques" - -#: smileys.module:16 -msgid "If you include a textual smiley in your post (see chart below), it will be replaced by a graphical smiley." -msgstr "Si incloeu una emoticona textual en el vostre enviament (vegeu el diagrama a continuaci—), aquesta es reemplaarˆ amb una emoticona grˆfica." - -#: smileys.module:40 -msgid "Smileys on submission pages" -msgstr "Emoticones a les pˆgines de tramesa" - -#: smileys.module:46 -msgid "Smileys" -msgstr "Emoticones" - -#: smileys.module:75;77 -msgid "Smileys filter" -msgstr "Filtre d'emoticones" - -#: smileys.module:77 -msgid "Smileys filter is enabled. Textual emoticons will be replaced by images. You can define your smileys on the smileys settings page." -msgstr "El filtre d'emoticones estˆ habilitat. Les emoticones textuals es reemplaaran amb imatges. Podeu definir les vostres emoticones a la ." - -#: smileys.module:148 -msgid "Please enter an acronym for your smiley." -msgstr "Si us plau, introdu•u un acr˜nim per a la vostra emoticona." - -#: smileys.module:152 -msgid "Please enter the URL of the smiley image." -msgstr "Si us plau, introdu•u l'URL de la imatge de l'emoticona." - -#: smileys.module:23 -msgid "administer smileys" -msgstr "administra les emoticones" - -#: smileys.module:0 -msgid "smileys" -msgstr "emoticones" \ No newline at end of file diff -aruN smileys-cvs/smileys.module smileys/smileys.module --- smileys-cvs/smileys.module 2005-10-26 09:59:54.000000000 -0500 +++ smileys/smileys.module 2006-06-12 09:27:15.000000000 -0500 @@ -1,5 +1,5 @@ t('Smileys filter')); case 'description': return smileys_help('admin/modules#description'); +/* case 'settings': - $form['smileys_filter'] = array('#type' => 'fieldset', '#title' => t('Smileys filter'), '#value' => t('You can define a global list of smileys on the smileys settings page.', array('%url' => url('admin/filters/smileys')))); - return $form; - case "process": + return $form['filter_smileys'] = array( '#type' => 'fieldset','#title' => t('Smileys filter'), t('You can define a global list of smileys on the smileys settings page', array('%url' => url('admin/filters/smileys')))); +*/ + + case "process": return smileys_filter_process($text); default: return $text; @@ -85,16 +87,15 @@ $list = _smileys_list(); foreach ($list as $smiley) { $acronyms = explode(" ", $smiley->acronyms); - $alt = str_replace('\\', '\\\\', check_plain($smiley->description)); - foreach ($acronyms as $a) { - if ($smiley->standalone) - $text = eregi_replace("([ ,\.\?!:\(\)\r\n\<\>])". preg_quote($a) ."([ ,\.\?!:\(\)\r\n\<\>])", "\\1image) ."\" title=\"". $alt ."\" alt=\"". $alt ."\" />\\2", $text); - else - $text = eregi_replace(preg_quote($a), ''. $alt .'', $text); - } - } + $alt = str_replace('\\', '\\\\', check_plain($smiley->description)); + foreach ($acronyms as $a) { + if ($smiley->standalone) + $text = ereg_replace("([ ,\.\?!:\(\)\r\n\<\>])". preg_quote($a) ."([ ,\.\?!:\(\)\r\n\<\>])", "\\1image) ."\" title=\"". $alt ."\" alt=\"". $alt ."\" />\\2", $text); + $text = ereg_replace(preg_quote($a), ''. $alt .'', $text); + } + } + //$text = substr($text, 1, -1); $text = substr($text, 1, -1); - return $text; } @@ -107,7 +108,7 @@ $items[] = array( 'path' => 'admin/filters/smileys', 'title' => t('smileys'), - 'callback' => 'smileys_admin_list', + 'callback' => 'smileys_admin_overview', 'access' => $access); $items[] = array( @@ -151,20 +152,58 @@ } function smileys_admin_form($edit = array()) { - $form = array(); if ($edit['id']) { - $form['id'] = array('#type' => 'hidden', '#value' => $edit['id']); - } - $form['acronyms'] = array('#type' => 'textfield', '#title' => t('Acronyms'), '#default_value' => $edit['acronyms'], '#size' => 16, '#maxlength' => 255, '#description' => t('Enter a list of shorthands for the smiley you wish to add, separated by spaces. E.g. \':) ;) :smile:\'')); - $form['image'] = array('#type' => 'textfield', '#title' => t('Image URL'), '#default_value' => $edit['image'], '#size' => 50, '#maxlength' => 255, '#description' => t('Enter the URL of the smiley-image relative to the root of your Drupal site. E.g. \'images/smileys/happy.png\'.')); - $form['description'] = array('#type' => 'textfield', '#title' => t('Description'), '#default_value' => $edit['description'], '#size' => 50, '#maxlength' => 64, '#description' => t('A short description of the emotion depicted to be used as tooltip for the image. E.g. \'Laughing out loud\'.')); - $form['standalone'] = array('#type' => 'checkbox', '#title' => t('Stand-alone'), '#default_value' => $edit['standalone'], '#description' => t('When checked, the smiley will only be inserted when an acronym is found as a separate word. This is useful for preventing accidental smileys with short acronyms.')); - $form['submit'] = array('#type' => 'submit', '#value' => t('Save Smiley')); + $form['id'] = array( + '#type' => 'hidden', + '#value' => $edit['id'], +); + } +$form['acronyms'] = array( + '#type' => 'textfield', + '#title' => t('Acronyms'), + '#default_value' => $edit['acronyms'], + '#size' => 16, + '#maxlength' => 255, + '#description' => t('Enter a list of shorthands for the smiley you wish to add, separated by spaces. E.g. \':) ;) :smile:\''), +); $form['image'] = array( + '#type' => 'textfield', + '#title' => t('Image URL'), + '#default_value' => $edit['image'], + '#size' => 50, + '#maxlength' => 255, + '#description' => t('Enter the URL of the smiley-image relative to the root of your Drupal site. E.g. \'smileys/happy.png\'.'), +); + $form['description'] = array( + '#type' => 'textfield', + '#title' => t('Description'), + '#default_value' => $edit['description'], + '#size' => 50, + '#maxlength' => 64, + '#description' => t('A short description of the emotion depicted to be used as tooltip for the image. E.g. \'Laughing out loud\'.'), +); + $form['standalone'] = array( + '#type' => 'checkbox', + '#title' => t('Stand-alone'), + '#return_value' => 1, + '#default_value' => $edit['standalone'], + '#description' => t('When checked, the smiley will only be inserted when an acronym is found as a separate word. This is useful for preventing accidental smileys with short acronyms.'), +); + $form[] = array( + '#type' => 'submit', + '#value' => t('Save Smiley'), + '#callback' => 'smileys_admin_save', +); if ($edit['id']) { - $form['delete'] = array('#type' => 'submit', '#value' => t('Delete Smiley')); + $form[] = array( + '#type' => 'submit', + '#value' => t('Delete Smiley'), + '#callback' => 'smileys_admin_delete', +); } - return drupal_get_form('smileys', $form); + //return $form['#method'] = 'post'; + //$output = drupal_get_form('your_form_id', $form); + return drupal_get_form('your_form_id', $form); } function smileys_admin_validate($edit) { @@ -216,14 +255,20 @@ } } - return smileys_admin_form($edit); + $output .= smileys_admin_form($edit); + print theme('page', $output); } function smileys_admin_edit() { if ($_POST['op'] == NULL) { $smiley = db_fetch_array(db_query('SELECT * FROM {smileys} WHERE id = %d', db_escape_string(arg(4)))); } - return smileys_admin_add($smiley); + smileys_admin_add($smiley); +} + +function smileys_admin_overview() { + $output = smileys_admin_list(); + print theme('page', $output); } ?>