diff --git a/apps/api/modules/message/actions/actions.class.php b/apps/api/modules/message/actions/actions.class.php index c38346e..f8749cf 100644 --- a/apps/api/modules/message/actions/actions.class.php +++ b/apps/api/modules/message/actions/actions.class.php @@ -71,14 +71,13 @@ public function executeSearch(sfWebRequest $request) $this->forward400If('' === (string)$request['memberId'], 'memberId parameter is not specified.'); $this->forward400If('' === (string)$request['maxId'], 'maxId parameter is not specified.'); - Doctrine_Core::getTable('MessageSendList') - ->updateReadAllMessagesByMemberId($request['memberId'], $this->getUser()->getMemberId()); - $this->pager = Doctrine_Core::getTable('MessageSendList')->getMemberMessagesPager( $request['memberId'], $this->getUser()->getMemberId(), (bool) $request['isAddLow'], - $request['maxId'] + $request['maxId'], + 25, + true ); } diff --git a/apps/mobile_frontend/config/app.yml b/apps/mobile_frontend/config/app.yml deleted file mode 100644 index d7ae9a4..0000000 --- a/apps/mobile_frontend/config/app.yml +++ /dev/null @@ -1,4 +0,0 @@ -all: - message_is_upload_images: false - message_max_image_file_num: 3 - message_pagenateSize: 10 diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml deleted file mode 100644 index 276d5e0..0000000 --- a/apps/mobile_frontend/i18n/messages.ja.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - Inbox - 受信箱 - - - Sent Messages - 送信箱 - - - Drafts - 下書き - - - Trash - ｺﾞﾐ箱 - - - From - 送信者 - - - To - 宛先 - - - From/To - 相手 - - - Delete - 削除 - - - Restore - 元に戻す - - - Reply - 返事 - - - Subject - 件名 - - - Body - 本文 - - - Created At - 日付 - - - Replied - 返信済み - - - Open - 既読 - - - Unopened - 未読 - - - There are no messages. - ﾒｯｾｰｼﾞがありません - - - There are new %d messages! - 新着ﾒｯｾｰｼﾞが%d件あります！ - - - Read messages - ﾒｯｾｰｼﾞを読む - - - Compose Message - ﾒｯｾｰｼﾞを書く - - - Send - 送信 - - - Draft - 下書き保存 - - - Message - ﾒｯｾｰｼﾞ - - - Message List - ﾒｯｾｰｼﾞﾘｽﾄ - - - The message was sent successfully. - ﾒｯｾｰｼﾞを送信しました。 - - - The message was saved successfully. - ﾒｯｾｰｼﾞを保存しました。 - - - Cannot send the message. - ﾒｯｾｰｼﾞを送信できませんでした。 - - - Delete this message - このﾒｯｾｰｼﾞを削除する - - - Delete messages - ﾒｯｾｰｼﾞを削除する - - - Message from smartphone - ｽﾏｰﾄﾌｫﾝからのﾒｯｾｰｼﾞ - - - - diff --git a/apps/mobile_frontend/modules/member/config/view.yml b/apps/mobile_frontend/modules/member/config/view.yml deleted file mode 100644 index 1433019..0000000 --- a/apps/mobile_frontend/modules/member/config/view.yml +++ /dev/null @@ -1,16 +0,0 @@ -#for information -homeSuccess: - customize: - unreadMessage: - template: [message, unreadMessage] - is_component: true - parts: [information] - target: [bottom] - -#for member profile -profileSuccess: - customize: - sendMessageLink: - template: [message, sendMessageLink] - parts: [menu] - target: [friendBottom] diff --git a/apps/mobile_frontend/modules/message/actions/actions.class.php b/apps/mobile_frontend/modules/message/actions/actions.class.php deleted file mode 100644 index 5d1104a..0000000 --- a/apps/mobile_frontend/modules/message/actions/actions.class.php +++ /dev/null @@ -1,66 +0,0 @@ - - */ -class messageActions extends opMessagePluginMessageActions -{ - /** - * get title - * - * @param string $type - */ - protected function getTitle($type = null) - { - - if (is_null($type)) - { - $type = sfContext::getInstance()->getRequest()->getParameter('type'); - } - switch ($type) - { - case 'receive' : - return $this->title = 'Inbox'; - case 'send' : - return $this->title = 'Sent Messages'; - case 'draft' : - return $this->title = 'Drafts'; - case 'dust' : - return $this->title = 'Trash'; - } - } - - /** - * Executes list action - * - * @param sfWebRequest $request A request object - */ - public function executeList(sfWebRequest $request) - { - $this->title = $this->getTitle(); - parent::executeList($request); - } - - /** - * Execute show action - * - * @param sfWebRequest $request A request object - */ - public function executeShow(sfWebRequest $request) - { - $this->title = $this->getTitle(); - parent::executeShow($request); - } -} diff --git a/apps/mobile_frontend/modules/message/config/security.yml b/apps/mobile_frontend/modules/message/config/security.yml deleted file mode 100644 index d92f54d..0000000 --- a/apps/mobile_frontend/modules/message/config/security.yml +++ /dev/null @@ -1,3 +0,0 @@ -all: - is_secure: true - credentials: SNSMember diff --git a/apps/mobile_frontend/modules/message/templates/_draftListRecord.php b/apps/mobile_frontend/modules/message/templates/_draftListRecord.php deleted file mode 100644 index b3cac13..0000000 --- a/apps/mobile_frontend/modules/message/templates/_draftListRecord.php +++ /dev/null @@ -1,6 +0,0 @@ - -getCreatedAt(), 'XDateTime') ?>
-getSendTo()->getId()) ? link_to(op_truncate($message->getSubject(), 28), 'message/edit?id='. $message->getId()) : op_truncate($message->getSubject(), 28), - op_message_link_to_member($message->getSendTo()) -); diff --git a/apps/mobile_frontend/modules/message/templates/_dustListRecord.php b/apps/mobile_frontend/modules/message/templates/_dustListRecord.php deleted file mode 100644 index 177da89..0000000 --- a/apps/mobile_frontend/modules/message/templates/_dustListRecord.php +++ /dev/null @@ -1,6 +0,0 @@ - -getCreatedAt(), 'XDateTime') ?>
-getSubject(), 28), '@readDustMessage?id='. $message->getViewMessageId()), - op_message_link_to_member($message->getSendFromOrTo()) -); diff --git a/apps/mobile_frontend/modules/message/templates/_menu.php b/apps/mobile_frontend/modules/message/templates/_menu.php deleted file mode 100644 index d03b5b5..0000000 --- a/apps/mobile_frontend/modules/message/templates/_menu.php +++ /dev/null @@ -1,12 +0,0 @@ - -
- - -
- - -
- - - - diff --git a/apps/mobile_frontend/modules/message/templates/_receiveListRecord.php b/apps/mobile_frontend/modules/message/templates/_receiveListRecord.php deleted file mode 100644 index 50d347a..0000000 --- a/apps/mobile_frontend/modules/message/templates/_receiveListRecord.php +++ /dev/null @@ -1,13 +0,0 @@ - -getCreatedAt(), 'XDateTime') ?> -getIsHensin()): ?> -">() -getIsRead()): ?> -() - -">() -
-getSubject(), 28), '@readReceiveMessage?id='. $message->getMessageId()), - op_message_link_to_member($message->getSendFrom()) -); ?> diff --git a/apps/mobile_frontend/modules/message/templates/_sendListRecord.php b/apps/mobile_frontend/modules/message/templates/_sendListRecord.php deleted file mode 100644 index 54f3fc1..0000000 --- a/apps/mobile_frontend/modules/message/templates/_sendListRecord.php +++ /dev/null @@ -1,6 +0,0 @@ - -getCreatedAt(), 'XDateTime') ?>
-getSubject(), 28), '@readSendMessage?id='. $message->getId()), - op_message_link_to_member($message->getSendTo()) -); diff --git a/apps/mobile_frontend/modules/message/templates/_sendMessageLink.php b/apps/mobile_frontend/modules/message/templates/_sendMessageLink.php deleted file mode 100644 index 375ef46..0000000 --- a/apps/mobile_frontend/modules/message/templates/_sendMessageLink.php +++ /dev/null @@ -1,3 +0,0 @@ -getMemberId()): ?> -
- diff --git a/apps/mobile_frontend/modules/message/templates/_unreadMessage.php b/apps/mobile_frontend/modules/message/templates/_unreadMessage.php deleted file mode 100644 index 89fc832..0000000 --- a/apps/mobile_frontend/modules/message/templates/_unreadMessage.php +++ /dev/null @@ -1,3 +0,0 @@ - 0): ?> - $unreadMessageCount)), '@receiveList') ?>
- diff --git a/apps/mobile_frontend/modules/message/templates/deleteConfirmSuccess.php b/apps/mobile_frontend/modules/message/templates/deleteConfirmSuccess.php deleted file mode 100755 index c812487..0000000 --- a/apps/mobile_frontend/modules/message/templates/deleteConfirmSuccess.php +++ /dev/null @@ -1,11 +0,0 @@ - -

-renderFormTag(url_for($deleteButton)); ?> - -
- -
- - diff --git a/apps/mobile_frontend/modules/message/templates/deleteListConfirmSuccess.php b/apps/mobile_frontend/modules/message/templates/deleteListConfirmSuccess.php deleted file mode 100644 index d90eadc..0000000 --- a/apps/mobile_frontend/modules/message/templates/deleteListConfirmSuccess.php +++ /dev/null @@ -1,38 +0,0 @@ - -

- -
- - -renderHiddenFields() ?> -getValue('message_ids') as $s_key => $s_value) -{ - $tw = new sfWidgetFormInputHidden(array(), array()); - $tw->addOption('name_format',$form->getWidgetSchema()->getNameFormat()); - $tn = strtr($form->getWidgetSchema()->getNameFormat(),array('%s' =>"message_ids")); - echo $tw->render($tn.'['.$s_key.']', $s_value); -} -?> - - - - -hasGlobalErrors()): ?> -renderGlobalErrors() ?> - - - -

- - - - -
- - - -
-
diff --git a/apps/mobile_frontend/modules/message/templates/listSuccess.php b/apps/mobile_frontend/modules/message/templates/listSuccess.php deleted file mode 100644 index 5d6cf70..0000000 --- a/apps/mobile_frontend/modules/message/templates/listSuccess.php +++ /dev/null @@ -1,25 +0,0 @@ - -getNbResults()): ?> -
-hasGlobalErrors()): ?> -">renderGlobalErrors() ?> - -
-renderHiddenFields(); ?> - -getResults() as $message): ?> -getId().']']->render(). -get_partial($messageType.'ListRecord', array('message' => $message)); ?> - - - -
- - -
-
false)) ?>
- -

- -
- $messageType)) ?> diff --git a/apps/mobile_frontend/modules/message/templates/sendToFriendInput.php b/apps/mobile_frontend/modules/message/templates/sendToFriendInput.php deleted file mode 100644 index 4bd9186..0000000 --- a/apps/mobile_frontend/modules/message/templates/sendToFriendInput.php +++ /dev/null @@ -1,11 +0,0 @@ - - - -: -

- -renderFormTag(url_for('message/sendToFriend'), array('method' => 'POST')) ?> - -
- - diff --git a/apps/mobile_frontend/modules/message/templates/showSuccess.php b/apps/mobile_frontend/modules/message/templates/showSuccess.php deleted file mode 100644 index 41a17cb..0000000 --- a/apps/mobile_frontend/modules/message/templates/showSuccess.php +++ /dev/null @@ -1,64 +0,0 @@ - - -getIsSender()): ?> -： -getMessageSendLists() as $sendTo): ?> -getMember()) ?> -getMemberId()): ?> - -
- - -： -getMember()) ?> -getMemberId()): ?> - -
- - -： -getCreatedAt(), 'XDateTime'); ?>
- -： -getSubject() ?> - -getMessageFile() ?> - -
- -getFile(), array('size' => '120x120', 'f' => 'jpg'))) ?>
- - - -
- -getBody()) ?> - -
- - -renderFormTag(url_for('message/restore?id='.$deletedId)); ?> - - - - - -renderFormTag(url_for($deleteButton)); ?> - - - - -getIsSender() && !$isDeletedMember): ?> -
getId()) ?> - - -
- - - - - - - - - diff --git a/config/mail_template.yml b/config/mail_template.yml new file mode 100644 index 0000000..15c19fc --- /dev/null +++ b/config/mail_template.yml @@ -0,0 +1,20 @@ +pc: + notifyNewMessage: + caption: "Notification of New Message" + configurable: true + member_configurable: true + sample: + ja_JP: + - "【{{ op_config.sns_name }}】{{ member.name }}さんからのメッセージ「{{ message.subject }}」" + - | + {{ member.name }}>> + + {{ message.body }} + + {{ url }} + variables: + "op_config.sns_name": "SNS 名" + "member.name": "差出人のニックネーム" + "message.subject": "メッセージの件名" + "message.body": "メッセージの本文" + url: "メッセージのURL" diff --git a/config/notification_config.yml b/config/notification_config.yml new file mode 100644 index 0000000..2a6599c --- /dev/null +++ b/config/notification_config.yml @@ -0,0 +1,8 @@ +message: + caption: メッセージ + configs: + messageNew: + caption: 新着メッセージ + messageNewOnlyFriends: + caption: 新着メッセージ (フレンドのみ) + dependOnNot: messageNew diff --git a/data/fixtures/000_revision.yml b/data/fixtures/000_revision.yml index 4804392..6ae6991 100644 --- a/data/fixtures/000_revision.yml +++ b/data/fixtures/000_revision.yml @@ -1,4 +1,4 @@ SnsConfig: op_message_plugin_current_revision: name: "opMessagePlugin_revision" - value: 6 + value: 7 diff --git a/data/fixtures/002_import_navi_menu.yml b/data/fixtures/002_import_navi_menu.yml index cfe5d06..a0f5a86 100644 --- a/data/fixtures/002_import_navi_menu.yml +++ b/data/fixtures/002_import_navi_menu.yml @@ -18,42 +18,3 @@ Navigation: caption: "メッセージを送る" en: caption: "Send Message" - - mobile_home_side_navigation_message: - type: "mobile_home_side" - uri: "message/index" - sort_order: 20 - Translation: - ja_JP: - caption: "ﾒｯｾｰｼﾞ" - en: - caption: "Message" - -#NavigationI18n: -# default_navigation_message_i18n_ja: -# id: default_navigation_message -# caption: "メッセージ" -# culture: "ja_JP" -# default_navigation_message_i18n_en: -# id: default_navigation_message -# caption: "Message" -# culture: "en" -# -# friend_navigation_message_i18n_ja: -# id: friend_navigation_message -# caption: "メッセージを送る" -# culture: "ja_JP" -# friend_navigation_message_i18n_en: -# id: friend_navigation_message -# caption: "Send Message" -# culture: "en" -# -# mobile_home_side_navigation_message_i18n_ja: -# id: mobile_home_side_navigation_message -# caption: "ﾒｯｾｰｼﾞ" -# culture: "ja_JP" -# -# mobile_home_side_navigation_message_i18n_en: -# id: mobile_home_side_navigation_message -# caption: "Message" -# culture: "en" diff --git a/data/migrations/2.0.0/006_add_smartphone_default_navi.php b/data/migrations/2.0.0/006_add_smartphone_default_navi.php index 9084049..e449ef1 100644 --- a/data/migrations/2.0.0/006_add_smartphone_default_navi.php +++ b/data/migrations/2.0.0/006_add_smartphone_default_navi.php @@ -17,7 +17,7 @@ public function up() $naviTable = Doctrine_Core::getTable('Navigation'); if ($naviTable->findOneByTypeAndUri('smartphone_default', '@receiveList')) { - // smartphone message navi is exsits. + // smartphone message navi is exists. return; } diff --git a/apps/mobile_frontend/modules/message/actions/components.class.php b/data/migrations/2.0.0/007_delete_mobile_navi.php similarity index 50% rename from apps/mobile_frontend/modules/message/actions/components.class.php rename to data/migrations/2.0.0/007_delete_mobile_navi.php index 14f48af..ab548e9 100644 --- a/apps/mobile_frontend/modules/message/actions/components.class.php +++ b/data/migrations/2.0.0/007_delete_mobile_navi.php @@ -8,13 +8,17 @@ * file and the NOTICE file that were distributed with this source code. */ -/** - * message components. - * - * @package OpenPNE - * @subpackage message - * @author Shogo Kawahara - */ -class messageComponents extends opMessagePluginMessageComponents +class updateOpMessagePlugin_2_0_0_2 extends opMigration { + public function up() + { + $nav = Doctrine_Core::getTable('Navigation') + ->findOneByTypeAndUri('mobile_home_side', 'message/index'); + if (!$nav) + { + return; + } + + $nav->delete(); + } } diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml index e2ea84c..2611a72 100644 --- a/i18n/messages.ja.xml +++ b/i18n/messages.ja.xml @@ -54,6 +54,10 @@ Message from smartphone スマートフォンからのメッセージ + + Notification of New Message + 新着メッセージお知らせメール + diff --git a/lib/action/opMessagePluginMessageActions.class.php b/lib/action/opMessagePluginMessageActions.class.php index 88ff94e..eb75510 100755 --- a/lib/action/opMessagePluginMessageActions.class.php +++ b/lib/action/opMessagePluginMessageActions.class.php @@ -285,7 +285,6 @@ public function executeSendToFriend(sfWebRequest $request) $this->message = $this->form->save(); if ($this->message->getIsSend()) { - opMessagePluginUtil::sendNotification($this->getUser()->getMember(), $this->sendMember, $this->message->getId()); $this->getUser()->setFlash('notice', 'The message was sent successfully.'); $this->redirect('@sendList'); } diff --git a/lib/form/doctrine/PluginSendMessageDataForm.class.php b/lib/form/doctrine/PluginSendMessageDataForm.class.php index bd18740..8a0af52 100644 --- a/lib/form/doctrine/PluginSendMessageDataForm.class.php +++ b/lib/form/doctrine/PluginSendMessageDataForm.class.php @@ -108,6 +108,11 @@ public function saveSendList(SendMessageData $message) $send->setMemberId($send_member_id); $send->save(); } + + if ($message->is_send) + { + opMessagePluginUtil::sendNotification($message->Member, $send->Member, $message); + } } /* diff --git a/lib/helper/opMessageHelper.php b/lib/helper/opMessageHelper.php index 634ffd5..2cd5948 100644 --- a/lib/helper/opMessageHelper.php +++ b/lib/helper/opMessageHelper.php @@ -25,15 +25,7 @@ function op_message_link_to_member(sfOutputEscaper $member = null) if ($member && $member->id) { - if (sfConfig::get('sf_app') == 'mobile_frontend') - { - $internal_uri = '@member_profile'; - } - else - { - $internal_uri = '@obj_member_profile'; - } - return link_to($member->name, sprintf('%s?id=%d', $internal_uri, $member->id)); + return link_to($member->name, sprintf('@obj_member_profile?id=%d', $member->id)); } return ''; diff --git a/lib/model/doctrine/PluginMessageSendListTable.class.php b/lib/model/doctrine/PluginMessageSendListTable.class.php index 7199faf..16aad25 100644 --- a/lib/model/doctrine/PluginMessageSendListTable.class.php +++ b/lib/model/doctrine/PluginMessageSendListTable.class.php @@ -305,9 +305,10 @@ public function getNextSendMessageData(SendMessageData $message, $myMemberId) * @param bool $isAddLow * @param mixed $keyId (string|null) * @param integer $size + * @param bool $setIsRead * @return sfReversibleDoctrinePager */ - public function getMemberMessagesPager($memberId, $myMemberId = null, $isAddLow = true, $keyId = null, $size = 25) + public function getMemberMessagesPager($memberId, $myMemberId = null, $isAddLow = true, $keyId = null, $size = 25, $setIsRead = false) { $q = $this->createSendAndReceiveQuery($memberId, $myMemberId); @@ -325,6 +326,11 @@ public function getMemberMessagesPager($memberId, $myMemberId = null, $isAddLow } } + if ($setIsRead) + { + $this->updateReadTargetMessagesByMemberId(clone $q, $size); + } + $pager = new sfReversibleDoctrinePager('MessageSendList', $size); $pager->setQuery($q); $pager->setPage(1); @@ -338,16 +344,15 @@ public function getMemberMessagesPager($memberId, $myMemberId = null, $isAddLow } /** - * update read all messages by memberId + * update read target messages. * - * @param string $memberId - * @param mixed $myMemberId (string|null) + * @param Doctrine_Query $q + * @param integer $size */ - public function updateReadAllMessagesByMemberId($memberId, $myMemberId = null) + public function updateReadTargetMessagesByMemberId(Doctrine_Query $q, $size = 25) { - $results = $this->createReceiveQuery($memberId, $myMemberId) - ->select('m.id') - ->andWhere('m.is_read = ?', false) + $results = $q->limit($size) + ->orderBy('m2.id DESC') ->execute(array(), Doctrine_Core::HYDRATE_NONE); if (!count($results)) diff --git a/lib/model/doctrine/PluginSendMessageData.class.php b/lib/model/doctrine/PluginSendMessageData.class.php index c42ed62..fb7b385 100644 --- a/lib/model/doctrine/PluginSendMessageData.class.php +++ b/lib/model/doctrine/PluginSendMessageData.class.php @@ -195,12 +195,14 @@ public function preUpdate($event) } } - public function postHydrate($event) + public function getSubject() { - $object = $event->data; - $replacement = sfContext::getInstance()->getI18n()->__('Message from smartphone'); - $object->subject = str_replace(self::SMARTPHONE_SUBJECT, $replacement, $object->subject); + $subject = $this->_get('subject'); + if ($subject === self::SMARTPHONE_SUBJECT) + { + return sfContext::getInstance()->getI18n()->__('Message from smartphone'); + } - $event->set('data', $object); + return $subject; } } diff --git a/lib/model/doctrine/PluginSendMessageDataTable.class.php b/lib/model/doctrine/PluginSendMessageDataTable.class.php index 55f369d..35b2d3d 100644 --- a/lib/model/doctrine/PluginSendMessageDataTable.class.php +++ b/lib/model/doctrine/PluginSendMessageDataTable.class.php @@ -161,6 +161,8 @@ public static function sendMessage($toMembers, $subject, $body, $options = array $send->setMember($member); $send->setIsRead($options['is_read']); $send->save(); + + opMessagePluginUtil::sendNotification($options['fromMember'], $send->Member, $sendMessageData); } return $sendMessageData; diff --git a/lib/util/opMessagePluginUtil.class.php b/lib/util/opMessagePluginUtil.class.php index b599dfa..6d750b5 100644 --- a/lib/util/opMessagePluginUtil.class.php +++ b/lib/util/opMessagePluginUtil.class.php @@ -16,14 +16,65 @@ */ class opMessagePluginUtil { - public static function sendNotification($fromMember, $toMember, $messageId) + public static function sendNotification($fromMember, $toMember, $message) { - $rootPath = sfContext::getInstance()->getRequest()->getRelativeUrlRoot(); - $url = $rootPath.'/message/read/'.$messageId; + $memberRelationship = Doctrine_Core::getTable('MemberRelationship') + ->retrieveByFromAndTo($fromMember->id, $toMember->id); - $message = sfContext::getInstance()->getI18n()->__('There are new %d messages!', array('%d' => 1)); + $isFriend = $memberRelationship ? $memberRelationship->isFriend() : false; - opNotificationCenter::notify($fromMember, $toMember, $message, array('category' => 'message', 'url' => $url, 'icon_url' => null)); + $notifyWeb = false; + $notifyEmail = false; + + if ($toMember->getConfig('is_send_messageNew_web', '1') === '1') + { + $notifyWeb = true; + } + elseif ($isFriend && $toMember->getConfig('is_send_messageNewOnlyFriends_web', '1') === '1') + { + $notifyWeb = true; + } + + if ($toMember->getConfig('is_send_pc_messageNew_mail', '1') === '1') + { + $notifyEmail = true; + } + elseif ($isFriend && $toMember->getConfig('is_send_pc_messageNewOnlyFriends_mail', '1') === '1') + { + $notifyEmail = true; + } + + $messageUrl = sfContext::getInstance()->getConfiguration() + ->generateAppUrl('pc_frontend', array('sf_route' => 'readReceiveMessage', 'id' => $message->id), true); + + if ($notifyWeb) + { + self::sendNotificationWeb($fromMember, $toMember, $message, $messageUrl); + } + if ($notifyEmail) + { + self::sendNotificationEmail($fromMember, $toMember, $message, $messageUrl); + } + } + + private static function sendNotificationWeb($fromMember, $toMember, $message, $messageUrl) + { + $body = '[Message] '.$message->subject; + + opNotificationCenter::notify($fromMember, $toMember, $body, array( + 'category' => 'message', + 'name' => 'message_'.$message->id, + 'url' => $messageUrl, + )); + } + + private static function sendNotificationEmail($fromMember, $toMember, $message, $messageUrl) + { + opMailSend::sendTemplateMailToMember('notifyNewMessage', $toMember, array( + 'member' => $fromMember, + 'message' => $message, + 'url' => $messageUrl, + )); } CONST SPLIT_KEY = ','; diff --git a/test/functional/mobile_frontend/messageActionsTest.php b/test/functional/mobile_frontend/messageActionsTest.php deleted file mode 100644 index 4fca542..0000000 --- a/test/functional/mobile_frontend/messageActionsTest.php +++ /dev/null @@ -1,110 +0,0 @@ -setMobile(); -$browser - ->info('Login') - ->login('sns@example.com', 'password') - ->isStatusCode(302) - -// CSRF - ->info('/message/receiveList - CSRF') - ->post('/message/receiveList') - ->checkCSRF() - - ->info('/message/sendList - CSRF') - ->post('/message/sendList') - ->checkCSRF() - - ->info('/message/draftList - CSRF') - ->post('/message/draftList') - ->checkCSRF() - - ->info('/message/dustList - CSRF') - ->post('/message/dustList') - ->checkCSRF() - - ->info('/message/sendToFriend/id/1 - CSRF') - ->post('/message/sendToFriend/id/1') - ->checkCSRF() - - ->info('/message/reply/id/2 - CSRF') - ->post('/message/reply/id/2') - ->checkCSRF() - -// XSS - ->info('/message/receiveList - XSS') - ->get('/message/receiveList') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->countEscapedData(1, 'SendMessageData', 'subject', array('width' => 28)) - ->end() - - ->info('/message/sendList - XSS') - ->get('/message/sendList') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->countEscapedData(1, 'SendMessageData', 'subject', array('width' => 28)) - ->end() - - ->info('/message/draftList - XSS') - ->get('/message/draftList') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->countEscapedData(1, 'SendMessageData', 'subject', array('width' => 28)) - ->end() - - ->info('/message/dustList - XSS') - ->get('/message/dustList') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->countEscapedData(1, 'SendMessageData', 'subject', array('width' => 28)) - ->end() - - ->info('/message/read/2 - XSS') - ->get('/message/read/2') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->isAllEscapedData('SendMessageData', 'subject') - ->isAllEscapedData('SendMessageData', 'body') - ->end() - - ->info('/message/check/1 - XSS') - ->get('/message/check/1') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->isAllEscapedData('SendMessageData', 'subject') - ->isAllEscapedData('SendMessageData', 'body') - ->end() - - ->info('/message/checkDelete/3 - XSS') - ->get('/message/checkDelete/3') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->isAllEscapedData('SendMessageData', 'subject') - ->isAllEscapedData('SendMessageData', 'body') - ->end() - - ->info('/message/sendToFriend/id/2 - XSS') - ->get('/message/sendToFriend/id/2') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->end() - - ->info('/message/reply/id/2 - XSS') - ->get('/message/reply/id/2') - ->with('html_escape')->begin() - ->isAllEscapedData('Member', 'name') - ->end() -; diff --git a/web/js/smt-message.js b/web/js/smt-message.js index b79e08e..c5fe304 100644 --- a/web/js/smt-message.js +++ b/web/js/smt-message.js @@ -14,7 +14,7 @@ $(document).ready(function() { config: { /** - * hearbeat timer. + * heartbeat timer. */ timer: null,