diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/auth.php | 13 | ||||
| -rw-r--r-- | include/queue.php | 22 | ||||
| -rw-r--r-- | include/queue_fn.php | 16 |
3 files changed, 35 insertions, 16 deletions
diff --git a/include/auth.php b/include/auth.php index fd80a63e2..d1eb9d131 100644 --- a/include/auth.php +++ b/include/auth.php @@ -63,6 +63,12 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p $_SESSION['theme'] = $a->user['theme']; $_SESSION['page_flags'] = $a->user['page-flags']; + $member_since = strtotime($a->user['register_date']); + if(time() < ($member_since + ( 60 * 60 * 24 * 14))) + $_SESSION['new_member'] = true; + else + $_SESSION['new_member'] = false; + if(strlen($a->user['timezone'])) { date_default_timezone_set($a->user['timezone']); $a->timezone = $a->user['timezone']; @@ -211,6 +217,13 @@ else { else info( t("Welcome back ") . $a->user['username'] . EOL); + + $member_since = strtotime($a->user['register_date']); + if(time() < ($member_since + ( 60 * 60 * 24 * 14))) + $_SESSION['new_member'] = true; + else + $_SESSION['new_member'] = false; + if(strlen($a->user['timezone'])) { date_default_timezone_set($a->user['timezone']); $a->timezone = $a->user['timezone']; diff --git a/include/queue.php b/include/queue.php index ff280cb53..cc36b2f62 100644 --- a/include/queue.php +++ b/include/queue.php @@ -1,20 +1,6 @@ <?php require_once("boot.php"); - -function update_queue_time($id) { - logger('queue: requeue item ' . $id); - q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($id) - ); -} - -function remove_queue_item($id) { - logger('queue: remove queue item ' . $id); - q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1", - intval($id) - ); -} +require_once('include/queue_fn.php'); function queue_run($argv, $argc){ global $a, $db; @@ -58,6 +44,10 @@ function queue_run($argv, $argc){ if(! count($r)){ return; } + + call_hooks('queue_predeliver', $a, $r); + + // delivery loop require_once('include/salmon.php'); @@ -69,6 +59,7 @@ function queue_run($argv, $argc){ if(! count($qi)) continue; + $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($qi[0]['cid']) ); @@ -121,7 +112,6 @@ function queue_run($argv, $argc){ } break; default: - $a = get_app(); $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false); call_hooks('queue_deliver', $a, $params); diff --git a/include/queue_fn.php b/include/queue_fn.php new file mode 100644 index 000000000..bc47ceffd --- /dev/null +++ b/include/queue_fn.php @@ -0,0 +1,16 @@ +<?php + +function update_queue_time($id) { + logger('queue: requeue item ' . $id); + q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($id) + ); +} + +function remove_queue_item($id) { + logger('queue: remove queue item ' . $id); + q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1", + intval($id) + ); +} |