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

boot.php

@@ -47,7 +47,7 @@ require_once('include/account.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION',             '1.3.1' );
+define ( 'STD_VERSION',             '1.3.2' );
 define ( 'ZOT_REVISION',            1     );
 
 define ( 'DB_UPDATE_VERSION',       1165  );

include/widgets.php

@@ -1314,7 +1314,7 @@ function widget_admin($arr) {
 
 	$aside = array(
 		'site'      => array(z_root() . '/admin/site/',     t('Site'),           'site'),
-		'users'     => array(z_root() . '/admin/users/',    t('Accounts'),       'users'),
+		'users'     => array(z_root() . '/admin/users/',    t('Accounts'),       'users', 'pending-update', t('Member registrations waiting for confirmation')),
 		'channels'  => array(z_root() . '/admin/channels/', t('Channels'),       'channels'),
 		'security'  => array(z_root() . '/admin/security/', t('Security'),       'security'),
 		'features'  => array(z_root() . '/admin/features/', t('Features'),       'features'),
@@ -1330,24 +1330,29 @@ function widget_admin($arr) {
 
 	$r = q("SELECT * FROM addon WHERE plugin_admin = 1");
 
-	$aside['plugins_admin'] = array();
+	$plugins = array();
 	if($r) {
 		foreach ($r as $h){
 			$plugin = $h['name'];
-			$aside['plugins_admin'][] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin');
+			$plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin');
 			// temp plugins with admin
 			$a->plugins_admin[] = $plugin;
 		}
 	}
 
-	$aside['logs'] = array(z_root() . '/admin/logs/', t('Logs'), 'logs');
+	$logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs');
+
+	$arr = array('links' => $aside,'plugins' => $plugins,'logs' => $logs);
+	call_hooks('admin_aside',$arr);
 
 	$o .= replace_macros(get_markup_template('admin_aside.tpl'), array(
 			'$admin' => $aside, 
 			'$admtxt' => t('Admin'),
 			'$plugadmtxt' => t('Plugin Features'),
+			'$plugins' => $plugins,
 			'$logtxt' => t('Logs'),
-			'$h_pending' => t('User registrations waiting for confirmation'),
+			'$logs' => $logs,
+			'$h_pending' => t('Member registrations waiting for confirmation'),
 			'$admurl'=> z_root() . '/admin/'
 	));
 

include/zot.php

@@ -2278,6 +2278,12 @@ function check_location_move($sender_hash,$locations) {
 			dbesc($sender_hash)
 		);
 
+		// federation plugins may wish to notify connections 
+		// of the move on singleton networks
+
+		$arr = array('channel' => $r[0],'locations' => $locations);
+		call_hooks('location_move',$arr);
+
 	}		
 
 }

version.inc

@@ -1 +1 @@
-2016-03-17.1338H
+2016-03-19.1340H

view/tpl/admin_aside.tpl

@@ -5,7 +5,7 @@
 		$("nav").bind('nav-update',  function(e,data){
 			var elm = $('#pending-update');
 			var register = $(data).find('register').text();
-			if (register=="0") { reigster=""; elm.hide();} else { elm.show(); }
+			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
 			elm.html(register);
 		});
 	});
@@ -13,16 +13,9 @@
 <div class="widget">
 <h3>{{$admtxt}}</h3>
 <ul class="nav nav-pills nav-stacked">
-	<li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	{{foreach $admin as $link}}
-	<li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li>
+	<li><a href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li>
-	<li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li>
+	{{/foreach}}
-	<li><a href='{{$admin.security.0}}'>{{$admin.security.1}}</a></li>
-	<li><a href='{{$admin.queue.0}}'>{{$admin.queue.1}}</a></li>
-	<li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
-	<li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
-	<li><a href='{{$admin.features.0}}'>{{$admin.features.1}}</a></li>
-	<li><a href='{{$admin.profs.0}}'>{{$admin.profs.1}}</a></li>
-	<li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
 </ul>
 </div>
 
@@ -34,11 +27,11 @@
 {{/if}}
 
 
-{{if $admin.plugins_admin}}
+{{if $plugins}}
 <div class="widget">
 <h3>{{$plugadmtxt}}</h3>
 <ul class="nav nav-pills nav-stacked">
-	{{foreach $admin.plugins_admin as $l}}
+	{{foreach $plugins as $l}}
 	<li><a href='{{$l.0}}'>{{$l.1}}</a></li>
 	{{/foreach}}
 </ul>
@@ -48,6 +41,6 @@
 <div class="widget">	
 <h3>{{$logtxt}}</h3>
 <ul class="nav nav-pills nav-stacked">
-	<li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+	<li><a href='{{$logs.0}}'>{{$logs.1}}</a></li>
 </ul>
 </div>