Changeset 11395
- Timestamp:
- Apr 21, 2009, 9:56:02 PM (13 years ago)
- Location:
- OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile
- Files:
-
- 6 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/apps/mobile_frontend/modules/message/templates/_dustListRecord.php
r11371 r11395 1 1 <?php echo op_format_date($message->getCreatedAt(), 'XDateTime') ?><br> 2 2 <?php echo sprintf('%s (%s)', 3 link_to(op_truncate($message->getSubject(), 28), '@readD eletedMessage?id='. $message->getViewMessageId()),3 link_to(op_truncate($message->getSubject(), 28), '@readDustMessage?id='. $message->getViewMessageId()), 4 4 $message->getSendFromOrTo()->getName() 5 5 ); -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/apps/mobile_frontend/modules/message/templates/_receiveListRecord.php
r11371 r11395 8 8 <?php endif; ?><br> 9 9 <?php echo sprintf('%s (%s)', 10 link_to(op_truncate($message->getSubject(), 28), '@read Message?id='. $message->getId()),10 link_to(op_truncate($message->getSubject(), 28), '@readReceiveMessage?id='. $message->getId()), 11 11 $message->getSendFrom()->getName() 12 12 ); ?> -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/apps/mobile_frontend/modules/message/templates/listSuccess.php
r11371 r11395 5 5 <font color="#FF0000"><?php echo $form->renderGlobalErrors() ?></font> 6 6 <?php endif; ?> 7 <form action="<?php echo url_for('@'.$message _type.'List') ?>" method="post">7 <form action="<?php echo url_for('@'.$messageType.'List') ?>" method="post"> 8 8 <?php echo $form->renderHiddenFields(); ?> 9 9 <?php $_list = array() ?> 10 10 <?php foreach ($pager->getResults() as $message): ?> 11 11 <?php $_list[] = $form['message_ids['.$message->getId().']']->render(). 12 get_partial($message _type.'ListRecord', array('message' => $message)); ?>12 get_partial($messageType.'ListRecord', array('message' => $message)); ?> 13 13 <?php endforeach; ?> 14 14 <?php op_include_list('messageList', $_list, array()); ?> 15 <?php if ($message _type == 'dust'): ?>15 <?php if ($messageType == 'dust'): ?> 16 16 <input type="submit" name="restore" value="<?php echo __('Restore') ?>"><br> 17 17 <?php endif; ?> 18 18 <input type="submit" value="<?php echo __('Delete') ?>"> 19 19 </form> 20 <center><?php op_include_pager_navigation($pager, '@'.$message _type.'List?page=%d', array('is_total' => false)) ?></center>20 <center><?php op_include_pager_navigation($pager, '@'.$messageType.'List?page=%d', array('is_total' => false)) ?></center> 21 21 <?php else: ?> 22 22 <?php echo __('There are no messages.') ?><br><br> 23 23 <?php endif; ?> 24 24 <hr> 25 <?php include_partial('message/menu', array('messageType' => $message _type)) ?>25 <?php include_partial('message/menu', array('messageType' => $messageType)) ?> -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/apps/mobile_frontend/modules/message/templates/showSuccess.php
r11371 r11395 22 22 <hr> 23 23 24 <?php if ($ sf_params->get('type')== 'dust'): ?>24 <?php if ($messageType == 'dust'): ?> 25 25 <?php echo link_to(__('Restore'), 'message/restore?id='.$deletedId) ?><br> 26 26 <?php endif; ?> … … 28 28 <?php echo link_to(__('Delete'), $deleteButton) ?> 29 29 30 <?php if ($ sf_params->get('type')!= 'dust' && !$message->getIsSender()): ?>30 <?php if ($messageType != 'dust' && !$message->getIsSender()): ?> 31 31 <br><?php echo link_to(__('Reply'), 'message/reply?id='.$message->getId()) ?> 32 32 <?php endif; ?> … … 35 35 36 36 37 <?php if ($ sf_params->get('type')== 'receive'): ?>37 <?php if ($messageType == 'receive'): ?> 38 38 <?php echo link_to(__('Inbox'), '@receiveList') ?> 39 <?php elseif ($ sf_params->get('type')== 'send'): ?>39 <?php elseif ($messageType == 'send'): ?> 40 40 <?php echo link_to(__('Sent Message'), '@sendList') ?> 41 41 <?php else : ?> -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/apps/pc_frontend/modules/member/config/view.yml
r9821 r11395 5 5 is_component: true 6 6 parts: [information] 7 target: [bo ttom]7 target: [bodyBottom] 8 8 -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/apps/pc_frontend/modules/message/templates/listSuccess.php
r11361 r11395 1 1 <?php use_helper('Date', 'JavascriptBase'); ?> 2 <?php include_partial('message/sidemenu', array('list_type' => $ sf_params->get('type'))); ?>2 <?php include_partial('message/sidemenu', array('list_type' => $messageType)); ?> 3 3 <?php echo javascript_tag(" 4 4 function checkAll() { … … 20 20 ") ?> 21 21 <?php 22 switch ($message _type):22 switch ($messageType): 23 23 case 'receive': 24 24 $title = __('Inbox'); … … 47 47 <?php if ($pager->getNbResults()): ?> 48 48 <div class="pagerRelativeMulti"> 49 <?php if ($message _type == 'receive'): ?>49 <?php if ($messageType == 'receive'): ?> 50 50 <p class="icons"> 51 51 <span> … … 79 79 <?php foreach ($pager->getResults() as $message): ?> 80 80 <?php 81 switch ($message _type):81 switch ($messageType): 82 82 case 'receive': 83 83 $form_delete = $form["message_ids[".$message->getId()."]"]; … … 85 85 $sender = $message->getSendFrom(); 86 86 $detail_title = $message->getSubject(); 87 $detail_url = '@read Message?id='.$message->getMessageId();87 $detail_url = '@readReceiveMessage?id='.$message->getMessageId(); 88 88 break; 89 89 case 'send': … … 106 106 $sender = $message->getSendFromOrTo(); 107 107 $detail_title = $message->getSubject(); 108 $detail_url = '@readD eletedMessage?id='.$message->getViewMessageId();108 $detail_url = '@readDustMessage?id='.$message->getViewMessageId(); 109 109 break; 110 110 endswitch; 111 111 ?> 112 <tr <?php if ($message _type == 'receive' && $message->getIsRead() == 0): ?>class="unread"<?php endif; ?>>112 <tr <?php if ($messageType == 'receive' && $message->getIsRead() == 0): ?>class="unread"<?php endif; ?>> 113 113 <td class="status"><span> 114 <?php if ($message _type == 'send'): ?>114 <?php if ($messageType == 'send'): ?> 115 115 <?php echo image_tag('/opMessagePlugin/images/icon_mail_3.gif') ?> 116 <?php elseif ($message _type == 'draft'): ?>116 <?php elseif ($messageType == 'draft'): ?> 117 117 <?php echo image_tag('/opMessagePlugin/images/icon_mail_1.gif') ?> 118 <?php elseif ($message _type == 'dust'): ?>118 <?php elseif ($messageType == 'dust'): ?> 119 119 <?php if ($message->getIcon() && $message->getIconAlt()): ?> 120 120 <?php echo image_tag('/opMessagePlugin/images/'.$message->getIcon(), array('alt' => $message->getIconAlt())) ?> … … 147 147 </p> 148 148 <ul class="moreInfo button"> 149 <?php if ($message _type == 'dust'): ?>149 <?php if ($messageType == 'dust'): ?> 150 150 <li> 151 151 <input type="submit" class="input_submit" name="restore" value="<?php echo __('Restore') ?>" /> -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/apps/pc_frontend/modules/message/templates/showSuccess.php
r11361 r11395 1 1 <?php use_helper('Date', 'Text'); ?> 2 <?php include_partial('message/sidemenu', array('list_type' => $ sf_request->getParameter('type'))) ?>2 <?php include_partial('message/sidemenu', array('list_type' => $messageType)) ?> 3 3 <div class="dparts messageDetailBox"> 4 4 <div class="parts"> 5 5 <div class="partsHeading"><h3><?php echo __('Message') ?></h3></div> 6 <?php 7 /* @todo 前後のメッセージ 8 ({if $prev_c_message_id || $next_c_message_id}) 6 <?php /* 7 TODO: Previous and Next 8 <?php if ($previousMessage || $nextMessage): ?> 9 9 <div class="block prevNextLinkLine"> 10 ({if $prev_c_message_id})<p class="prev"><a href="({t_url m=pc a=page_h_message})&target_c_message_id=({$prev_c_message_id})&({if $box == 'outbox'})box=({$box})({else})jyusin_c_message_id=({$prev_c_message_id})({/if})">«前を表示</a></p>({/if}) 11 ({if $next_c_message_id})<p class="next"><a href="({t_url m=pc a=page_h_message})&target_c_message_id=({$next_c_message_id})&({if $box == 'outbox'})box=({$box})({else})jyusin_c_message_id=({$next_c_message_id})({/if})">次を表示»</a></p>({/if}) 10 <?php if ($previousMessage): ?><p class="prev"><?php echo link_to(__('Previous'), '@read'.ucfirst($messageType).'Message?id='.$previousMessage->getId()) ?></p><?php endif; ?> 11 <?php if ($nextMessage): ?><p class="next"><?php echo link_to(__('Next'),'@read'.ucfirst($messageType).'Message?id='.$nextMessage->getId()) ?> </p><?php endif; ?> 12 12 </div> 13 ({/if}) 14 */ 15 ?> 13 <?php endif; ?> 14 */ ?> 16 15 <table> 17 16 <tr> … … 66 65 <div class="operation"> 67 66 <ul class="moreInfo button"> 68 <?php if ($ sf_request->getParameter('type')== 'dust'): ?>67 <?php if ($messageType == 'dust'): ?> 69 68 <li><?php echo button_to(__('Restore'), 'message/restore?id='.$deletedId)?></li> 70 69 <?php endif; ?> 71 70 <li><?php echo button_to(__('Delete'), $deleteButton) ?></li> 72 <?php if ($ sf_request->getParameter('type')!= 'dust' && !$message->getIsSender()): ?>71 <?php if ($messageType != 'dust' && !$message->getIsSender()): ?> 73 72 <li><?php echo button_to(__('Reply'), 'message/reply?id='.$message->getId()) ?></li> 74 73 </ul> -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/config/schema.yml
r10378 r11395 22 22 id: ~ 23 23 #送信者 24 member_id: { type: integer, foreignTable: member, foreignReference: id }24 member_id: { type: integer, foreignTable: member, foreignReference: id, onDelete: setnull } 25 25 subject: { type: longvarchar } 26 26 body: { type: longvarchar } … … 43 43 id: ~ 44 44 #受信者 45 member_id: { type: integer, foreignTable: member, foreignReference: id }45 member_id: { type: integer, foreignTable: member, foreignReference: id, onDelete: setnull } 46 46 message_id: { type: integer, foreignTable: message, foreignReference: id } 47 47 is_read: { type: boolean, required: true, default: 0 } … … 53 53 id: ~ 54 54 #削除者 55 member_id: { type: integer, foreignTable: member, foreignReference: id }55 member_id: { type: integer, foreignTable: member, foreignReference: id, onDelete: cascade } 56 56 message_id: { type: integer, required: true } 57 57 message_send_list_id: { type: integer, required: true } -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/action/opMessagePluginMessageActions.class.php
r11361 r11395 21 21 * Executes index action 22 22 * 23 * @param sf Request $request A request object23 * @param sfWebRequest $request A request object 24 24 */ 25 25 public function executeIndex($request) … … 34 34 * @param sfWebRequest $request A request object 35 35 */ 36 public function executeList($request) 37 { 38 switch ($request->getParameter('type')) 36 public function executeList(sfWebRequest $request) 37 { 38 $this->messageType = $request->getParameter('type'); 39 switch ($this->messageType) 39 40 { 40 41 case 'receive' : … … 65 66 throw new LogicException(); 66 67 } 67 $this->message_type = $request->getParameter('type');68 68 69 69 $this->pager = call_user_func(array($class, $function), … … 102 102 * Executes show action 103 103 * 104 * @param sf Request $request A request object105 */ 106 public function executeShow( $request)104 * @param sfWebRequest $request A request object 105 */ 106 public function executeShow(sfWebRequest $request) 107 107 { 108 108 $this->message = SendMessageDataPeer::retrieveByPk($request->getParameter('id')); 109 $this->forward404unless($message = $this->isReadable($request->getParameter('type'))); 110 switch ($request->getParameter('type')) { 109 $this->messageType = $request->getParameter('type'); 110 $this->forward404unless($message = $this->isReadable($this->messageType)); 111 switch ($this->messageType) { 111 112 case "receive": 112 113 $this->deleteButton = '@deleteReceiveMessage?id='.$message->getId(); … … 127 128 * Executes delete action 128 129 * 129 * @param sfRequest $request A request object 130 */ 131 public function executeDelete($request) 132 { 133 switch ($request->getParameter('type')) { 134 case "receiveList": 135 $object_name = 'MessageSendList'; 136 break; 137 case "sendList": 138 $object_name = 'Message'; 139 break; 140 case "dustList": 141 $object_name = 'DeletedMessage'; 130 * @param sfWebRequest $request A request object 131 */ 132 public function executeDelete(sfWebRequest $request) 133 { 134 $messageType = $request->getParameter('type'); 135 switch ($messageType) { 136 case "receive": 137 $objectName = 'MessageSendList'; 138 break; 139 case "send": 140 $objectName = 'Message'; 141 break; 142 case "dust": 143 $objectName = 'DeletedMessage'; 142 144 break; 143 145 default : 144 146 throw new LogicException(); 145 147 } 146 if ($object_name) { 147 DeletedMessagePeer::deleteMessage(sfContext::getInstance()->getUser()->getMemberId(), 148 DeletedMessagePeer::deleteMessage(sfContext::getInstance()->getUser()->getMemberId(), 148 149 $request->getParameter('id'), 149 $object _name);150 }151 $this->redirect(' message/'.$request->getParameter('type'));150 $objectName); 151 152 $this->redirect('@'.$messageType.'List'); 152 153 } 153 154 … … 155 156 * Executes restore action 156 157 * 157 * @param sf Request $request A request object158 */ 159 public function executeRestore( $request)158 * @param sfWebRequest $request A request object 159 */ 160 public function executeRestore(sfWebRequest $request) 160 161 { 161 162 DeletedMessagePeer::restoreMessage($request->getParameter('id')); … … 166 167 * Executes sendMessage action 167 168 * 168 * @param sf Request $request A request object169 */ 170 public function executeSendToFriend( $request)169 * @param sfWebRequest $request A request object 170 */ 171 public function executeSendToFriend(sfWebRequest $request) 171 172 { 172 173 if ($request->getParameter('message')) … … 186 187 } 187 188 188 if ($sendMemberId == $this->getUser()->getMemberId()) 189 { 190 $this->forward404(); 191 } 189 $this->forward404If($sendMemberId == $this->getUser()->getMemberId()); 192 190 193 191 $this->form = new SendMessageForm($this->message, array( … … 222 220 * Executes editMessage action 223 221 * 224 * @param sf Request $request A request object225 */ 226 public function executeEdit( $request)222 * @param sfWebRequest $request A request object 223 */ 224 public function executeEdit(sfWebRequest $request) 227 225 { 228 226 $this->message = SendMessageDataPeer::retrieveByPk($request->getParameter('id')); … … 245 243 * Executes replyMessage action 246 244 * 247 * @param sf Request $request A request object248 */ 249 public function executeReply( $request)245 * @param sfWebRequest $request A request object 246 */ 247 public function executeReply(sfWebRequest $request) 250 248 { 251 249 $message = SendMessageDataPeer::retrieveByPk($request->getParameter('id')); -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/model/DeletedMessage.php
r11361 r11395 11 11 class DeletedMessage extends BaseDeletedMessage 12 12 { 13 private $message = null; 13 protected 14 $message = null; 15 14 16 /** 15 17 * 宛先/送信先を取得する … … 113 115 114 116 /** 115 * メッセージID(表示用)を取得する 116 * @return int 117 * get the message's id to read message 118 * 119 * @return integer 117 120 */ 118 121 public function getViewMessageId() 119 122 { 120 if ($this->getMessageId()) { 121 if (!$this->message) { 123 if ($this->getMessageId()) 124 { 125 if (!$this->message) 126 { 122 127 $this->message = SendMessageDataPeer::retrieveByPK($this->getMessageId()); 123 128 } 124 } else if ($this->getMessageSendListId()) { 129 } 130 else if ($this->getMessageSendListId()) 131 { 125 132 $this->message = MessageSendListPeer::retrieveByPK($this->getMessageSendListId()); 126 133 } 127 if ($this->message) { 134 if ($this->message) 135 { 128 136 return $this->message->getId(); 129 137 } -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/model/DeletedMessagePeer.php
r10033 r11395 11 11 class DeletedMessagePeer extends BaseDeletedMessagePeer 12 12 { 13 /** 14 * add delete message criteria 15 * 16 * @param Criteria $criteria 17 * @param integer $memberId 18 */ 19 public static function addDeleteMessageCriteria($criteria, $memberId = null) 20 { 21 if (is_null($memberId)) 22 { 23 $memberId = sfContext::getInstance()->getUser()->getMemberId(); 24 } 25 $criteria->add(self::MEMBER_ID, $memberId); 26 $criteria->add(self::IS_DELETED, false); 27 } 28 13 29 /** 14 30 * 削除済みメッセージ一覧 15 * @param $member_id16 * @param $page17 * @param $size31 * @param integer $memberId 32 * @param integer $page 33 * @param integer $size 18 34 * @return DeletedMessage object(の配列) 19 35 */ 20 public static function getDeletedMessagePager($member _id, $page = 1, $size = 20)36 public static function getDeletedMessagePager($memberId = null, $page = 1, $size = 20) 21 37 { 22 38 $c = new Criteria(); 23 $c->add(self::MEMBER_ID, $member_id); 24 $c->add(self::IS_DELETED, 0); 39 self::addDeleteMessageCriteria($c, $memberId); 25 40 $c->addDescendingOrderByColumn(self::CREATED_AT); 26 41 $pager = new sfPropelPager('DeletedMessage', $size); -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/model/MessageSendList.php
r11361 r11395 52 52 } 53 53 54 55 56 57 58 54 /** 55 * get message subject 56 * 57 * @return string 58 */ 59 59 public function getSubject() 60 60 { -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/model/MessageSendListPeer.php
r10033 r11395 19 19 { 20 20 /** 21 * add receive message criteria 22 * 23 * @param Criteria $criteria 24 * @param integer $memberId 25 */ 26 public static function addReceiveMessageCriteria($criteria, $memberId = null) 27 { 28 if (is_null($memberId)) 29 { 30 $memberId = sfContext::getInstance()->getUser()->getMemberId(); 31 } 32 $criteria->addJoin(self::MESSAGE_ID, SendMessageDataPeer::ID); 33 $criteria->add(self::MEMBER_ID, $memberId); 34 $criteria->add(self::IS_DELETED, false); 35 $criteria->add(SendMessageDataPeer::IS_SEND, true); 36 } 37 38 /** 21 39 * 受信メッセージ一覧 22 * @param $member _id40 * @param $memberId 23 41 * @param $page 24 42 * @param $size 25 43 * @return MessageSendList object(の配列) 26 44 */ 27 public static function getReceiveMessagePager($member _id, $page = 1, $size = 20)45 public static function getReceiveMessagePager($memberId = null, $page = 1, $size = 20) 28 46 { 29 47 $c = new Criteria(); 30 $c->addJoin(self::MESSAGE_ID, SendMessageDataPeer::ID); 31 $c->add(self::MEMBER_ID, $member_id); 32 $c->add(self::IS_DELETED, 0); 33 $c->add(SendMessageDataPeer::IS_SEND, 1); 48 self::addReceiveMessageCriteria($c, $memberId); 34 49 $c->addDescendingOrderByColumn(self::CREATED_AT); 35 50 -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/model/SendMessageData.php
r11361 r11395 17 17 class SendMessageData extends BaseSendMessageData 18 18 { 19 protected 20 $previous = null, 21 $next = null; 22 19 23 /** 20 24 * メッセージが本人送信のものかどうか確認する -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/model/SendMessageDataPeer.php
r10033 r11395 17 17 class SendMessageDataPeer extends BaseSendMessageDataPeer 18 18 { 19 /** 20 * add send message criteria 21 * 22 * @param Criteria $criteria 23 * @param integer $memberId 24 */ 25 public static function addSendMessageCriteria($criteria, $memberId = null) 26 { 27 if (is_null($memberId)) 28 { 29 $memberId = sfContext::getInstance()->getUser()->getMemberId(); 30 } 31 $criteria->add(self::MEMBER_ID, $memberId); 32 $criteria->add(self::IS_DELETED, 0); 33 $criteria->add(self::IS_SEND, true); 34 } 35 19 36 public static function getHensinMassage($member_id, $message_id) 20 37 { … … 32 49 /** 33 50 * 送信メッセージ一覧 34 * @param $member _id51 * @param $memberId 35 52 * @param $page 36 53 * @param $size 37 54 * @return Message object(の配列) 38 55 */ 39 public static function getSendMessagePager($member _id, $page = 1, $size = 20)56 public static function getSendMessagePager($memberId = null, $page = 1, $size = 20) 40 57 { 41 58 $c = new Criteria(); 42 $c->add(self::MEMBER_ID, $member_id); 43 $c->add(self::IS_DELETED, 0); 44 $c->add(SendMessageDataPeer::IS_SEND, 1); 59 self::addSendMessageCriteria($c, $memberId); 45 60 $c->addDescendingOrderByColumn(self::CREATED_AT); 46 47 61 $pager = new sfPropelPager('SendMessageData', $size); 48 62 $pager->setCriteria($c); -
OpenPNE3/plugins/opMessagePlugin/branches/kawahara_mobile/lib/opMessagePluginRouting.class.php
r11361 r11395 20 20 { 21 21 $routing = $event->getSubject(); 22 // message list 22 23 $routing->prependRoute('receiveList', 23 24 new sfRoute( … … 45 46 ); 46 47 47 48 $routing->prependRoute('read Message',48 //show message 49 $routing->prependRoute('readReceiveMessage', 49 50 new sfRoute( 50 51 '/message/read/:id', … … 60 61 ) 61 62 ); 62 $routing->prependRoute('readD eletedMessage',63 $routing->prependRoute('readDustMessage', 63 64 new sfRoute( 64 65 '/message/checkDelete/:id', … … 67 68 ) 68 69 ); 70 71 //delete message 69 72 $routing->prependRoute('deleteReceiveMessage', 70 73 new sfRoute( 71 74 '/message/deleteReceiveMessage/:id', 72 array('module' => 'message', 'action' => 'delete', 'type' => 'receive List'),75 array('module' => 'message', 'action' => 'delete', 'type' => 'receive'), 73 76 array('id' => '\d+') 74 77 ) … … 77 80 new sfRoute( 78 81 '/message/deleteSendMessage/:id', 79 array('module' => 'message', 'action' => 'delete', 'type' => 'send List'),82 array('module' => 'message', 'action' => 'delete', 'type' => 'send'), 80 83 array('id' => '\d+') 81 84 ) … … 84 87 new sfRoute( 85 88 '/message/deleteComplete/:id', 86 array('module' => 'message', 'action' => 'delete', 'type' => 'dust List'),89 array('module' => 'message', 'action' => 'delete', 'type' => 'dust'), 87 90 array('id' => '\d+') 88 91 )
Note: See TracChangeset
for help on using the changeset viewer.