From dffec9f223c1e45832d274c34f7bd6624cbf87ea Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 15 Sep 2010 16:00:00 -0400
Subject: [PATCH] move getUser() function to commandline.inc

---
 scripts/commandline.inc       | 24 ++++++++++++++++++++++++
 scripts/importtwitteratom.php | 24 ------------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index a475e11d01..a29f588448 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -177,3 +177,27 @@ function get_option_value($opt, $alt=null)
 
     return null;
 }
+
+function getUser()
+{
+    $user = null;
+
+    if (have_option('i', 'id')) {
+        $id = get_option_value('i', 'id');
+        $user = User::staticGet('id', $id);
+        if (empty($user)) {
+            throw new Exception("Can't find user with id '$id'.");
+        }
+    } else if (have_option('n', 'nickname')) {
+        $nickname = get_option_value('n', 'nickname');
+        $user = User::staticGet('nickname', $nickname);
+        if (empty($user)) {
+            throw new Exception("Can't find user with nickname '$nickname'");
+        }
+    } else {
+        show_help();
+        exit(1);
+    }
+
+    return $user;
+}
diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php
index c12e3b91a8..261dfb1d02 100644
--- a/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php
@@ -36,30 +36,6 @@ END_OF_IMPORTTWITTERATOM_HELP;
 require_once INSTALLDIR.'/scripts/commandline.inc';
 require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
 
-function getUser()
-{
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $user = User::staticGet('id', $id);
-        if (empty($user)) {
-            throw new Exception("Can't find user with id '$id'.");
-        }
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $user = User::staticGet('nickname', $nickname);
-        if (empty($user)) {
-            throw new Exception("Can't find user with nickname '$nickname'");
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-
-    return $user;
-}
-
 function getAtomFeedDocument()
 {
     $filename = get_option_value('f', 'file');