\r
function last_insert_id() {\r
global $db;\r
+\r
if (IMPORT_DEBUG)\r
return 1;\r
- if ($db->mysqli) {\r
- $thedb = $db->getdb();\r
- return $thedb->insert_id;\r
- } else {\r
- return mysql_insert_id();\r
- }\r
+\r
+ return $db->insert_id();\r
}\r
\r
function last_error() {\r
q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);\r
}\r
\r
-function import_account(&$a, $file) {\r
+function import_account(App $a, $file) {\r
logger("Start user import from " . $file['tmp_name']);\r
/*\r
STEPS\r
notice(t('Error! Cannot check nickname'));\r
return;\r
}\r
- if (count($r) > 0) {\r
+ if (dbm::is_result($r) > 0) {\r
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));\r
return;\r
}\r
notice(t('Error! Cannot check nickname'));\r
return;\r
}\r
- if (count($r) > 0) {\r
+ if (dbm::is_result($r) > 0) {\r
notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));\r
return;\r
}\r
\r
$oldbaseurl = $account['baseurl'];\r
- $newbaseurl = $a->get_baseurl();\r
+ $newbaseurl = App::get_baseurl();\r
$olduid = $account['user']['uid'];\r
\r
unset($account['user']['uid']);\r
}\r
}\r
if ($contact['uid'] == $olduid && $contact['self'] == '0') {\r
- // set contacts 'avatar-date' to "0000-00-00 00:00:00" to let poller to update urls\r
- $contact["avatar-date"] = "0000-00-00 00:00:00" ;\r
+ // set contacts 'avatar-date' to NULL_DATE to let poller to update urls\r
+ $contact["avatar-date"] = NULL_DATE;\r
\r
\r
switch ($contact['network']) {\r
// send relocate message (below)\r
break;\r
case NETWORK_ZOT:\r
- // TODO handle zot network\r
+ /// @TODO handle zot network\r
break;\r
case NETWORK_MAIL2:\r
- // TODO ?\r
+ /// @TODO ?\r
break;\r
case NETWORK_FEED:\r
case NETWORK_MAIL:\r
}\r
\r
// send relocate messages\r
- proc_run('php', 'include/notifier.php', 'relocate', $newuid);\r
+ proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);\r
\r
info(t("Done. You can now login with your username and password"));\r
- goaway($a->get_baseurl() . "/login");\r
+ goaway(App::get_baseurl() . "/login");\r
}\r