diff --git a/docs/NEWS b/docs/NEWS index bf331acd..677c0702 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,9 @@ Version 1.5 () ------------------------------------------------------------------------ + * Changed shoutbox plugin. Shoutbox input size is configurable now. + (brockhaus) + * Change mail entry plugin to be able to send mails without hyperlinks and images. (garvinhicking) diff --git a/plugins/serendipity_plugin_shoutbox/UTF-8/lang_de.inc.php b/plugins/serendipity_plugin_shoutbox/UTF-8/lang_de.inc.php index 1a099f39..0a79b5c8 100644 --- a/plugins/serendipity_plugin_shoutbox/UTF-8/lang_de.inc.php +++ b/plugins/serendipity_plugin_shoutbox/UTF-8/lang_de.inc.php @@ -10,3 +10,8 @@ @define('PLUGIN_SHOUTBOX_MAXCHARS_BLAHBLAH', 'Wieviele Zeichen sollen pro Kommentar gezeigt werden? (Standard: 120)'); @define('PLUGIN_SHOUTBOX_MAXENTRIES', 'Anzahl an Kommentaren'); @define('PLUGIN_SHOUTBOX_MAXENTRIES_BLAHBLAH', 'Wieviele Kommentare sollen gezeigt werden? (Standard: 15)'); + +@define('GENERAL_PLUGIN_BOX_COLS', 'Shoutbox Spalten'); +@define('GENERAL_PLUGIN_BOX_COLS_BLAHBLAH', 'Spaltenanzahl, die die Shoutbox Eingabe breit sein soll.'); +@define('GENERAL_PLUGIN_BOX_ROWS', 'Shoutbox Reihen'); +@define('GENERAL_PLUGIN_BOX_ROWS_BLAHBLAH', 'Reihenanzahl, die die Shoutbox Eingabe lang sein soll.'); diff --git a/plugins/serendipity_plugin_shoutbox/lang_de.inc.php b/plugins/serendipity_plugin_shoutbox/lang_de.inc.php index d8fa20f7..c23fbfa4 100644 --- a/plugins/serendipity_plugin_shoutbox/lang_de.inc.php +++ b/plugins/serendipity_plugin_shoutbox/lang_de.inc.php @@ -10,3 +10,9 @@ @define('PLUGIN_SHOUTBOX_MAXCHARS_BLAHBLAH', 'Wieviele Zeichen sollen pro Kommentar gezeigt werden? (Standard: 120)'); @define('PLUGIN_SHOUTBOX_MAXENTRIES', 'Anzahl an Kommentaren'); @define('PLUGIN_SHOUTBOX_MAXENTRIES_BLAHBLAH', 'Wieviele Kommentare sollen gezeigt werden? (Standard: 15)'); + +@define('GENERAL_PLUGIN_BOX_COLS', 'Shoutbox Spalten'); +@define('GENERAL_PLUGIN_BOX_COLS_BLAHBLAH', 'Spaltenanzahl, die die Shoutbox Eingabe breit sein soll.'); +@define('GENERAL_PLUGIN_BOX_ROWS', 'Shoutbox Reihen'); +@define('GENERAL_PLUGIN_BOX_ROWS_BLAHBLAH', 'Reihenanzahl, die die Shoutbox Eingabe lang sein soll.'); + \ No newline at end of file diff --git a/plugins/serendipity_plugin_shoutbox/lang_en.inc.php b/plugins/serendipity_plugin_shoutbox/lang_en.inc.php index 57880d87..37be8e1e 100644 --- a/plugins/serendipity_plugin_shoutbox/lang_en.inc.php +++ b/plugins/serendipity_plugin_shoutbox/lang_en.inc.php @@ -17,4 +17,8 @@ @define('PLUGIN_SHOUTBOX_MAXENTRIES', 'Maximum number of comments'); @define('PLUGIN_SHOUTBOX_MAXENTRIES_BLAHBLAH', 'How many comments will be shown? (Default: 15)'); +@define('GENERAL_PLUGIN_BOX_COLS', 'Shoutbox columns'); +@define('GENERAL_PLUGIN_BOX_COLS_BLAHBLAH', 'Column count of the shoutbox input element.'); +@define('GENERAL_PLUGIN_BOX_ROWS', 'Shoutbox rows'); +@define('GENERAL_PLUGIN_BOX_ROWS_BLAHBLAH', 'Row count of thesShoutbox input element.'); ?> diff --git a/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php b/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php index ddc8bde9..bfd17a00 100644 --- a/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php +++ b/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php @@ -33,7 +33,10 @@ class serendipity_plugin_shoutbox extends serendipity_plugin 'wordwrap', 'max_chars', 'max_entries', - 'dateformat')); + 'dateformat', + 'box_cols', + 'box_rows')); + $propbag->add('groups', array('FRONTEND_FEATURES')); } @@ -68,6 +71,20 @@ class serendipity_plugin_shoutbox extends serendipity_plugin $propbag->add('default', '%a, %d.%m.%Y %H:%M'); break; + case 'box_cols': + $propbag->add('type', 'string'); + $propbag->add('name', GENERAL_PLUGIN_BOX_COLS); + $propbag->add('description', GENERAL_PLUGIN_BOX_COLS_BLAHBLAH); + $propbag->add('default', '15'); + break; + + case 'box_rows': + $propbag->add('type', 'string'); + $propbag->add('name', GENERAL_PLUGIN_BOX_ROWS); + $propbag->add('description', GENERAL_PLUGIN_BOX_ROWS_BLAHBLAH); + $propbag->add('default', '4'); + break; + default: return false; } @@ -83,6 +100,8 @@ class serendipity_plugin_shoutbox extends serendipity_plugin $max_chars = $this->get_config('max_chars'); $wordwrap = $this->get_config('wordwrap'); $dateformat = $this->get_config('dateformat'); + $box_cols = $this->get_config('box_cols'); + $box_rows = $this->get_config('box_rows'); // Create table, if not yet existant if ($this->get_config('version') != '1.0') { @@ -140,10 +159,18 @@ class serendipity_plugin_shoutbox extends serendipity_plugin if (!$dateformat || strlen($dateformat) < 1) { $dateformat = '%a, %d.%m.%Y %H:%M'; } + + if (!$box_cols || !is_numeric($box_cols) || $box_cols < 1) { + $box_cols = 15; + } + + if (!$box_rows || !is_numeric($box_rows) || $box_rows < 1) { + $box_rows = 4; + } ?>
- +