GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

move getUser() function to commandline.inc

Browse Source
This commit is contained in:
Evan Prodromou 2010-09-15 16:00:00 -04:00
parent b2abae433d
commit dffec9f223
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/commandline.inc
View File

@ -177,3 +177,27 @@ function get_option_value($opt, $alt=null)
return 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;
}

24
scripts/importtwitteratom.php
View File

@ -36,30 +36,6 @@ END_OF_IMPORTTWITTERATOM_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR.'/scripts/commandline.inc';
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; 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() function getAtomFeedDocument()
{ {
$filename = get_option_value('f', 'file'); $filename = get_option_value('f', 'file');