Changeset 1542 in ExiteCMS
- Timestamp:
- 07/10/08 11:34:16 (4 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
files/locales/en.main.global.php (modified) (1 diff)
-
files/locales/en.main.setup.php (modified) (3 diffs)
-
modules/user_info_panel/user_info_panel.php (modified) (2 diffs)
-
themes/ExiteCMS/theme.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/files/locales/en.main.global.php
r1530 r1542 3 3 // locale : English 4 4 // locale name : main.global 5 // generated on : Tue Jul 8 2008, 16:32:08CEST5 // generated on : Tue Jul 8 2008, 20:58:11 CEST 6 6 // translators : ExiteCMS team,WanWizard 7 7 // ---------------------------------------------------------- -
trunk/files/locales/en.main.setup.php
r1502 r1542 3 3 // locale : English 4 4 // locale name : main.setup 5 // generated on : Tue Jul 1 2008, 19:42:17CEST5 // generated on : Tue Jul 8 2008, 20:58:24 CEST 6 6 // translators : ExiteCMS team,WanWizard 7 7 // ---------------------------------------------------------- … … 53 53 $locale['475'] = "News"; 54 54 $locale['476'] = "Panels"; 55 $locale['477'] = " x";55 $locale['477'] = "Reports"; 56 56 $locale['478'] = "PHP Info"; 57 57 $locale['479'] = "Polls"; 58 $locale['480'] = " x";58 $locale['480'] = "Searches"; 59 59 $locale['481'] = "Menu System"; 60 60 $locale['482'] = "x"; … … 82 82 $locale['507'] = "Search"; 83 83 $locale['508'] = "Register"; 84 $locale['509'] = "Reports"; 84 85 $locale['520'] = "Main Menu"; 85 86 $locale['521'] = "Online Users"; -
trunk/modules/user_info_panel/user_info_panel.php
r1491 r1542 37 37 SELECT count(*) as unread 38 38 FROM ".$db_prefix."posts p 39 INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id 39 40 INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 40 WHERE tr.user_id = '".$userdata['user_id']."' 41 WHERE ".groupaccess('f.forum_access')." 42 AND tr.user_id = '".$userdata['user_id']."' 41 43 AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].") 42 44 AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read) … … 47 49 SELECT count(*) as unread 48 50 FROM ".$db_prefix."posts p 51 INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id 49 52 INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 50 WHERE tr.user_id = '".$userdata['user_id']."' 53 WHERE ".groupaccess('f.forum_access')." 54 AND tr.user_id = '".$userdata['user_id']."' 51 55 AND p.post_author != '".$userdata['user_id']."' 52 56 AND p.post_edituser != '".$userdata['user_id']."' -
trunk/themes/ExiteCMS/theme.php
r1491 r1542 70 70 SELECT count(*) as unread 71 71 FROM ".$db_prefix."posts p 72 INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id 72 73 INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 73 WHERE tr.user_id = '".$userdata['user_id']."' 74 WHERE ".groupaccess('f.forum_access')." 75 AND tr.user_id = '".$userdata['user_id']."' 74 76 AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].") 75 77 AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read) … … 80 82 SELECT count(*) as unread 81 83 FROM ".$db_prefix."posts p 84 INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id 82 85 INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 83 WHERE tr.user_id = '".$userdata['user_id']."' 86 WHERE ".groupaccess('f.forum_access')." 87 AND tr.user_id = '".$userdata['user_id']."' 84 88 AND p.post_author != '".$userdata['user_id']."' 85 89 AND p.post_edituser != '".$userdata['user_id']."'
Note: See TracChangeset
for help on using the changeset viewer.
