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

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

diff --git a/scripts/useremail.php b/scripts/useremail.php
index 0a59d36f83fbcad75d1bb0f9ed22042a65c2c6ac..91a9d3152bb7b72eb9abec81f43d730062b96a1b 100755 (executable)
--- a/scripts/useremail.php
+++ b/scripts/useremail.php
@@ -33,18 +33,18 @@ Queries a user's registered email address, or queries the users with a given reg
 
 END_OF_USEREMAIL_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 if (have_option('i', 'id')) {
     $id = get_option_value('i', 'id');
-    $user = User::staticGet('id', $id);
+    $user = User::getKV('id', $id);
     if (empty($user)) {
         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);
@@ -53,7 +53,7 @@ if (have_option('i', 'id')) {
 
 if (!empty($user)) {
     if (empty($user->email)) {
-        # Check for unconfirmed emails
+        // Check for unconfirmed emails
         $unconfirmed_email = new Confirm_address();
         $unconfirmed_email->user_id = $user->id;
         $unconfirmed_email->address_type = 'email';
@@ -75,7 +75,7 @@ if (have_option('e', 'email')) {
     $user->email = get_option_value('e', 'email');
     $user->find(false);
     if (!$user->fetch()) {
-        # Check unconfirmed emails
+        // Check unconfirmed emails
         $unconfirmed_email = new Confirm_address();
         $unconfirmed_email->address = $user->email;
         $unconfirmed_email->address_type = 'email';
@@ -84,7 +84,7 @@ if (have_option('e', 'email')) {
         if (empty($unconfirmed_email->user_id)) {
             print "No users with email $user->email\n";
         } else {
-            $user=User::staticGet('id', $unconfirmed_email->user_id);
+            $user=User::getKV('id', $unconfirmed_email->user_id);
             print "Unconfirmed Address: $user->id $user->nickname\n";
         }
         exit(0);