mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Make sure notifications are marked read when clicking them

Browse Source 
How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.

If the item is read, the URL is directly to the item.

Prettify the html output

PHPBB-11103
This commit is contained in:
Nathan Guse
2012-10-14 12:35:35 -05:00
parent 716635c834
commit a48f090338
7 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/notification/manager.php
View File

@@ -165,7 +165,7 @@ class phpbb_notification_manager
}
$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
$notifications[] = $notification;
$notifications[$row['notification_id']] = $notification;
}
$this->load_users($user_ids);

12
phpBB/includes/notification/type/base.php
View File

@@ -138,7 +138,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
'UNREAD' => $this->unread,
'U_MARK_READ' => append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification[]=' . $this->notification_id),
'U_MARK_READ' => append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id),
);
}
@@ -148,7 +148,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
* @return string
*/
public function mark_read($return = true)
public function mark_read($return = false)
{
return $this->mark(false, $return);
}
@@ -159,7 +159,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
* @return string
*/
public function mark_unread($return = true)
public function mark_unread($return = false)
{
return $this->mark(true, $return);
}
@@ -352,11 +352,11 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
$this->unread = (bool) $unread;
$where = array(
'item_type = ' . $this->db->sql_escape($this->item_type),
"item_type = '" . $this->db->sql_escape($this->item_type) . "'",
'item_id = ' . (int) $this->item_id,
'user_id = ' . (int) $this->user_id,
);
$where = implode(' AND ' . $where);
$where = implode(' AND ', $where);
if ($return)
{
@@ -364,7 +364,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
}
$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
SET unread = ' . $this->unread . '
SET unread = ' . (int) $this->unread . '
WHERE ' . $where;
$this->db->sql_query($sql);
}