Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	install/schema_mysql.sql
	mod/impel.php
	view/pt-br/messages.po
	view/pt-br/strings.php

boot.php

@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1141  );
+define ( 'DB_UPDATE_VERSION',       1142  );
 
 /**
  * @brief Constant with a HTML line break.

include/menu.php

@@ -24,6 +24,48 @@ function menu_fetch($name,$uid,$observer_xchan) {
 	return null;
 }
 	
+function menu_element($menu) {
+
+	$arr = array();
+	$arr['type'] = 'menu';
+	$arr['name'] = $menu['menu_name'];
+	$arr['desc'] = $menu['menu_desc'];
+	$arr['created'] = $menu['menu_created'];
+	$arr['edited'] = $menu['menu_edited'];
+
+	$arr['baseurl'] = z_root();
+	if($menu['menu_flags']) {
+		$arr['flags'] = array();
+		if($menu['menu_flags'] & MENU_BOOKMARK)
+			$arr['flags'][] = 'bookmark';
+		if($menu['menu_flags'] & MENU_SYSTEM)
+			$arr['flags'][] = 'system';
+	}
+	if($menu['items']) {
+		$arr['items'] = array();
+		foreach($menu['items'] as $it) {
+			$entry = array();
+			$entry['link'] = str_replace(z_root(),'[baseurl]',$it['mitem_link']);
+			$entry['desc'] = $it['mitem_desc'];
+			$entry['order'] = $it['mitem_order'];
+			if($it['mitem_flags']) {
+				$entry['flags'] = array();
+				if($it['mitem_flags'] & MENU_ITEM_ZID)
+					$entry['flags'][] = 'zid';
+				if($it['mitem_flags'] & MENU_ITEM_NEWWIN)
+					$entry['flags'][] = 'new-window';
+				if($it['mitem_flags'] & MENU_ITEM_CHATROOM)
+					$entry['flags'][] = 'chatroom';
+			}
+			$arr['items'][] = $entry;
+		}
+	}	
+
+	return $arr;
+}
+
+
+
 function menu_render($menu, $class='', $edit = false, $var = '') {
 
 	if(! $menu)
@@ -108,12 +150,14 @@ function menu_create($arr) {
 	if($r)
 		return false;
 
-	$r = q("insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id ) 
-		values( '%s', '%s', %d, %d )",
+	$r = q("insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id, menu_created, menu_edited ) 
+		values( '%s', '%s', %d, %d, '%s', '%s' )",
  		dbesc($menu_name),
 		dbesc($menu_desc),
 		intval($menu_flags),
-		intval($menu_channel_id)
+		intval($menu_channel_id),
+		dbesc(datetime_convert()),
+		dbesc(datetime_convert())
 	);
 	if(! $r)
 		return false;
@@ -198,11 +242,12 @@ function menu_edit($arr) {
 		return false;
 	}
 
-	return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d
+	return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d, menu_edited = '%s'
 		where menu_id = %d and menu_channel_id = %d", 
  		dbesc($menu_name),
 		dbesc($menu_desc),
 		intval($menu_flags),
+		dbesc(datetime_convert()),
 		intval($menu_id),
 		intval($menu_channel_id)
 	);
@@ -267,6 +312,13 @@ function menu_add_item($menu_id, $uid, $arr) {
 		intval($menu_id),
 		intval($mitem_order)
 	);
+
+	$x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
+		dbesc(datetime_convert()),
+		intval($menu_id),
+		intval($uid)
+	);
+
 	return $r;
 
 }
@@ -303,6 +355,13 @@ function menu_edit_item($menu_id, $uid, $arr) {
 		intval($menu_id),
 		intval($mitem_id)
 	);
+
+	$x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
+		dbesc(datetime_convert()),
+		intval($menu_id),
+		intval($uid)
+	);
+
 	return $r;
 }
 
@@ -315,6 +374,13 @@ function menu_del_item($menu_id,$uid,$item_id) {
 		intval($uid),
 		intval($item_id)
 	);
+
+	$x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d",
+		dbesc(datetime_convert()),
+		intval($menu_id),
+		intval($uid)
+	);
+
 	return $r;
 }
 

install/schema_mysql.sql

@@ -732,11 +732,15 @@ CREATE TABLE IF NOT EXISTS `menu` (
   `menu_name` char(255) NOT NULL DEFAULT '',
   `menu_desc` char(255) NOT NULL DEFAULT '',
   `menu_flags` int(11) NOT NULL DEFAULT '0',
+  `menu_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `menu_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`menu_id`),
   KEY `menu_channel_id` (`menu_channel_id`),
   KEY `menu_name` (`menu_name`),
-  KEY `menu_flags` (`menu_flags`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  KEY `menu_flags` (`menu_flags`),
+  KEY `menu_created` (`menu_created`),
+  KEY `menu_edited` (`menu_edited`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `menu_item` (
   `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT,

install/schema_postgres.sql

@@ -649,11 +649,15 @@ CREATE TABLE "menu" (
   "menu_name" text NOT NULL DEFAULT '',
   "menu_desc" text NOT NULL DEFAULT '',
   "menu_flags" bigint NOT NULL DEFAULT '0',
+  "menu_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  "menu_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("menu_id")
 );
 create index "menu_channel_id" on menu ("menu_channel_id");
 create index "menu_name" on menu ("menu_name");
 create index "menu_flags" on menu ("menu_flags");
+create index "menu_created" on menu ("menu_created");
+create index "menu_edited" on menu ("menu_edited");
 CREATE TABLE "menu_item" (
   "mitem_id" serial  NOT NULL,
   "mitem_link" text NOT NULL DEFAULT '',

install/update.php

@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1141 );
+define( 'UPDATE_VERSION' , 1142 );
 
 /**
  *
@@ -1624,3 +1624,25 @@ function update_r1140() {
 }
 
 
+function update_r1141() {
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { 
+		$r1 = q("ALTER TABLE menu ADD menu_created timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', ADD menu_edited timestamp NOT NULL DEFAULT '0001-01-01 00:00:00'");
+		$r2 = q("create index menu_created on menu ( menu_created ) ");
+		$r3 = q("create index menu_edited on menu ( menu_edited ) ");
+		$r = $r1 && $r2;
+	}
+	else
+		$r = q("ALTER TABLE menu ADD menu_created DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', ADD menu_edited DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', ADD INDEX ( menu_created ), ADD INDEX ( menu_edited ) ");
+
+	$t = datetime_convert();
+	q("update menu set menu_created = '%s', menu_edited = '%s' where true",
+		dbesc($t),
+		dbesc($t)
+	);
+
+
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}

mod/impel.php

@@ -113,6 +113,7 @@ function impel_init(&$a) {
 			dbesc($namespace),
 			intval(local_channel())
 		);
+
 		$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
 			dbesc($arr['mid']),
 			intval(local_channel())

mod/menu.php

@@ -78,6 +78,9 @@ function menu_content(&$a) {
 		$x = menu_list($uid);
 		if($x) {
 			for($y = 0; $y < count($x); $y ++) {
+				$m = menu_fetch($x[$y]['menu_name'],$uid,get_observer_hash());
+				if($m)
+					$x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($m))) . '[/element]';
 				$x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false);
 			}
 		}

version.inc

@@ -1 +1 @@
-2015-05-27.1045
+2015-05-28.1046