From: <sy...@us...> - 2008-10-15 18:14:19
|
Revision: 15158 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15158&view=rev Author: sylvieg Date: 2008-10-15 15:59:19 +0000 (Wed, 15 Oct 2008) Log Message: ----------- [MOD]notif: show forum and tracker outbounds in admin notif Modified Paths: -------------- trunk/lib/commentslib.php trunk/lib/trackers/trackerlib.php trunk/templates/tiki-admin_notifications.tpl trunk/tiki-admin_notifications.php Modified: trunk/lib/commentslib.php =================================================================== --- trunk/lib/commentslib.php 2008-10-15 15:57:24 UTC (rev 15157) +++ trunk/lib/commentslib.php 2008-10-15 15:59:19 UTC (rev 15158) @@ -2305,6 +2305,20 @@ } return $dirs; } + function get_outbound_emails() { + $ret = array(); + $query = "select `forumId`, `mail` as outbound_address from `tiki_forums` where `useMail`=? and `mail` != ''"; + $result = $this->query($query, array('y')); + while ($res = $result->fetchRow()) { + $ret[] = $res; + } + $query = "select `forumId`, `outbound_address` from `tiki_forums` where `outbound_address` != '' and `outbound_address` is not null"; + $result = $this->query($query); + while ($res = $result->fetchRow()) { + $ret[] = $res; + } + return $ret; + } } function compare_replies($ar1, $ar2) { Modified: trunk/lib/trackers/trackerlib.php =================================================================== --- trunk/lib/trackers/trackerlib.php 2008-10-15 15:57:24 UTC (rev 15157) +++ trunk/lib/trackers/trackerlib.php 2008-10-15 15:59:19 UTC (rev 15158) @@ -2111,6 +2111,36 @@ return $res; } + function get_trackers_options($trackerId, $option='', $find='', $not='') { + $where = array(); + $bindvars = array(); + if (!empty($trackerId)) { + $where[] = '`trackerId`=?'; + $bindvars[] = (int)$trackerId; + } + if (!empty($option)) { + $where[] = '`name`=?'; + $bindvars[] = $option; + } + if (!empty($find)) { + $where[] = "`value` like %$find%"; + $bindvars[] = $find; + } + if ($not == 'null') { + $where[] = '`value` is not null'; + } else if ($not == 'empty') { + $where[] = "`value` != ''"; + } + $query = 'select * from `tiki_tracker_options` where '. implode(' and ', $where); + $result = $this->query($query, $bindvars); + if (!$result->numRows()) return array(); + $res = array(); + while ($opt = $result->fetchRow()) { + $res[] = $opt; + } + return $res; + } + function get_tracker_field($fieldId) { $query = "select * from `tiki_tracker_fields` where `fieldId`=?"; $result = $this->query($query,array((int) $fieldId)); Modified: trunk/templates/tiki-admin_notifications.tpl =================================================================== --- trunk/templates/tiki-admin_notifications.tpl 2008-10-15 15:57:24 UTC (rev 15157) +++ trunk/templates/tiki-admin_notifications.tpl 2008-10-15 15:59:19 UTC (rev 15158) @@ -77,7 +77,7 @@ <td>{$channels[user].email}</td> <td>{$channels[user].user}</td> <td> - <a class="link" href="tiki-admin_notifications.php?offset={$offset}&sort_mode={$sort_mode}&removeevent={$channels[user].watchId}">{icon _id='cross' alt='{tr}Remove{/tr}'}</a> + <a class="link" href="{$smarty.server.PHP_SELF}?{query removeevent=$channels[user].watchId}">{icon _id='cross' alt='{tr}Remove{/tr}'}</a> </td> </tr> {sectionelse} @@ -91,3 +91,16 @@ </form> {pagination_links cant=$cant step=$maxRecords offset=$offset}{/pagination_links} + +{if !empty($trackers)} + <h2>{tr}Trackers Outbound Emails{/tr}</h2> + {section name=ix loop=$trackers} + <a href="tiki-admin_trackers.php?trackerId={$trackers[ix].trackerId}">{$trackers[ix].value|escape}</a><br /> + {/section} +{/if} +{if !empty($forums)} + <h2>{tr}Forums Outbound Emails{/tr}</h2> + {section name=ix loop=$forums} + <a href="tiki-admin_forums.php?forumId={$forums[ix].forumId}">{$forums[ix].outbound_address|escape}</a><br /> + {/section} +{/if} Modified: trunk/tiki-admin_notifications.php =================================================================== --- trunk/tiki-admin_notifications.php 2008-10-15 15:57:24 UTC (rev 15157) +++ trunk/tiki-admin_notifications.php 2008-10-15 15:59:19 UTC (rev 15158) @@ -141,6 +141,19 @@ $smarty->assign_by_ref('cant', $channels['cant']); $smarty->assign_by_ref('channels', $channels["data"]); +if ($prefs['feature_trackers'] == 'y') { + global $trklib; include_once('lib/trackers/trackerlib.php'); + $trackers = $trklib->get_trackers_options(0, 'outboundemail', $find, 'empty'); + $smarty->assign_by_ref('trackers', $trackers); +} +if ($prefs['feature_forums'] == 'y') { + include_once('lib/commentslib.php'); + $commentslib = new Comments($dbTiki); + $forums = $commentslib->get_outbound_emails(); + $smarty->assign_by_ref('forums', $forums); +} + + ask_ticket('admin-notif'); // disallow robots to index page: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |