move mod_admin to Comanche finally

4 files changed, 63 insertions, 43 deletions

diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 94421bab0..90c5f78e5 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -45,7 +45,7 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from.[/li]

 [li](in progress Habeas Codice) Implement owned and exchangeable "things".[/li]

 [li]Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away).[/li]

-[li]Put mod_admin under Comanche[/li]

+

 

 In many cases some of the work has already been started and code exists so that you needn't start from scratch. Please contact one of the developer channels like Channel One (one@zothub.com) before embarking and we can tell you what we already have and provide some insights on how we envision these features fitting together.

 

diff --git a/include/widgets.php b/include/widgets.php
index 42d9db19a..8c5e92140 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1074,4 +1074,63 @@ function widget_helpindex($arr) {
 	$o .= '</ul></div>';
 	return $o;
 
+}
+
+
+
+function widget_admin($arr) {
+
+	/*
+	 * Side bar links
+	 */
+
+	if(! is_site_admin()) {
+		return login(false);
+	}
+
+
+	$a = get_app();
+	$o = '';
+
+	// array( url, name, extra css classes )
+
+	$aside = array(
+		'site'      => array(z_root() . '/admin/site/',     t('Site'),           'site'),
+		'users'     => array(z_root() . '/admin/users/',    t('Accounts'),       'users'),
+		'channels'  => array(z_root() . '/admin/channels/', t('Channels'),       'channels'),
+		'plugins'   => array(z_root() . '/admin/plugins/',  t('Plugins'),        'plugins'),
+		'themes'    => array(z_root() . '/admin/themes/',   t('Themes'),         'themes'),
+		'queue'     => array(z_root() . '/admin/queue',     t('Inspect queue'),  'queue'),
+		'profs'     => array(z_root() . '/admin/profs',     t('Profile Config'), 'profs'),
+		'dbsync'    => array(z_root() . '/admin/dbsync/',   t('DB updates'),     'dbsync')
+
+	);
+
+	/* get plugins admin page */
+
+	$r = q("SELECT * FROM addon WHERE plugin_admin = 1");
+
+	$aside['plugins_admin'] = array();
+	if($r) {
+		foreach ($r as $h){
+			$plugin = $h['name'];
+			$aside['plugins_admin'][] = 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');
+
+	$o .= replace_macros(get_markup_template('admin_aside.tpl'), array(
+			'$admin' => $aside, 
+			'$admtxt' => t('Admin'),
+			'$plugadmtxt' => t('Plugin Features'),
+			'$logtxt' => t('Logs'),
+			'$h_pending' => t('User registrations waiting for confirmation'),
+			'$admurl'=> z_root() . '/admin/'
+	));
+
+	return $o;
+
 }
\ No newline at end of file
diff --git a/mod/admin.php b/mod/admin.php
index 89207e4fa..2b7bb007d 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -84,48 +84,6 @@ function admin_content(&$a) {
 		return login(false);
 	}
 
-	/*
-	 * Side bar links
-	 */
-
-	// array( url, name, extra css classes )
-
-	$aside = array(
-		'site'      => array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"),
-		'users'     => array($a->get_baseurl(true)."/admin/users/", t("Accounts") , "users"),
-		'channels'  => array($a->get_baseurl(true)."/admin/channels/", t("Channels") , "channels"),
-		'plugins'   => array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
-		'themes'    => array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
-		'queue'     => array(z_root() . '/admin/queue', t('Inspect queue'), 'queue'),
-//		'hubloc'    => array($a->get_baseurl(true)."/admin/hubloc/", t("Server") , "server"),
-		'profs'     => array(z_root() . '/admin/profs', t('Profile Config'), 'profs'),
-		'dbsync'    => array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync")
-
-	);
-
-	/* get plugins admin page */
-
-	$r = q("SELECT * FROM addon WHERE plugin_admin = 1");
-	$aside['plugins_admin'] = array();
-	foreach ($r as $h){
-		$plugin = $h['name'];
-		$aside['plugins_admin'][] = array($a->get_baseurl(true) . '/admin/plugins/' . $plugin, $plugin, 'plugin');
-		// temp plugins with admin
-		$a->plugins_admin[] = $plugin;
-	}
-
-	$aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
-
-	$t = get_markup_template("admin_aside.tpl");
-	$a->page['aside'] .= replace_macros( $t, array(
-			'$admin' => $aside, 
-			'$admtxt' => t('Admin'),
-			'$plugadmtxt' => t('Plugin Features'),
-			'$logtxt' => t('Logs'),
-			'$h_pending' => t('User registrations waiting for confirmation'),
-			'$admurl'=> $a->get_baseurl(true)."/admin/"
-	));
-
 
 	/*
 	 * Page content
diff --git a/view/pdl/mod_admin.pdl b/view/pdl/mod_admin.pdl
new file mode 100644
index 000000000..5bd47ea37
--- /dev/null
+++ b/view/pdl/mod_admin.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=admin][/widget]
+[/region]
\ No newline at end of file