diff --git a/langpack_german/package-info.xml b/langpack_german/package-info.xml index 79c057b..7d226ac 100644 --- a/langpack_german/package-info.xml +++ b/langpack_german/package-info.xml @@ -1,27 +1,26 @@ - SMF Shoutbox LanguagePack German - Deep:SMF_Shoutbox:LangPack_German - modification - 1.11 - - - SMF Shoutbox LanguagePack German + Deep:SMF_Shoutbox:LangPack_German + modification + 1.12 + + + + - - sbox_11rc2_german.mod - - - Uninstall will remove all the changes made by the SMF shoutbox german language pack. You must do this before upgrading! - sbox_11rc2_german.mod - - - Sorry, but the SMF Shoutbox Mod doesn't support your SMF version! - + Originally written By Deep (diem4@gmx.net), inspired by Matthew Wolf (a.k.a Grudge) + Heavily improved by Markus Birth (mbirth@webwriters.de) + Copyright 2006 - Neither this package or any of it's contents may be distributed without authorization. + ]]> + + sbox_11rc3_german.mod + + + + Uninstall will remove all the changes made by the SMF shoutbox german language pack. You must do this before upgrading! + sbox_11rc3_german.mod + diff --git a/langpack_german/sbox.german.php b/langpack_german/sbox.german.php new file mode 100644 index 0000000..e720526 --- /dev/null +++ b/langpack_german/sbox.german.php @@ -0,0 +1,31 @@ + diff --git a/langpack_german/sbox_11rc2_german.mod b/langpack_german/sbox_11rc3_german.mod similarity index 97% rename from langpack_german/sbox_11rc2_german.mod rename to langpack_german/sbox_11rc3_german.mod index 77c80fa..8b504f6 100644 --- a/langpack_german/sbox_11rc2_german.mod +++ b/langpack_german/sbox_11rc3_german.mod @@ -3,7 +3,7 @@ SMF Shoutbox , German Language Pack -1.11 +1.12 diff --git a/package-info.xml b/package-info.xml index 1a95518..e87d9f1 100644 --- a/package-info.xml +++ b/package-info.xml @@ -4,14 +4,15 @@ SMF Shoutbox Deep:SMF_Shoutbox modification - 1.11 + 1.12 + - + sbox_setup.php - sbox_11rc2.mod + sbox_11rc3.mod + + + + + + + + + + sbox_setup.php + + + + sbox_11rc3.mod Uninstall will remove all the changes made by the shoutbox. You must do this before upgrading! - sbox_11rc2.mod + sbox_11rc3.mod + - + + sbox_remove.php + + + Uninstall will remove all the changes made by the shoutbox. You must do this before upgrading! + sbox_11rc3.mod + + + + + + + + sbox_remove.php diff --git a/sbox.english.php b/sbox.english.php new file mode 100644 index 0000000..932431e --- /dev/null +++ b/sbox.english.php @@ -0,0 +1,31 @@ + diff --git a/sbox.php b/sbox.php index ab1820b..697746f 100644 --- a/sbox.php +++ b/sbox.php @@ -1,38 +1,39 @@ - + diff --git a/sboxDB.php b/sboxDB.php index 455ed5b..1793f3d 100644 --- a/sboxDB.php +++ b/sboxDB.php @@ -8,9 +8,7 @@ require("../SSI.php"); if (!defined('SMF')) die('Hacking attempt...'); -// global variables (they are always global since we're here in the main routine) -// global $db_connection, $context, $settings, $txt, $user_info, $modSettings, $db_prefix, $boarddir, $boardurl; - +loadLanguage('sbox'); $sbox_HistoryFile = $boarddir . '/sbox.history.html'; // BEGIN: BORROWED FROM http://de2.php.net/manual/en/function.flock.php @@ -175,8 +173,12 @@ if (!empty($_REQUEST['action'])) switch ($_REQUEST['action']) { case 'clearhist': if ($context['user']['is_admin']) { if (file_exists($sbox_HistoryFile)) { - // TODO: Check for existing lock, wait for lock to be released and delete then. - @unlink($sbox_HistoryFile); + $lockDir = $sbox_HistoryFile . '.lock'; + $start = time(); + while ((is_dir($lockDir)) && ((time() - $start) < 5)) { + usleep(100000); // sleep 1/10th of a second (for a PC these are ages!) + } + if (!is_dir($lockDir)) @unlink($sbox_HistoryFile); } } break; @@ -202,18 +204,16 @@ if ($refreshBlocked) { echo ''; if ($context['user']['is_admin']) { - echo "\n" . '
'; if ($modSettings['sbox_DoHistory'] == '1') { + echo "\n" . '
'; if (file_exists($sbox_HistoryFile)) { echo '[' . $txt['sbox_History'] . ']'; echo ' [' . $txt['sbox_HistoryClear'] . ']'; } else { echo '[' . $txt['sbox_HistoryNotFound'] . ']'; } + echo '
'; } - // debug output for separator-bar -// echo ' ( CurTime: ' . forum_time(true) . ' / LastTime: ' . $_REQUEST['ts'] . ' )'; - echo '
'; } /* diff --git a/sbox_11rc2.mod b/sbox_11rc3.mod similarity index 83% rename from sbox_11rc2.mod rename to sbox_11rc3.mod index ab6eddb..97e7d78 100644 --- a/sbox_11rc2.mod +++ b/sbox_11rc3.mod @@ -3,7 +3,7 @@ SMF Shoutbox -1.11 +1.12 @@ -31,6 +31,9 @@ Please direct any questions regarding this version to Deep, either by email (die in the appropriate place at www.simplemachines.org (the preferred option!) History: +Version 1.12 + + Version 1.11 + added German language-pack + added switch to disable linking to profile pages @@ -84,72 +87,6 @@ Deep and Markus Birth No homepage available at the moment - -$languagedir/Modifications.english.php - - - -?> - - - - -//SMF Shoutbox -$txt['sbox_ModTitle'] = 'SMF Shoutbox'; -$txt['sbox_Visible'] = 'Shoutbox is visible'; -$txt['sbox_GuestAllowed'] = 'Guests are allowed to shout'; -$txt['sbox_GuestVisible'] = 'Make Shoutbox visible to Guests'; -$txt['sbox_MaxLines'] = 'Maximum number of displayed shouts'; -$txt['sbox_Height'] = 'Shoutbox height (px)'; -$txt['sbox_SmiliesVisible'] = 'Smiley row is visible'; -$txt['sbox_UserLinksVisible'] = 'Show profile links'; -$txt['sbox_KillShout'] = 'Dou you want to kill this shout?'; -$txt['sbox_TextSize1'] = '1. Font size'; -$txt['sbox_TextColor1'] = '1. Font color'; -$txt['sbox_TextSize2'] = '2. Font size'; -$txt['sbox_TextColor2'] = '2. Font color'; -$txt['sbox_RefreshTime'] = 'Refresh time'; -$txt['sbox_BlockRefresh'] = 'Block Refresh after inactivity (' . $modSettings['lastActive'] . ' mins)'; -$txt['sbox_BackgroundColor'] = 'Background color'; -$txt['sbox_FontFamily1'] = '1. Font family'; -$txt['sbox_FontFamily2'] = '2. Font family'; -$txt['sbox_DoHistory'] = 'Create history of shouts'; -$txt['sbox_AllowBBC'] = 'Allow BBCode'; -$txt['sbox_Refresh'] = 'Refresh'; -$txt['sbox_RefreshBlocked'] = 'Automatic refresh disabled due to inactivity'; -$txt['sbox_History'] = 'History'; -$txt['sbox_HistoryClear'] = 'Clear history'; -$txt['sbox_HistoryNotFound'] = 'No history found.'; -$txt['sbox_EnableSounds'] = 'Enable sounds'; - - - - -$languagedir/Help.english.php - - - -?> - - - - -//SMF Shoutbox -$helptxt['sbox_Visible'] = 'Here you can decide wether the shoutbox is visible at all or not.'; -$helptxt['sbox_GuestAllowed'] = 'Here you can decide whether guests are allowed to post new shouts.'; -$helptxt['sbox_GuestVisible'] = 'Defines whether the Shoutbox is visible to guests at all.'; -$helptxt['sbox_MaxLines'] = 'Here you can enter the maximal count of lines displayed in the shoutbox.'; -$helptxt['sbox_Height'] = 'Here you can enter the height (pixels) of the shoutbox.'; -$helptxt['sbox_SmiliesVisible'] = 'Here you can decide whether smileys are visible or not. They work independently of this setting, though.'; -$helptxt['sbox_UserLinksVisible'] = 'Defines whether the names of shouters are linked to their profile page or not.'; -$helptxt['sbox_RefreshTime'] = 'Here you can adjust the refresh time'; -$helptxt['sbox_BlockRefresh'] = 'Defines whether the Shoutbox should stop refreshing after there have been no new shouts for a while. Users can still manually refresh the Shoutbox. The time treshold used is the User online time treshold found in the Basic Features-settings. (currently ' . $modSettings['lastActive'] . ' minutes)'; -$helptxt['sbox_DoHistory'] = 'Defines whether all shouts should be written to a file so that an Administrator can check what was going on.'; -$helptxt['sbox_AllowBBC'] = 'Defines whether users are allowed to use BBCode in shouts. If disabled, only plain text is displayed - no smileys, no formatting.'; -$helptxt['sbox_EnableSounds'] = 'Enables the notification sound, when your nickname was mentioned since the last refresh.'; - - - $sourcedir/ModSettings.php @@ -181,6 +118,8 @@ function ModifyKarmaSettings() +loadLanguage('sbox'); + function ModifySboxSettings() { global $txt, $scripturl, $context, $settings, $sc; @@ -323,3 +262,27 @@ $themedir/BoardIndex.template.php if (function_exists('sbox')) sbox(); + +$languagedir/Help.english.php + + + +?> + + + + +//SMF Shoutbox +$helptxt['sbox_Visible'] = 'Here you can decide wether the shoutbox is visible at all or not.'; +$helptxt['sbox_GuestAllowed'] = 'Here you can decide whether guests are allowed to post new shouts.'; +$helptxt['sbox_GuestVisible'] = 'Defines whether the Shoutbox is visible to guests at all.'; +$helptxt['sbox_MaxLines'] = 'Here you can enter the maximal count of lines displayed in the shoutbox.'; +$helptxt['sbox_Height'] = 'Here you can enter the height (pixels) of the shoutbox.'; +$helptxt['sbox_SmiliesVisible'] = 'Here you can decide whether smileys are visible or not. They work independently of this setting, though.'; +$helptxt['sbox_UserLinksVisible'] = 'Defines whether the names of shouters are linked to their profile page or not.'; +$helptxt['sbox_RefreshTime'] = 'Here you can adjust the refresh time'; +$helptxt['sbox_BlockRefresh'] = 'Defines whether the Shoutbox should stop refreshing after there have been no new shouts for a while. Users can still manually refresh the Shoutbox. The time treshold used is the User online time treshold found in the Basic Features-settings. (currently ' . $modSettings['lastActive'] . ' minutes)'; +$helptxt['sbox_DoHistory'] = 'Defines whether all shouts should be written to a file so that an Administrator can check what was going on.'; +$helptxt['sbox_AllowBBC'] = 'Defines whether users are allowed to use BBCode in shouts. If disabled, only plain text is displayed - no smileys, no formatting.'; +$helptxt['sbox_EnableSounds'] = 'Enables the notification sound, when your nickname was mentioned since the last refresh.'; +