modified: view/theme/smoothly/style.css

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index e3c7d33d4a97bd32dcba1027e6bda1002e58c16f..854ac06a9ad53165f51bae8eb6a918b232811f53 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -97,8 +97,9 @@ function group_rmv_member($uid,$name,$member) {
 }
 
 
-function group_add_member($uid,$name,$member) {
-       $gid = group_byname($uid,$name);
+function group_add_member($uid,$name,$member,$gid = 0) {
+       if(! $gid)
+               $gid = group_byname($uid,$name);
        if((! $gid) || (! $uid) || (! $member))
                return false;
 
@@ -109,7 +110,7 @@ function group_add_member($uid,$name,$member) {
        );
        if(count($r))
                return true;    // You might question this, but 
-                               // we indicate success because the group was in fact created
+                               // we indicate success because the group member was in fact created
                                // -- It was just created at another time
        if(! count($r))
                $r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
@@ -154,6 +155,32 @@ function group_public_members($gid) {
 }
 
 
+function mini_group_select($uid,$gid = 0) {
+       
+       $grps = array();
+       $o = '';
+
+       $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
+               intval($uid)
+       );
+       $grps[] = array('name' => '', 'id' => '0', 'selected' => '');
+       if(count($r)) {
+               foreach($r as $rr) {
+                       $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
+               }
+
+       }
+       logger('groups: ' . print_r($grps,true));
+
+       $o = replace_macros(get_markup_template('group_selection.tpl'), array(
+               '$label' => t('Default privacy group for new contacts'),
+               '$groups' => $grps 
+       ));
+       return $o;
+}
+
+
+
 
 function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
 
@@ -162,23 +189,21 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
        if(! local_user())
                return '';
 
-       $createtext = t('Create a new group');
-       $linktext= t('Everybody');
-       $selected = (($group_id == 0) ? ' group-selected' : '');
-$o .= <<< EOT
-
-<div id="group-sidebar" class="widget">
-<h3>Groups</h3>
+       $groups = array();
+       
+       $groups[] = array(
+               'text'  => t('Everybody'),
+               'id' => 0,
+               'selected' => (($group_id == 0) ? 'group-selected' : ''),
+               'href'  => $every,
+       );
 
-<div id="sidebar-group-list">
-       <ul id="sidebar-group-ul">
-       <li class="sidebar-group-li" ><a href="$every" class="sidebar-group-element$selected" >$linktext</a></li>
 
-EOT;
 
        $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
                intval($_SESSION['uid'])
        );
+       $member_of = array();
        if($cid) {
                $member_of = groups_containing(local_user(),$cid);
        } 
@@ -186,25 +211,40 @@ EOT;
        if(count($r)) {
                foreach($r as $rr) {
                        $selected = (($group_id == $rr['id']) ? ' group-selected' : '');
-                       $o .= ' <li class="sidebar-group-li">' 
-                       . (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') 
-                               . "\" class=\"groupsideedit\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") 
-                       . (($cid) ? '<input type="checkbox" class="' . (($selected) ? 'ticked' : 'unticked') . '" onclick="contactgroupChangeMember(' . $rr['id'] . ',' . $cid . ');return true;" '
-                               . ((in_array($rr['id'],$member_of)) ? ' checked="checked" ' : '') . '/>' : '')
-                       . "<a href=\"$each/{$rr['id']}\" class=\"sidebar-group-element" . $selected ."\"  >{$rr['name']}</a></li>\r\n";
+                       
+                       if ($edit) {
+                               $groupedit = array(
+                                       'href' => "group/".$rr['id'],
+                                       'title' => t('edit'),
+                               );
+                       } else {
+                               $groupedit = null;
+                       }
+                       
+                       $groups[] = array(
+                               'id'            => $rr['id'],
+                               'cid'           => $cid,
+                               'text'          => $rr['name'],
+                               'selected'      => $selected,
+                               'href'          => $each."/".$rr['id'],
+                               'edit'          => $groupedit,
+                               'ismember'      => in_array($rr['id'],$member_of),
+                       );
                }
        }
-       $o .= " </ul>\r\n       </div>";
-
-       $o .= <<< EOT
-
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
        
-EOT;
-
+       
+       $tpl = get_markup_template("group_side.tpl");
+       $o = replace_macros($tpl, array(
+               '$title'                => t('Groups'),
+               '$edittext'     => t('Edit group'),
+               '$createtext'   => t('Create a new group'),
+               '$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
+               '$groups'               => $groups,
+               '$add'                  => t('add'),
+       ));
+               
+       
        return $o;
 }
 
@@ -246,4 +286,4 @@ function groups_containing($uid,$c) {
        }
 
        return $ret;
-}
\ No newline at end of file
+}