Make attachment fit better in notice: drop text and link

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

diff --git a/scripts/userrole.php b/scripts/userrole.php
old mode 100644 (file)
new mode 100755 (executable)
index 7b6a9b3..428abb8
--- a/scripts/userrole.php
+++ b/scripts/userrole.php
@@ -18,7 +18,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:r:d';
 $longoptions = array('id=', 'nickname=', 'role=', 'delete');
@@ -27,6 +28,8 @@ $helptext = <<<END_OF_USERROLE_HELP
 userrole.php [options]
 modifies a role for the given user
 
+Available roles: owner moderator administrator sandboxed silenced deleted
+
   -d --delete   delete the role
   -i --id       ID of the user
   -n --nickname nickname of the user
@@ -38,18 +41,23 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 if (have_option('i', 'id')) {
     $id = get_option_value('i', 'id');
-    $user = User::staticGet('id', $id);
-    if (empty($user)) {
+    $profile = Profile::getKV('id', $id);
+    if (empty($profile)) {
         print "Can't find user with ID $id\n";
         exit(1);
     }
 } else if (have_option('n', 'nickname')) {
     $nickname = get_option_value('n', 'nickname');
-    $user = User::staticGet('nickname', $nickname);
+    $user = User::getKV('nickname', $nickname);
     if (empty($user)) {
         print "Can't find user with nickname '$nickname'\n";
         exit(1);
     }
+    $profile = $user->getProfile();
+    if (empty($profile)) {
+        print "User with ID $id has no profile\n";
+        exit(1);
+    }
 } else {
     print "You must provide either an ID or a nickname.\n";
     exit(1);
@@ -63,9 +71,9 @@ if (empty($role)) {
 }
 
 if (have_option('d', 'delete')) {
-    print "Revoking role '$role' from user '$user->nickname' ($user->id)...";
+    print "Revoking role '$role' from user '$profile->nickname' ($profile->id)...";
     try {
-        $user->revokeRole($role);
+        $profile->revokeRole($role);
         print "OK\n";
     } catch (Exception $e) {
         print "FAIL\n";
@@ -73,9 +81,9 @@ if (have_option('d', 'delete')) {
         print "\n";
     }
 } else {
-    print "Granting role '$role' to user '$user->nickname' ($user->id)...";
+    print "Granting role '$role' to user '$profile->nickname' ($profile->id)...";
     try {
-        $user->grantRole($role);
+        $profile->grantRole($role);
         print "OK\n";
     } catch (Exception $e) {
         print "FAIL\n";