Make attachment fit better in notice: drop text and link

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

diff --git a/scripts/leavegroup.php b/scripts/leavegroup.php
index 653c3b5aad65bdd9e57bb358086059ab22b6b9e3..4bece427f4f971a0824a75aaa51d51e37a191302 100644 (file)
--- a/scripts/leavegroup.php
+++ b/scripts/leavegroup.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', dirname(__DIR__));
+define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 
 $shortoptions = 'i:n:g:G:';
 $longoptions = array('id=', 'nickname=', 'group=', 'group-id=');
@@ -41,15 +42,15 @@ try {
     $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->leaveGroup($group);
     print "OK\n";
 } catch (Exception $e) {