Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / joingroup.php

diff --git a/scripts/joingroup.php b/scripts/joingroup.php
index 658244db9dc4e8d151ebdb6ed616a344f1b8ba4f..df9aad10edd234c36991d48509b31bacbe32fc11 100644 (file)
--- a/scripts/joingroup.php
+++ b/scripts/joingroup.php
@@ -23,7 +23,7 @@ $shortoptions = 'i:n:g:G:';
 $longoptions = array('id=', 'nickname=', 'group=', 'group-id=');
 
 $helptext = <<<END_OF_HELP
-addusertogroup.php [options]
+joingroup.php [options]
 
 Adds a local user to a local group.
 
@@ -34,22 +34,22 @@ Adds a local user to a local group.
 
 END_OF_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 try {
     $user = getUser();
     $lgroup = null;
     if (have_option('G', 'group-id')) {
         $gid = get_option_value('G', 'group-id');
-        $lgroup = Local_group::staticGet('group_id', $gid);
+        $lgroup = Local_group::getKV('group_id', $gid);
     } else if (have_option('g', 'group')) {
         $gnick = get_option_value('g', 'group');
-        $lgroup = Local_group::staticGet('nickname', $gnick);
+        $lgroup = Local_group::getKV('nickname', $gnick);
     }
-    if (empty($lgroup)) {
+    if (!$lgroup instanceof Local_group) {
         throw new Exception("No such local group: $gnick");
     }
-    $group = User_group::staticGet('id', $lgroup->group_id);
+    $group = User_group::getKV('id', $lgroup->group_id);
     $user->joinGroup($group);
     print "OK\n";
 } catch (Exception $e) {