group creation

4 files changed, 86 insertions, 9 deletions

diff --git a/include/group.php b/include/group.php
index 598d09c2e..585b2eab9 100644
--- a/include/group.php
+++ b/include/group.php
@@ -2,13 +2,13 @@
 
 
 function group_add($uid,$name) {
-
+dbg(2);
 	$ret = false;
 	if(x($uid) && x($name)) {
 		$r = group_byname($uid,$name); // check for dups
 		if($r !== false) 
 			return true;
-		$r = q("INSERT INTO `group` ( `uid`', `name` )
+		$r = q("INSERT INTO `group` ( `uid`, `name` )
 			VALUES( %d, '%s' ) ",
 			intval($uid),
 			dbesc($name)
@@ -120,8 +120,9 @@ $o .= <<< EOT
 </div>
 
 <div id="sidebar-group-list">
-<ul id="sidebar-group-ul">
-<li class="sidebar-group-li"><a href="contacts">Everybody</a></li>
+	<ul id="sidebar-group-ul">
+	<li class="sidebar-group-li" ><a href="contacts">Everybody</a></li>
+
 EOT;
 
 	$r = q("SELECT * FROM `group` WHERE `uid` = %d",
@@ -129,9 +130,9 @@ EOT;
 	);
 	if(count($r)) {
 		foreach($r as $rr)
-			$o .= "<li class=\"sidebar-group-li\"><a href=\"group/{$rr['id']}\">{$rr['name']}</li>";
+			$o .= "	<li class=\"sidebar-group-li\"><a href=\"group/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
 	}
-	$o .= '</ul></div></div>';	
+	$o .= "	</ul>\r\n	</div>\r\n</div>";	
 
 	return $o;
 }
\ No newline at end of file
diff --git a/mod/group.php b/mod/group.php
new file mode 100644
index 000000000..16298e63e
--- /dev/null
+++ b/mod/group.php
@@ -0,0 +1,56 @@
+<?php
+
+
+
+function group_init(&$a) {
+	require_once('include/group.php');
+
+}
+
+
+
+function group_post(&$a) {
+
+	if(! local_user()) {
+		notice("Access denied." . EOL);
+		return;
+	}
+
+	if(($a->argc == 2) && ($a->argv[1] == 'new')) {
+		$name = notags(trim($_POST['groupname']));
+		$r = group_add($_SESSION['uid'],$name);
+		if($r) {
+			notice("Group created." . EOL );
+			$r = group_byname($_SESSION['uid'],$name);
+			if($r)
+				goaway($a->get_baseurl() . '/group/' . $r);
+		}
+		else
+			notice("Could not create group." . EOL );	
+//		goaway($a->get_baseurl() . '/group');
+		return; // NOTREACHED
+	}
+
+}
+
+function group_content(&$a) {
+
+	if(! local_user()) {
+		notice("Access denied." . EOL);
+		return;
+	}
+
+	if(($a->argc == 2) && ($a->argv[1] == 'new')) {
+		$tpl = file_get_contents('view/group_new.tpl');
+		$o .= replace_macros($tpl,array(
+
+		));
+
+
+
+
+	}
+		
+	return $o;
+
+}
\ No newline at end of file
diff --git a/view/group_new.tpl b/view/group_new.tpl
new file mode 100644
index 000000000..a1efa7717
--- /dev/null
+++ b/view/group_new.tpl
@@ -0,0 +1,23 @@
+
+
+
+<div id="group-new-wrapper" >
+<form action="group/new" method="post">
+
+<div id="group-new-text">
+<p>
+Create a group of contacts/friends.
+
+<div id="group-new-input-wrapper">
+<label id="group-new-label" for="group-new-name" >Group Name: </label>
+<input name="groupname" id="group-new-name" />
+</div>
+<div id="group-new-input-end" ></div>
+
+<div id="group-new-submit-wrapper" >
+<input type="submit" name="submit" value="Submit" />
+</form>
+</div>
+<div id="group-new-end"></div>
+
+ 
\ No newline at end of file
diff --git a/wip/todo b/wip/todo
index 7acb60dce..9da49b683 100644
--- a/wip/todo
+++ b/wip/todo
@@ -16,9 +16,6 @@ profile display restrict/check access
 
 publish to external directory
 
-anonymous nav links
-	directory
-
 groups
 
 permissions