Index: /instantMessenger/en.xml =================================================================== --- /instantMessenger/en.xml (revision 433) +++ /instantMessenger/en.xml (revision 466) @@ -1,4 +1,92 @@ + + + + + + + + + + + + + + + + + instant messenger]]> + + + + + + + + + + + + + + + + + + + Users may write instant messages + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSIDE das Hörspiel]]> + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - instant messenger]]> - - - - - - - - - - - - - - - - - - - Users may write instant messages - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSIDE das Hörspiel]]> - - - - - - - - - - - - - - - Index: /instantMessenger/acptemplates/userIM.tpl =================================================================== --- /instantMessenger/acptemplates/userIM.tpl (revision 433) +++ /instantMessenger/acptemplates/userIM.tpl (revision 466) @@ -30,5 +30,5 @@
{lang}wcf.acp.user.groups{/lang} - +
{htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs} Index: /instantMessenger/files/lib/form/InstantMessengerForm.class.php =================================================================== --- /instantMessenger/files/lib/form/InstantMessengerForm.class.php (revision 451) +++ /instantMessenger/files/lib/form/InstantMessengerForm.class.php (revision 466) @@ -4,4 +4,5 @@ require_once(WCF_DIR.'lib/data/InstantMessage/IM.class.php'); require_once(WCF_DIR.'lib/form/MessageForm.class.php'); +require_once(WCF_DIR.'lib/data/user/UserProfile.class.php'); /** @@ -40,5 +41,5 @@ parent::readParameters(); // get action - if (isset($_REQUEST['action'])) $this->action = stringUtil::toLowerCase(escapeString($_REQUEST['action'])); + if (isset($_REQUEST['action'])) $this->action = stringUtil::toLowerCase(escapeString($_REQUEST['action'])); // Falsche URLs abfangen if (!isset($_REQUEST['action']) || ($this->action != 'forward' && $this->action != 'reply' && $this->action != 'new')) { @@ -46,5 +47,5 @@ throw new IllegalLinkException(); } - if (isset($_REQUEST['imID'])) $this->imID = intval($_REQUEST['imID']); + if (isset($_REQUEST['imID'])) $this->imID = intval($_REQUEST['imID']); if (isset($_REQUEST['userID'])) $this->recipientID = intval($_REQUEST['userID']); } @@ -56,16 +57,20 @@ parent::readFormParameters(); - if (isset($_POST['action'])) $this->action = stringUtil::toLowerCase(escapeString($_POST['action'])); - if (isset($_POST['recipient'])) $this->recipient = StringUtil::trim($_POST['recipient']); - if (isset($_POST['subject'])) $this->subject = StringUtil::trim($_POST['subject']); - if (isset($_POST['text'])) $this->text = StringUtil::trim($_POST['text']); - if (isset($_POST['RecipientType'])) $this->RecipientType = intval($_POST['RecipientType']); + if (isset($_POST['action'])) $this->action = StringUtil::toLowerCase(escapeString($_POST['action'])); + if (isset($_POST['recipient'])) $this->recipient = escapeString($_POST['recipient']); + if (isset($_POST['subject'])) $this->subject = escapeString($_POST['subject']); + if (isset($_POST['text'])) $this->text = escapeString($_POST['text']); + if (isset($_POST['RecipientType'])) $this->RecipientType = intval($_POST['RecipientType']); if (!$this->RecipientType){ - $this->recipientArray = explode(',', stripslashes($this->recipient)); + $this->recipientArray = explode(',', escapeString($this->recipient)); if (count($this->recipientArray) < 2) { - $this->recipientArray = $this->recipient = stripslashes($this->recipientArray[0]); + $this->recipientArray = $this->recipient = escapeString($this->recipientArray[0]); } }else{ $this->recipient = $this->recipientArray = WCF::getLanguage()->get('wcf.acp.InstantMessenger.alleOnlineUser'); + } + if (CHARSET != 'UTF-8') { + $this->test = StringUtil::convertEncoding('UTF-8', CHARSET, $this->text); + $this->subject = StringUtil::convertEncoding('UTF-8', CHARSET, $this->subject); } } @@ -127,6 +132,7 @@ $this->recipient = $this->recipientArray; } + // Check for UTF-8 // IM speichern - $IM = new IM (WCF::getUser()->username, $this->recipient, $this->subject, StringUtil::trim($this->text)); + $IM = new IM (WCF::getUser()->username, $this->recipient, $this->subject, $this->text); $IM->sendIM(); // forward to IM page @@ -146,5 +152,5 @@ $this->recipient = $IMDatas['sender']; $this->subject = "Fw: ".$IMDatas['subject']; - $this->text = "[quote=".$IMDatas['sender'].",'']".stripslashes($IMDatas['message'])."[/quote]"; + $this->text = "[quote=".$IMDatas['sender'].",'']".StringUtil::unescape($IMDatas['message'])."[/quote]"; unset($IMData[$this->imID]); } @@ -154,5 +160,5 @@ $this->recipient = $IMDatas['sender']; $this->subject = "Fw: ".$IMDatas['subject']; - $this->text = "[quote=".$IMDatas['sender'].",'']".stripslashes($IMDatas['message'])."[/quote]"; + $this->text = "[quote=".$IMDatas['sender'].",'']".StringUtil::unescape($IMDatas['message'])."[/quote]"; unset($IMData[$this->imID]); } Index: /instantMessenger/files/lib/system/event/listener/UserPageIMLinkListener.class.php =================================================================== --- /instantMessenger/files/lib/system/event/listener/UserPageIMLinkListener.class.php (revision 433) +++ /instantMessenger/files/lib/system/event/listener/UserPageIMLinkListener.class.php (revision 466) @@ -5,7 +5,6 @@ * Shows the instant message link in user profiles. * - * @author Marcel Werk / Tatzelwurm - * @copyright 2001-2007 WoltLab GmbH / Inside das Hörspiel - * @license WoltLab Burning Board License + * @author Tatzelwurm + * @copyright 2007-2008 Inside das Hörspiel * @package de.inside.wcf.instantmessenger */ Index: /instantMessenger/files/lib/data/InstantMessage/IM.class.php =================================================================== --- /instantMessenger/files/lib/data/InstantMessage/IM.class.php (revision 451) +++ /instantMessenger/files/lib/data/InstantMessage/IM.class.php (revision 466) @@ -1,4 +1,4 @@ action = stringUtil::toLowerCase(escapeString($_REQUEST['action'])); + // wrong action? if (!isset($_REQUEST['action']) || ($this->action != 'read' && $this->action != 'send')) { require_once(WCF_DIR.'lib/system/exception/IllegalLinkException.class.php'); @@ -50,42 +51,5 @@ $this->templateName = 'instantMessengerSendOK'; }elseif ($this->action == 'read') { - // IM auslesen und darstellen - $this->templateName = 'instantMessengerRead'; - $im = new IM; - // IMs zÀhlen - $this->count = $im->countNewIM(WCF::getUser()->userID); - if ($this->count){ - // lesen der ersten ungelesenen IM - $this->im = $im->getFirstIM(WCF::getUser()->userID); - $this->sendtime = $this->im['sendtime']; - $this->subject = $this->im['subject']; - // Nachrichttext formatieren - $this->text = stripslashes(StringUtil::replace('\r\n','
',$this->getFormattedMessage($this->im['message']))); - // Absendernamen abrufen - $sender = new user($this->im['senderID']); - $this->sender = $sender->username; - // Will oder kann der Sender IMs empfangen? - $IM = new IM (null, $this->sender); - if($IM->permissionIM()) $this->noreply = true; - // save IM Data in session - $IMData = WCF::getSession()->getVar('IMData'); - if ($IMData === null) $IMData = array(); - //$IMData = array(); - $imID = $this->im['imID']; - $IMData[$imID] = array( - 'sender' => $this->sender, - 'sendtime' => $this->sendtime, - 'subject' => $this->subject, - 'message' => $this->im['message'], - ); - WCF::getSession()->register('IMData', $IMData); - // aktuelle IM löschen - $im->deleteIM($this->im['imID']); - //weil die aktuelle IM gelöscht wurde auch den ZÀhler anpassen - if ($this->count) $this->count = $this->count -1; - }else{ - // forward to page "no IMs" - $this->templateName = 'instantMessengerWait'; - } + $this->readIMMessage(); } } @@ -141,4 +105,45 @@ } + protected function readIMMessage() { + // IM auslesen und darstellen + $this->templateName = 'instantMessengerRead'; + $im = new IM; + // IMs zÀhlen + $this->count = $im->countNewIM(WCF::getUser()->userID); + if ($this->count){ + // lesen der ersten ungelesenen IM + $this->im = $im->getFirstIM(WCF::getUser()->userID); + $this->sendtime = $this->im['sendtime']; + $this->subject = StringUtil::unescape($this->im['subject']); + // Nachrichttext formatieren + $this->text = StringUtil::replace('\r\n','
',$this->getFormattedMessage(StringUtil::unescape($this->im['message']))); + // Absendernamen abrufen + $sender = new user($this->im['senderID']); + $this->sender = $sender->username; + // Will oder kann der Sender IMs empfangen? + $IM = new IM (null, $this->sender); + if($IM->permissionIM()) $this->noreply = true; + // save IM Data in session + $IMData = WCF::getSession()->getVar('IMData'); + if ($IMData === null) $IMData = array(); + //$IMData = array(); + $imID = $this->im['imID']; + $IMData[$imID] = array( + 'sender' => $this->sender, + 'sendtime' => $this->sendtime, + 'subject' => $this->subject, + 'message' => StringUtil::unescape($this->im['message']), + ); + WCF::getSession()->register('IMData', $IMData); + // aktuelle IM löschen + $im->deleteIM($this->im['imID']); + //weil die aktuelle IM gelöscht wurde auch den ZÀhler anpassen + if ($this->count) $this->count = $this->count -1; + }else{ + // forward to page "no IMs" + $this->templateName = 'instantMessengerWait'; + } + } + /** * @see ViewablePost::getFormattedMessage() Index: /instantMessenger/install.sql =================================================================== --- /instantMessenger/install.sql (revision 433) +++ /instantMessenger/install.sql (revision 466) @@ -1,2 +1,3 @@ +DROP TABLE IF EXISTS `wcf1_im`; CREATE TABLE `wcf1_im` ( `imID` int(11) NOT NULL auto_increment, @@ -7,3 +8,3 @@ `sendtime` int(10) NOT NULL default '0', PRIMARY KEY (`imID`) -) TYPE=MyISAM; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; Index: /instantMessenger/de.xml =================================================================== --- /instantMessenger/de.xml (revision 433) +++ /instantMessenger/de.xml (revision 466) @@ -54,8 +54,12 @@ - - - - + + + + + + + + Index: /instantMessenger/groupoptions.xml =================================================================== --- /instantMessenger/groupoptions.xml (revision 433) +++ /instantMessenger/groupoptions.xml (revision 466) @@ -4,12 +4,30 @@ - - user.board + + + user + + user.instantmessenger + + admin.user + + + + + - Index: /instantMessenger/hr.xml =================================================================== --- /instantMessenger/hr.xml (revision 466) +++ /instantMessenger/hr.xml (revision 466) @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + Kratka Poruka]]> + + + + + + + + + + + + + + + + + + + Korisnici si mogu slati Kratke Poruke + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSIDE das Hörspiel;
Instant Messenger prijevod by CroForumi.com, Dean Barić; ]]> + + + + + + + + + + + + + + + Index: /instantMessenger/package.xml =================================================================== --- /instantMessenger/package.xml (revision 451) +++ /instantMessenger/package.xml (revision 466) @@ -1,27 +1,30 @@ - - WCF Instant Messenger - WCF Plugin zur schnellen und sicheren Kommunikation - - 1 + Instant Messenger (WCF) + Instant Messenger (WCF) + Instant Messenger (WCF) + Instant Messenger (WCF) + Instant Messenger zur schnellen und sicheren Kommunikation + Dein Instant Messenger fÃŒr das WCF + Fast and secure message system + Fast and secure message system + 1.0.1 + 2008-04-26 + http://community.woltlab.com/db/index.php?page=Project&projectID=156 + com.woltlab.wcf 0 - 1.0.0 - 2008-04-20 - com.woltlab.wcf + 1 - - Robert "Tatelwurm" Hempel - http://www.inside-das-hoerspiel.de - + + Robert "Tatzelwurm" Hempel + http://www.inside-das-hoerspiel.de + - - com.woltlab.wcf.data.page - com.woltlab.wcf.page.user.profile - com.woltlab.wcf.form.message - + + + @@ -29,4 +32,5 @@ de-informal.xml en.xml + hr.xml templates.tar acptemplates.tar @@ -40,17 +44,3 @@ pagelocation.xml - - de.xml - de-informal.xml - en.xml - templates.tar - acptemplates.tar - files.tar - acpmenu.xml - eventlistener.xml - options.xml - useroptions.xml - groupoptions.xml - pagelocation.xml - Index: /instantMessenger/de-informal.xml =================================================================== --- /instantMessenger/de-informal.xml (revision 433) +++ /instantMessenger/de-informal.xml (revision 466) @@ -54,8 +54,12 @@ - - - - + + + + + + + + Index: /instantMessenger/templates/instantMessengerWrite.tpl =================================================================== --- /instantMessenger/templates/instantMessengerWrite.tpl (revision 433) +++ /instantMessenger/templates/instantMessengerWrite.tpl (revision 466) @@ -64,12 +64,14 @@
{if $action == "forward" || $action == "new"} -
- -
-
-
- + {if $this->user->getPermission('user.instantmessenger.canWriteToAllOnline')} +
+
-
+
+
+ +
+
+ {/if} {/if}