Comanche: allow widgets to be class based and stored appropriately in Zotlabs

Zotlabs/Render/Comanche.php

@@ -410,6 +410,20 @@ class Comanche {
 			}
 		}
 
+		$clsname = ucfirst($name);
+		$nsname = "Zotlabs\\Widget\\" . $clsname;
+		if(file_exists('Zotlabs/SiteWidget/' . $clsname . '.php'))
+			require_once('Zotlabs/SiteWidget/' . $clsname . '.php');
+		elseif(file_exists('Zotlabs/Widget/' . $clsname . '.php'))
+			require_once('Zotlabs/Widget/' . $clsname . '.php');
+		if(class_exists($nsname)) {
+			$x = new $nsname;
+			$f = 'widget';
+			if(method_exists($x,$f)) {
+				return $x->$f($vars);
+			}
+		} 
+
 		$func = 'widget_' . trim($name);
 
 		if(! function_exists($func)) {

Zotlabs/Widget/Notes.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Notes {
+
+	function widget($arr) {
+		if(! local_channel())
+			return '';
+		if(! feature_enabled(local_channel(),'private_notes'))
+			return '';
+
+		$text = get_pconfig(local_channel(),'notes','text');
+
+		$o = replace_macros(get_markup_template('notes.tpl'), array(
+			'$banner' => t('Notes'),
+			'$text' => $text,
+			'$save' => t('Save'),
+		));
+
+		return $o;
+	}
+}

include/widgets.php

@@ -174,22 +174,6 @@ function widget_follow($args) {
 }
 
 
-function widget_notes($arr) {
-	if(! local_channel())
-		return '';
-	if(! feature_enabled(local_channel(),'private_notes'))
-		return '';
-
-	$text = get_pconfig(local_channel(),'notes','text');
-
-	$o = replace_macros(get_markup_template('notes.tpl'), array(
-		'$banner' => t('Notes'),
-		'$text' => $text,
-		'$save' => t('Save'),
-	));
-
-	return $o;
-}
 
 
 function widget_savedsearch($arr) {