From 2a4e8972e0edfa3156d9ce54d68ce0e54c0ec289 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 18 Apr 2016 20:38:38 -0700
Subject: module updates

---
 Zotlabs/Module/Notify.php | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 Zotlabs/Module/Notify.php

(limited to 'Zotlabs/Module/Notify.php')

diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php
new file mode 100644
index 000000000..227491145
--- /dev/null
+++ b/Zotlabs/Module/Notify.php
@@ -0,0 +1,69 @@
+<?php
+namespace Zotlabs\Module;
+
+
+
+class Notify extends \Zotlabs\Web\Controller {
+
+	function init() {
+		if(! local_channel())
+			return;
+	
+		if(argc() > 2 && argv(1) === 'view' && intval(argv(2))) {
+			$r = q("select * from notify where id = %d and uid = %d limit 1",
+				intval(argv(2)),
+				intval(local_channel())
+			);
+			if($r) {
+				q("update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d",
+					dbesc($r[0]['parent']),
+					dbesc($r[0]['otype']),
+					dbesc($r[0]['link']),
+					intval(local_channel())
+				);
+				goaway($r[0]['link']);
+			}
+			goaway(z_root());
+		}
+	
+	
+	}
+	
+	
+		function get() {
+		if(! local_channel())
+			return login();
+	
+		$notif_tpl = get_markup_template('notifications.tpl');
+			
+		$not_tpl = get_markup_template('notify.tpl');
+		require_once('include/bbcode.php');
+	
+		$r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
+			intval(local_channel())
+		);
+			
+		if($r) {
+			foreach ($r as $it) {
+				$notif_content .= replace_macros($not_tpl,array(
+					'$item_link' => z_root().'/notify/view/'. $it['id'],
+					'$item_image' => $it['photo'],
+					'$item_text' => strip_tags(bbcode($it['msg'])),
+					'$item_when' => relative_date($it['date'])
+				));
+			}
+		} 
+		else {
+			$notif_content .= t('No more system notifications.');
+		}
+			
+		$o .= replace_macros($notif_tpl,array(
+			'$notif_header' => t('System Notifications'),
+			'$tabs' => '', // $tabs,
+			'$notif_content' => $notif_content,
+		));
+	
+		return $o;
+	
+	}
+}
-- 
cgit v1.2.3


From a9d7acda279ebb7f2b3cd61a91a5e1d8b590dcf2 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 1 Jun 2016 21:48:54 -0700
Subject: the rest of the schema updates - WARNING: some third party plugins
 may fail; e.g. embedphotos and chess. $item['object'] is now $item['obj'] and
 $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale']
 and $photo['data'] is now $photo['content']. There are a number of other
 changes, but these are the ones noted to cause issues with third-party
 plugins. The project plugins have been updated. Please note any new issues as
 this effort touched a lot of code in a lot of files.

---
 Zotlabs/Module/Notify.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Zotlabs/Module/Notify.php')

diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php
index 227491145..f592f6f37 100644
--- a/Zotlabs/Module/Notify.php
+++ b/Zotlabs/Module/Notify.php
@@ -39,7 +39,7 @@ class Notify extends \Zotlabs\Web\Controller {
 		$not_tpl = get_markup_template('notify.tpl');
 		require_once('include/bbcode.php');
 	
-		$r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
+		$r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc",
 			intval(local_channel())
 		);
 			
@@ -49,7 +49,7 @@ class Notify extends \Zotlabs\Web\Controller {
 					'$item_link' => z_root().'/notify/view/'. $it['id'],
 					'$item_image' => $it['photo'],
 					'$item_text' => strip_tags(bbcode($it['msg'])),
-					'$item_when' => relative_date($it['date'])
+					'$item_when' => relative_date($it['created'])
 				));
 			}
 		} 
-- 
cgit v1.2.3