Merge branch 'dev' into sabre32

5 files changed, 46 insertions, 558 deletions

diff --git a/include/api.php b/include/api.php
index f0d886d9b..be525f7e9 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1904,10 +1904,15 @@ require_once('include/api_auth.php');
 
 		$ret = array();
 
+		$x = array('items' => $r,'api_user' => api_user(),'user_info' => $user_info);
+		call_hooks('api_format_items',$x);
+		$r = $x['items'];
+
 		if(! $r)
 			return $ret;
 
 		foreach($r as $item) {
+
 			localize_item($item);
 
 			$status_user = (($item['author_xchan']==$user_info['guid'])?$user_info: api_item_get_user($a,$item));
diff --git a/include/config.php b/include/config.php
index fe7cbead6..209d22d42 100644
--- a/include/config.php
+++ b/include/config.php
@@ -33,617 +33,99 @@
 
 use Zotlabs\Lib as Zlib;
 
-
-
 function load_config($family) {
-
 	Zlib\Config::Load($family);
-
 }
 
 function get_config($family, $key) {
-
 	return Zlib\Config::Get($family,$key);
-
 }
 
 function set_config($family, $key, $value) {
-
 	return Zlib\Config::Set($family,$key,$value);
-
 }
 
 function del_config($family, $key) {
-
 	return Zlib\Config::Delete($family,$key);
-
 }
 
-
-
-
-
-/**
- * @brief Loads all configuration values of a channel into a cached storage.
- *
- * All configuration values of the given channel are stored in global cache
- * which is available under the global variable App::$config[$uid].
- *
- * @param string $uid
- *  The channel_id
- * @return void|false Nothing or false if $uid is false
- */
-
 function load_pconfig($uid) {
-
-	if($uid === false)
-		return false;
-
-	if(! array_key_exists($uid, App::$config))
-		App::$config[$uid] = array();
-
-	$r = q("SELECT * FROM pconfig WHERE uid = %d",
-		intval($uid)
-	);
-
-	if($r) {
-		foreach($r as $rr) {
-			$k = $rr['k'];
-			$c = $rr['cat'];
-			if(! array_key_exists($c, App::$config[$uid])) {
-				App::$config[$uid][$c] = array();
-				App::$config[$uid][$c]['config_loaded'] = true;
-			}
-			App::$config[$uid][$c][$k] = $rr['v'];
-		}
-	}
+	Zlib\PConfig::Load($uid);
 }
 
-/**
- * @brief Get a particular channel's config variable given the category name
- * ($family) and a key.
- *
- * Get a particular channel's config value from the given category ($family)
- * and the $key from a cached storage in App::$config[$uid].
- *
- * Returns false if not set.
- *
- * @param string $uid
- *  The channel_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to query
- * @param boolean $instore (deprecated, without function)
- * @return mixed Stored value or false if it does not exist
- */
 function get_pconfig($uid, $family, $key, $instore = false) {
-//	logger('include/config.php: get_pconfig() deprecated instore param used', LOGGER_DEBUG);
-
-	if($uid === false)
-		return false;
-
-	if(! array_key_exists($uid, App::$config))
-		load_pconfig($uid);
-
-	if((! array_key_exists($family, App::$config[$uid])) || (! array_key_exists($key, App::$config[$uid][$family])))
-		return false;
-
-	return ((! is_array(App::$config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', App::$config[$uid][$family][$key])) 
-		? unserialize(App::$config[$uid][$family][$key])
-		: App::$config[$uid][$family][$key]
-	);
+	return Zlib\PConfig::Get($uid,$family,$key,$instore = false);
 }
 
-/**
- * @brief Sets a configuration value for a channel.
- *
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the channel_id $uid.
- *
- * @note Please do not store booleans - convert to 0/1 integer values!
- *
- * @param string $uid
- *  The channel_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to set
- * @param string $value
- *  The value to store
- * @return mixed Stored $value or false
- */
 function set_pconfig($uid, $family, $key, $value) {
-
-	// this catches subtle errors where this function has been called 
-	// with local_channel() when not logged in (which returns false)
-	// and throws an error in array_key_exists below. 
-	// we provide a function backtrace in the logs so that we can find
-	// and fix the calling function.
-
-	if($uid === false) {
-		btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
-		return;
-	}
-
-	// manage array value
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	if(get_pconfig($uid, $family, $key) === false) {
-		if(! array_key_exists($uid, App::$config))
-			App::$config[$uid] = array();
-		if(! array_key_exists($family, App::$config[$uid]))
-			App::$config[$uid][$family] = array();
-
-		// keep a separate copy for all variables which were
-		// set in the life of this page. We need this to
-		// synchronise channel clones.
-
-		if(! array_key_exists('transient', App::$config[$uid]))
-			App::$config[$uid]['transient'] = array();
-		if(! array_key_exists($family, App::$config[$uid]['transient']))
-			App::$config[$uid]['transient'][$family] = array();
-
-		App::$config[$uid][$family][$key] = $value;
-		App::$config[$uid]['transient'][$family][$key] = $value;
-
-		$ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
-			intval($uid),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue)
-		);
-		if($ret)
-			return $value;
-
-		return $ret;
-	}
-
-	$ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
-		dbesc($dbvalue),
-		intval($uid),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	// keep a separate copy for all variables which were
-	// set in the life of this page. We need this to
-	// synchronise channel clones.
-
-	if(! array_key_exists('transient', App::$config[$uid]))
-		App::$config[$uid]['transient'] = array();
-	if(! array_key_exists($family, App::$config[$uid]['transient']))
-		App::$config[$uid]['transient'][$family] = array();
-
-	App::$config[$uid][$family][$key] = $value;
-	App::$config[$uid]['transient'][$family][$key] = $value;
-
-	if($ret)
-		return $value;
-
-	return $ret;
+	return Zlib\PConfig::Set($uid,$family,$key,$value);
 }
 
-/**
- * @brief Deletes the given key from the channel's configuration.
- *
- * Removes the configured value from the stored cache in App::$config[$uid]
- * and removes it from the database.
- *
- * @param string $uid
- *  The channel_id
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to delete
- * @return mixed
- */
 function del_pconfig($uid, $family, $key) {
-
-	$ret = false;
-
-	if (x(App::$config[$uid][$family], $key))
-		unset(App::$config[$uid][$family][$key]);
-		$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
-		intval($uid),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	return $ret;
+	return Zlib\PConfig::Delete($uid,$family,$key);
 }
 
-
-/**
- * @brief Loads a full xchan's configuration into a cached storage.
- *
- * All configuration values of the given observer hash are stored in global
- * cache which is available under the global variable App::$config[$xchan].
- *
- * @param string $xchan
- *  The observer's hash
- * @return void|false Returns false if xchan is not set
- */
 function load_xconfig($xchan) {
-
-	if(! $xchan)
-		return false;
-
-	if(! array_key_exists($xchan, App::$config))
-		App::$config[$xchan] = array();
-
-	$r = q("SELECT * FROM xconfig WHERE xchan = '%s'",
-		dbesc($xchan)
-	);
-
-	if($r) {
-		foreach($r as $rr) {
-			$k = $rr['k'];
-			$c = $rr['cat'];
-			if(! array_key_exists($c, App::$config[$xchan])) {
-				App::$config[$xchan][$c] = array();
-				App::$config[$xchan][$c]['config_loaded'] = true;
-			}
-			App::$config[$xchan][$c][$k] = $rr['v'];
-		}
-	}
+	Zlib\XConfig::Load($xchan);
 }
 
-/**
- * @brief Get a particular observer's config variable given the category
- * name ($family) and a key.
- *
- * Get a particular observer's config value from the given category ($family)
- * and the $key from a cached storage in App::$config[$xchan].
- *
- * Returns false if not set.
- *
- * @param string $xchan
- *  The observer's hash
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to query
- * @return mixed Stored $value or false if it does not exist
- */
 function get_xconfig($xchan, $family, $key) {
-
-	if(! $xchan)
-		return false;
-
-	if(! array_key_exists($xchan, App::$config))
-		load_xconfig($xchan);
-
-	if((! array_key_exists($family, App::$config[$xchan])) || (! array_key_exists($key, App::$config[$xchan][$family])))
-		return false;
-
-	return ((! is_array(App::$config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', App::$config[$xchan][$family][$key])) 
-		? unserialize(App::$config[$xchan][$family][$key])
-		: App::$config[$xchan][$family][$key]
-	);
+	return Zlib\XConfig::Get($xchan,$family,$key);
 }
 
-/**
- * @brief Sets a configuration value for an observer.
- *
- * Stores a config value ($value) in the category ($family) under the key ($key)
- * for the observer's $xchan hash.
- *
- * @note Please do not store booleans - convert to 0/1 integer values!
- *
- * @param string $xchan
- *  The observer's hash
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to set
- * @param string $value
- *  The value to store
- * @return mixed Stored $value or false
- */
 function set_xconfig($xchan, $family, $key, $value) {
-
-	// manage array value
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	if(get_xconfig($xchan, $family, $key) === false) {
-		if(! array_key_exists($xchan, App::$config))
-			App::$config[$xchan] = array();
-		if(! array_key_exists($family, App::$config[$xchan]))
-			App::$config[$xchan][$family] = array();
-
-		App::$config[$xchan][$family][$key] = $value;
-		$ret = q("INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' ) ",
-			dbesc($xchan),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue)
-		);
-		if($ret)
-			return $value;
-		return $ret;
-	}
-
-	$ret = q("UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s'",
-		dbesc($dbvalue),
-		dbesc($xchan),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	App::$config[$xchan][$family][$key] = $value;
-
-	if($ret)
-		return $value;
-	return $ret;
+	return Zlib\XConfig::Set($xchan,$family,$key,$value);
 }
 
-/**
- * @brief Deletes the given key from the observer's config.
- *
- * Removes the configured value from the stored cache in App::$config[$xchan]
- * and removes it from the database.
- *
- * @param string $xchan
- *  The observer's hash
- * @param string $family
- *  The category of the configuration value
- * @param string $key
- *  The configuration key to delete
- * @return mixed
- */
 function del_xconfig($xchan, $family, $key) {
-
-	$ret = false;
-
-	if(x(App::$config[$xchan][$family], $key))
-		unset(App::$config[$xchan][$family][$key]);
-	$ret = q("DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'",
-		dbesc($xchan),
-		dbesc($family),
-		dbesc($key)
-	);
-	return $ret;
+	return Zlib\XConfig::Delete($xchan,$family,$key);
 }
 
-
-// account configuration storage is built on top of the under-utilised xconfig
-
 function load_aconfig($account_id) {
-	load_xconfig('a_' . $account_id);
+	Zlib\AConfig::Load($account_id);
 }
 
 function get_aconfig($account_id, $family, $key) {
-	return get_xconfig('a_' . $account_id, $family, $key);
+	return Zlib\AConfig::Get($account_id, $family, $key);
 }
 
 function set_aconfig($account_id, $family, $key, $value) {
-	return set_xconfig('a_' . $account_id, $family, $key, $value);
+	return Zlib\AConfig::Set($account_id, $family, $key, $value);
 }
 
 function del_aconfig($account_id, $family, $key) {
-	return del_xconfig('a_' . $account_id, $family, $key);
+	return Zlib\AConfig::Delete($account_id, $family, $key);
 }
 
 
 function load_abconfig($chash,$xhash) {
-	$r = q("select * from abconfig where chan = '%s' and xchan = '%s'",
-		dbesc($chash),
-		dbesc($xhash)
-	);
-	return $r;
+	Zlib\AbConfig::Load($chash,$xhash);
 }
 
 function get_abconfig($chash,$xhash,$family,$key) {
-	$r = q("select * from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' limit 1",
-		dbesc($chash),
-		dbesc($xhash),
-		dbesc($family),
-		dbesc($key)		
-	);
-	if($r) {
-		return ((preg_match('|^a:[0-9]+:{.*}$|s', $r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
-	}
-	return false;
+	return Zlib\AbConfig::Get($chash,$xhash,$family,$key);
 }
 
-
 function set_abconfig($chash,$xhash,$family,$key,$value) {
-
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	if(get_abconfig($chash,$xhash,$family,$key) === false) {
-		$r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( '%s', '%s', '%s', '%s', '%s' ) ",
-			dbesc($chash),
-			dbesc($xhash),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue)		
-		);
-	}
-	else {
-		$r = q("update abconfig set v = '%s' where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
-			dbesc($dbvalue),		
-			dbesc($chash),
-			dbesc($xhash),
-			dbesc($family),
-			dbesc($key)
-		);
-	}
-	if($r)
-		return $value;
-	return false;
+	return Zlib\AbConfig::Set($chash,$xhash,$family,$key,$value);
 }
 
-
 function del_abconfig($chash,$xhash,$family,$key) {
-
-	$r = q("delete from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
-		dbesc($chash),
-		dbesc($xhash),
-		dbesc($family),
-		dbesc($key)
-	);
-
-	return $r;
+	return Zlib\AbConfig::Delete($chash,$xhash,$family,$key);
 }
 
-
-
-
-
+function load_iconfig(&$item) {
+	Zlib\IConfig::Load($item);
+}
 
 function get_iconfig(&$item, $family, $key) {
-
-	$is_item = false;
-	if(is_array($item)) {
-		$is_item = true;
-		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
-			$item['iconfig'] = array();
-
-		if(array_key_exists('item_id',$item))
-			$iid = $item['item_id'];
-		else
-			$iid = $item['id'];
-	}
-	elseif(intval($item))
-		$iid = $item;
-
-	if(! $iid)
-		return false;
-
-	if(is_array($item) && array_key_exists('iconfig',$item) && is_array($item['iconfig'])) {
-		foreach($item['iconfig'] as $c) {
-			if($c['iid'] == $iid && $c['cat'] == $family && $c['k'] == $key)
-				return $c['v'];
-		}
-	}
-		 
-	$r = q("select * from iconfig where iid = %d and cat = '%s' and k = '%s' limit 1",
-		intval($iid),
-		dbesc($family),
-		dbesc($key)
-	);
-	if($r) {
-		$r[0]['v'] = ((preg_match('|^a:[0-9]+:{.*}$|s',$r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
-		if($is_item)
-			$item['iconfig'][] = $r[0];
-		return $r[0]['v'];
-	}
-	return false;
-
+	return Zlib\IConfig::Get($item, $family, $key);
 }
 
-/**
- * set_iconfig(&$item, $family, $key, $value, $sharing = false);
- *
- * $item - item array or item id. If passed an array the iconfig meta information is
- *    added to the item structure (which will need to be saved with item_store eventually).
- *    If passed an id, the DB is updated, but may not be federated and/or cloned.
- * $family - namespace of meta variable
- * $key - key of meta variable
- * $value - value of meta variable
- * $sharing - boolean (default false); if true the meta information is propagated with the item
- *   to other sites/channels, mostly useful when $item is an array and has not yet been stored/delivered.
- *   If the meta information is added after delivery and you wish it to be shared, it may be necessary to 
- *   alter the item edited timestamp and invoke the delivery process on the updated item. The edited 
- *   timestamp needs to be altered in order to trigger an item_store_update() at the receiving end.
- */
- 
-
 function set_iconfig(&$item, $family, $key, $value, $sharing = false) {
-
-	$dbvalue = ((is_array($value))  ? serialize($value) : $value);
-	$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
-
-	$is_item = false;
-	$idx = null;
-
-	if(is_array($item)) {
-		$is_item = true;
-		if((! array_key_exists('iconfig',$item)) || (! is_array($item['iconfig'])))
-			$item['iconfig'] = array();
-		elseif($item['iconfig']) {
-			for($x = 0; $x < count($item['iconfig']); $x ++) {
-				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
-					$idx = $x;
-				}
-			}
-		}
-		$entry = array('cat' => $family, 'k' => $key, 'v' => $value, 'sharing' => $sharing);
-
-		if(is_null($idx))
-			$item['iconfig'][] = $entry;
-		else
-			$item['iconfig'][$idx] = $entry;
-		return $value;
-	}
-
-	if(intval($item))
-		$iid = intval($item);
-
-	if(! $iid)
-		return false;
-
-	if(get_iconfig($item, $family, $key) === false) {
-		$r = q("insert into iconfig( iid, cat, k, v, sharing ) values ( %d, '%s', '%s', '%s', %d ) ",
-			intval($iid),
-			dbesc($family),
-			dbesc($key),
-			dbesc($dbvalue),
-			intval($sharing)
-		);
-	}
-	else {
-		$r = q("update iconfig set v = '%s', sharing = %d where iid = %d and cat = '%s' and  k = '%s' ",
-			dbesc($dbvalue),
-			intval($sharing),
-			intval($iid),
-			dbesc($family),
-			dbesc($key)
-		);
-	}
-
-	if(! $r)
-		return false;
-
-	return $value;
+	return Zlib\IConfig::Set($item, $family, $key, $value, $sharing = false);
 }
 
-
-
 function del_iconfig(&$item, $family, $key) {
-
-
-	$is_item = false;
-	$idx = null;
-
-	if(is_array($item)) {
-		$is_item = true;
-		if(is_array($item['iconfig'])) {
-			for($x = 0; $x < count($item['iconfig']); $x ++) {
-				if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
-					unset($item['iconfig'][$x]);
-				}
-			}
-		}
-		return true;
-	}
-
-	if(intval($item))
-		$iid = intval($item);
-
-	if(! $iid)
-		return false;
-
-	return q("delete from iconfig where iid = %d and cat = '%s' and  k = '%s' ",
-		intval($iid),
-		dbesc($family),
-		dbesc($key)
-	);
-
+	return Zlib\IConfig::Delete($item, $family, $key);
 }
-
diff --git a/include/connections.php b/include/connections.php
index d18383fad..2d10b8354 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -590,7 +590,8 @@ function random_profile() {
 
 	for($i = 0; $i < $retryrandom; $i++) {
 
-		$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where hubloc_connected > %s - interval %s order by $randfunc limit 1",
+		$r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where xchan_addr not like '%s' and hubloc_connected > %s - interval %s order by $randfunc limit 1",
+			dbesc('sys@%'),
 			db_utcnow(), db_quoteinterval('30 day')
 		);
 
diff --git a/include/photos.php b/include/photos.php
index 1cc64f6fa..c64d662ea 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -443,7 +443,7 @@ function photo_upload($channel, $observer, $args) {
  *   * success (bool)
  *   * albums (array)
  */
-function photos_albums_list($channel, $observer) {
+function photos_albums_list($channel, $observer, $sort_key = 'album', $direction = 'asc') {
 
 	$channel_id     = $channel['channel_id'];
 	$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
@@ -451,11 +451,15 @@ function photos_albums_list($channel, $observer) {
 	if(! perm_is_allowed($channel_id, $observer_xchan, 'view_storage'))
 		return false;
 
-	/** @FIXME create a permissions SQL which works on arbitrary observers and channels, regardless of login or web status */
 
-	$sql_extra = permissions_sql($channel_id);
+	$sql_extra = permissions_sql($channel_id,$observer_xchan);
+
+	$sort_key = dbesc($sort_key);
+	$direction = dbesc($direction);
+
+
 
-	$albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and photo_usage IN ( %d, %d ) $sql_extra group by album order by max(created) desc",
+	$albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and photo_usage IN ( %d, %d ) $sql_extra group by album order by $sort_key $direction",
 		intval($channel_id),
 		intval(PHOTO_NORMAL),
 		intval(PHOTO_PROFILE)
@@ -483,20 +487,14 @@ function photos_albums_list($channel, $observer) {
 	return $ret;
 }
 
-function photos_album_widget($channelx,$observer,$albums = null) {
+function photos_album_widget($channelx,$observer,$sortkey = 'album',$direction = 'asc') {
 
 	$o = '';
 
-	// If we weren't passed an album list, see if the photos module
-	// dropped one for us to find in App::$data['albums']. 
-	// If all else fails, load it.
-
-	if(! $albums) {
-		if(array_key_exists('albums', App::$data))
-			$albums = App::$data['albums'];
-		else
-			$albums = photos_albums_list($channelx,$observer);
-	}
+	if(array_key_exists('albums', App::$data))
+		$albums = App::$data['albums'];
+	else
+		$albums = photos_albums_list($channelx,$observer,$sortkey,$direction);
 
 	if($albums['success']) {
 		$o = replace_macros(get_markup_template('photo_albums.tpl'),array(
diff --git a/include/widgets.php b/include/widgets.php
index 3448aeb5e..312b63729 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -799,8 +799,10 @@ function widget_photo_albums($arr) {
 	if((! $channelx) || (! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_storage')))
 		return '';
 	require_once('include/photos.php');
+	$sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album');
+	$direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc');	
 
-	return photos_album_widget($channelx, App::get_observer());
+	return photos_album_widget($channelx, App::get_observer(),$sortkey,$direction);
 }
 
 
@@ -1378,7 +1380,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', 'pending-update', t('Member registrations waiting for confirmation')),
+		'accounts'  => array(z_root() . '/admin/accounts/', t('Accounts'),       'accounts', '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'),