keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #533 from fabrixxm/moveme

Browse source 
Fix issue 508
This commit is contained in:
friendica 2012-11-13 14:06:20 -08:00
commit 3dc4c52022
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/uimport.php
View file

@ -74,6 +74,18 @@ function import_account(&$a, $file) {
}
// check for username
$r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
if ($r===false) {
logger("uimport:check nickname : ERROR : ".last_error(), LOGGER_NORMAL);
notice(t('Error! Cannot check nickname'));
return;
}
if (count($r)>0) {
notice(sprintf(t("User '%s' already exists on this server!"),$account['user']['nickname']));
return;
}
$oldbaseurl = $account['baseurl'];
$newbaseurl = $a->get_baseurl();
$olduid = $account['user']['uid'];

23
mod/uimport.php
View file

@ -36,6 +36,29 @@ function uimport_post(&$a) {
}
function uimport_content(&$a) {
if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
notice("Permission denied." . EOL);
return;
}
$max_dailies = intval(get_config('system','max_daily_registrations'));
if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) {
logger('max daily registrations exceeded.');
notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
return;
}
}
if(x($_SESSION,'theme'))
unset($_SESSION['theme']);
if(x($_SESSION,'mobile-theme'))
unset($_SESSION['mobile-theme']);
$tpl = get_markup_template("uimport.tpl");
return replace_macros($tpl, array(
'$regbutt' => t('Import'),