- module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
-
-
-
-
-
-
- HTTP error code
+ "; var_dump($a->user); killme();
if (is_null($nickname)) {
@@ -770,7 +779,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label'=>t('Status'),
'url' => $url,
- 'sel' => ((!isset($tab) && $a->argv[0]=='profile')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='profile') ? 'active' : ''),
'title' => t('Status Messages and Posts'),
'id' => 'status-tab',
'accesskey' => 'm',
@@ -778,7 +787,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label' => t('Profile'),
'url' => $url.'/?tab=profile',
- 'sel' => ((isset($tab) && $tab=='profile')?'active':''),
+ 'sel' => ((isset($tab) && $tab=='profile') ? 'active' : ''),
'title' => t('Profile Details'),
'id' => 'profile-tab',
'accesskey' => 'r',
@@ -786,7 +795,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label' => t('Photos'),
'url' => App::get_baseurl() . '/photos/' . $nickname,
- 'sel' => ((!isset($tab) && $a->argv[0]=='photos')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='photos') ? 'active' : ''),
'title' => t('Photo Albums'),
'id' => 'photo-tab',
'accesskey' => 'h',
@@ -794,7 +803,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
array(
'label' => t('Videos'),
'url' => App::get_baseurl() . '/videos/' . $nickname,
- 'sel' => ((!isset($tab) && $a->argv[0]=='videos')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='videos') ? 'active' : ''),
'title' => t('Videos'),
'id' => 'video-tab',
'accesskey' => 'v',
@@ -806,7 +815,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array(
'label' => t('Events'),
'url' => App::get_baseurl() . '/events',
- 'sel' =>((!isset($tab) && $a->argv[0]=='events')?'active':''),
+ 'sel' =>((!isset($tab) && $a->argv[0]=='events') ? 'active' : ''),
'title' => t('Events and Calendar'),
'id' => 'events-tab',
'accesskey' => 'e',
@@ -817,18 +826,18 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array(
'label' => t('Events'),
'url' => App::get_baseurl() . '/cal/' . $nickname,
- 'sel' =>((!isset($tab) && $a->argv[0]=='cal')?'active':''),
+ 'sel' =>((!isset($tab) && $a->argv[0]=='cal') ? 'active' : ''),
'title' => t('Events and Calendar'),
'id' => 'events-tab',
'accesskey' => 'e',
);
}
- if ($is_owner){
+ if ($is_owner) {
$tabs[] = array(
'label' => t('Personal Notes'),
'url' => App::get_baseurl() . '/notes',
- 'sel' =>((!isset($tab) && $a->argv[0]=='notes')?'active':''),
+ 'sel' =>((!isset($tab) && $a->argv[0]=='notes') ? 'active' : ''),
'title' => t('Only You Can See This'),
'id' => 'notes-tab',
'accesskey' => 't',
@@ -839,7 +848,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tabs[] = array(
'label' => t('Contacts'),
'url' => App::get_baseurl() . '/viewcontacts/' . $nickname,
- 'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts')?'active':''),
+ 'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts') ? 'active' : ''),
'title' => t('Contacts'),
'id' => 'viewcontacts-tab',
'accesskey' => 'k',
@@ -855,8 +864,9 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
}
function get_my_url() {
- if (x($_SESSION,'my_url'))
+ if (x($_SESSION, 'my_url')) {
return $_SESSION['my_url'];
+ }
return false;
}
@@ -868,33 +878,31 @@ function zrl_init(App $a) {
// The check fetches the cached value from gprobe to reduce the load for this system
$urlparts = parse_url($tmp_str);
- $result = Cache::get("gprobe:".$urlparts["host"]);
- if (!is_null($result)) {
- if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
- logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
- return;
- }
+ $result = Cache::get("gprobe:" . $urlparts["host"]);
+ if ((!is_null($result)) && (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
+ logger("DDoS attempt detected for " . $urlparts["host"] . " by " . $_SERVER["REMOTE_ADDR"] . ". server data: " . print_r($_SERVER, true), LOGGER_DEBUG);
+ return;
}
- proc_run(PRIORITY_LOW, 'include/gprobe.php',bin2hex($tmp_str));
+ proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($tmp_str));
$arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
- call_hooks('zrl_init',$arr);
+ call_hooks('zrl_init', $arr);
}
}
-function zrl($s,$force = false) {
+function zrl($s, $force = false) {
if (! strlen($s)) {
return $s;
}
- if ((! strpos($s,'/profile/')) && (! $force)) {
+ if ((! strpos($s, '/profile/')) && (! $force)) {
return $s;
}
- if ($force && substr($s,-1,1) !== '/') {
+ if ($force && substr($s, -1, 1) !== '/') {
$s = $s . '/';
}
- $achar = strpos($s,'?') ? '&' : '?';
+ $achar = strpos($s, '?') ? '&' : '?';
$mine = get_my_url();
- if ($mine and ! link_compare($mine,$s)) {
+ if ($mine && ! link_compare($mine, $s)) {
return $s . $achar . 'zrl=' . urlencode($mine);
}
return $s;
@@ -916,10 +924,8 @@ function zrl($s,$force = false) {
*/
function get_theme_uid() {
$uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
- if (local_user()) {
- if ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid)) {
- return local_user();
- }
+ if ((local_user()) && ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))) {
+ return local_user();
}
return $uid;
diff --git a/include/lock.php b/include/lock.php
index a48b0ad342..64f6319ef1 100644
--- a/include/lock.php
+++ b/include/lock.php
@@ -2,9 +2,9 @@
// Provide some ability to lock a PHP function so that multiple processes
// can't run the function concurrently
-if(! function_exists('lock_function')) {
+if (! function_exists('lock_function')) {
function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
- if( $wait_sec == 0 )
+ if ( $wait_sec == 0 )
$wait_sec = 2; // don't let the user pick a value that's likely to crash the system
$got_lock = false;
@@ -16,7 +16,7 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
dbesc($fn_name)
);
- if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
+ if ((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'",
dbesc(datetime_convert()),
dbesc($fn_name)
@@ -34,10 +34,10 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
q("UNLOCK TABLES");
- if(($block) && (! $got_lock))
+ if (($block) && (! $got_lock))
sleep($wait_sec);
- } while(($block) && (! $got_lock) && ((time() - $start) < $timeout));
+ } while (($block) && (! $got_lock) && ((time() - $start) < $timeout));
logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG);
@@ -45,28 +45,29 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
}}
-if(! function_exists('block_on_function_lock')) {
+if (! function_exists('block_on_function_lock')) {
function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
- if( $wait_sec == 0 )
+ if ( $wait_sec == 0 )
$wait_sec = 2; // don't let the user pick a value that's likely to crash the system
$start = time();
do {
$r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
- dbesc($fn_name)
- );
+ dbesc($fn_name)
+ );
- if (dbm::is_result($r) && $r[0]['locked'])
+ if (dbm::is_result($r) && $r[0]['locked']) {
sleep($wait_sec);
+ }
- } while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
+ } while (dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
return;
}}
-if(! function_exists('unlock_function')) {
+if (! function_exists('unlock_function')) {
function unlock_function($fn_name) {
$r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'",
dbesc(NULL_DATE),
diff --git a/include/message.php b/include/message.php
index 66e173d350..7a62af8c93 100644
--- a/include/message.php
+++ b/include/message.php
@@ -8,9 +8,9 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$a = get_app();
- if(! $recipient) return -1;
+ if (! $recipient) return -1;
- if(! strlen($subject))
+ if (! strlen($subject))
$subject = t('[no subject]');
$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
@@ -21,7 +21,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
intval(local_user())
);
- if(! (count($me) && (count($contact)))) {
+ if (! (count($me) && (count($contact)))) {
return -2;
}
@@ -33,7 +33,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
// look for any existing conversation structure
- if(strlen($replyto)) {
+ if (strlen($replyto)) {
$reply = true;
$r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1",
intval(local_user()),
@@ -44,7 +44,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$convid = $r[0]['convid'];
}
- if(! $convid) {
+ if (! $convid) {
// create a new conversation
@@ -77,12 +77,12 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$convid = $r[0]['id'];
}
- if(! $convid) {
+ if (! $convid) {
logger('send message: conversation not found.');
return -4;
}
- if(! strlen($replyto)) {
+ if (! strlen($replyto)) {
$replyto = $convuri;
}
diff --git a/include/msgclean.php b/include/msgclean.php
index 50eb46368f..9e8ebed790 100644
--- a/include/msgclean.php
+++ b/include/msgclean.php
@@ -154,7 +154,7 @@ function removelinebreak($message)
$lines = array();
$lineno = 0;
- foreach($arrbody as $i => $line) {
+ foreach ($arrbody as $i => $line) {
$currquotelevel = 0;
$currline = $line;
while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')
diff --git a/include/nav.php b/include/nav.php
index 602bcd83ba..3c7c932e28 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -10,7 +10,7 @@ function nav(App $a) {
*
*/
- if(!(x($a->page,'nav')))
+ if (!(x($a->page,'nav')))
$a->page['nav'] = '';
$a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array());
@@ -138,7 +138,7 @@ function nav_info(App $a)
if (strlen(get_config('system', 'singleuser'))) {
$gdir = get_config('system', 'directory');
- if(strlen($gdir)) {
+ if (strlen($gdir)) {
$gdirpath = zrl($gdir, true);
}
} elseif (get_config('system', 'community_page_style') == CP_USERS_ON_SERVER) {
diff --git a/include/network.php b/include/network.php
index eacde00b26..7d8cf36118 100644
--- a/include/network.php
+++ b/include/network.php
@@ -172,7 +172,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
// allow for HTTP/2.x without fixing code
while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/', $base)) {
- $chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4);
+ $chunk = substr($base, 0, strpos($base,"\r\n\r\n") + 4);
$header .= $chunk;
$base = substr($base, strlen($chunk));
}
@@ -196,9 +196,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) {
$newurl = trim(array_pop($matches));
}
-
- if (strpos($newurl, '/') === 0) {
- $newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+ if (strpos($newurl,'/') === 0) {
+ $newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
}
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@@ -342,7 +341,7 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
$newurl = trim(array_pop($matches));
if (strpos($newurl, '/') === 0) {
- $newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+ $newurl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $newurl;
}
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@@ -375,7 +374,7 @@ function xml_status($st, $message = '') {
$xml_message = ((strlen($message)) ? "\t" . xmlify($message) . " \r\n" : '');
- if($st)
+ if ($st)
logger('xml_status returning non_zero: ' . $st . " message=" . $message);
header( "Content-type: text/xml" );
@@ -403,12 +402,12 @@ function xml_status($st, $message = '') {
*/
function http_status_exit($val, $description = array()) {
$err = '';
- if($val >= 400) {
+ if ($val >= 400) {
$err = 'Error';
if (!isset($description["title"]))
$description["title"] = $err." ".$val;
}
- if($val >= 200 && $val < 300)
+ if ($val >= 200 && $val < 300)
$err = 'OK';
logger('http_status_exit ' . $val);
@@ -434,20 +433,20 @@ function http_status_exit($val, $description = array()) {
* @return boolean True if it's a valid URL, fals if something wrong with it
*/
function validate_url(&$url) {
- if(get_config('system','disable_url_validation'))
+ if (get_config('system','disable_url_validation'))
return true;
// no naked subdomains (allow localhost for tests)
- if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
+ if (strpos($url,'.') === false && strpos($url,'/localhost/') === false)
return false;
- if(substr($url,0,4) != 'http')
+ if (substr($url,0,4) != 'http')
$url = 'http://' . $url;
/// @TODO Really supress function outcomes? Why not find them + debug them?
$h = @parse_url($url);
- if((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+ if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return true;
}
@@ -462,14 +461,14 @@ function validate_url(&$url) {
*/
function validate_email($addr) {
- if(get_config('system','disable_email_validation'))
+ if (get_config('system','disable_email_validation'))
return true;
- if(! strpos($addr,'@'))
+ if (! strpos($addr,'@'))
return false;
$h = substr($addr,strpos($addr,'@') + 1);
- if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
+ if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
return true;
}
return false;
@@ -502,7 +501,6 @@ function allowed_url($url) {
$host = strtolower($h['host']);
// always allow our own site
-
if ($host == strtolower($_SERVER['SERVER_NAME'])) {
return true;
}
@@ -563,24 +561,25 @@ function blocked_url($url) {
*/
function allowed_email($email) {
-
$domain = strtolower(substr($email,strpos($email,'@') + 1));
- if(! $domain)
+ if (! $domain) {
return false;
+ }
$str_allowed = get_config('system','allowed_email');
- if(! $str_allowed)
+ if (! $str_allowed) {
return true;
+ }
$found = false;
$fnmatch = function_exists('fnmatch');
$allowed = explode(',',$str_allowed);
- if(count($allowed)) {
- foreach($allowed as $a) {
+ if (count($allowed)) {
+ foreach ($allowed as $a) {
$pat = strtolower(trim($a));
- if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
+ if (($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
$found = true;
break;
}
@@ -609,8 +608,8 @@ function avatar_img($email) {
function parse_xml_string($s,$strict = true) {
/// @todo Move this function to the xml class
- if($strict) {
- if(! strstr($s,'user = $record;
- if(strlen($a->user['timezone'])) {
+ if (strlen($a->user['timezone'])) {
date_default_timezone_set($a->user['timezone']);
$a->timezone = $a->user['timezone'];
}
diff --git a/include/oembed.php b/include/oembed.php
index 80b49fbf04..d28a97e322 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -304,9 +304,11 @@ function oembed_html2bbcode($text) {
$entries = $xpath->query("//span[$xattr]");
$xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed");
- foreach($entries as $e) {
+ foreach ($entries as $e) {
$href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
- if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
+ if (!is_null($href)) {
+ $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
+ }
}
return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
} else {
diff --git a/include/onepoll.php b/include/onepoll.php
index 3483d24930..cf5a1f576a 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -170,7 +170,7 @@ function onepoll_run(&$argv, &$argc){
// But this may be our first communication, so set the writable flag if it isn't set already.
if (! intval($contact['writable'])) {
- q("update contact set writable = 1 where id = %d", intval($contact['id']));
+ q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d", intval($contact['id']));
}
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
@@ -437,16 +437,18 @@ function onepoll_run(&$argv, &$argc){
if ($raw_refs) {
$refs_arr = explode(' ', $raw_refs);
if (count($refs_arr)) {
- for($x = 0; $x < count($refs_arr); $x ++)
+ for ($x = 0; $x < count($refs_arr); $x ++) {
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
+ }
}
$qstr = implode(',',$refs_arr);
$r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
intval($importer_uid)
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
- // $datarray['parent-uri'] = $r[0]['uri'];
+ //$datarray['parent-uri'] = $r[0]['uri'];
+ }
}
// Decoding the header
@@ -611,14 +613,17 @@ function onepoll_run(&$argv, &$argc){
consume_feed($xml,$importer,$contact,$hub,1,2);
$hubmode = 'subscribe';
- if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
+ if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) {
$hubmode = 'unsubscribe';
+ }
- if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify']))
+ if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) {
$hub_update = true;
+ }
- if ($force)
+ if ($force) {
$hub_update = true;
+ }
logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
diff --git a/include/ostatus.php b/include/ostatus.php
index 1e23e7bc32..a1da94f6a7 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -70,6 +70,7 @@ class ostatus {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` IN ('%s', '%s') AND `network` != '%s'",
intval($importer["uid"]), dbesc(normalise_link($author["author-link"])),
dbesc(normalise_link($aliaslink)), dbesc(NETWORK_STATUSNET));
+
if (dbm::is_result($r)) {
$contact = $r[0];
$author["contact-id"] = $r[0]["id"];
@@ -79,6 +80,7 @@ class ostatus {
// Should not happen
$contact = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `addr` = ? AND `network` != ?",
$importer["uid"], $addr, NETWORK_STATUSNET);
+
if (dbm::is_result($contact)) {
$author["contact-id"] = $contact["id"];
$author["author-link"] = $contact["url"];
@@ -87,17 +89,20 @@ class ostatus {
$avatarlist = array();
$avatars = $xpath->query("atom:author/atom:link[@rel='avatar']", $context);
- foreach($avatars AS $avatar) {
+ foreach ($avatars AS $avatar) {
$href = "";
$width = 0;
- foreach($avatar->attributes AS $attributes) {
- if ($attributes->name == "href")
+ foreach ($avatar->attributes AS $attributes) {
+ if ($attributes->name == "href") {
$href = $attributes->textContent;
- if ($attributes->name == "width")
+ }
+ if ($attributes->name == "width") {
$width = $attributes->textContent;
+ }
}
- if (($width > 0) AND ($href != ""))
+ if (($width > 0) AND ($href != "")) {
$avatarlist[$width] = $href;
+ }
}
if (count($avatarlist) > 0) {
krsort($avatarlist);
@@ -105,8 +110,9 @@ class ostatus {
}
$displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
- if ($displayname != "")
+ if ($displayname != "") {
$author["author-name"] = $displayname;
+ }
$author["owner-name"] = $author["author-name"];
$author["owner-link"] = $author["author-link"];
@@ -446,7 +452,7 @@ class ostatus {
foreach ($category->attributes AS $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
- if(strlen($item["tag"])) {
+ if (strlen($item["tag"])) {
$item["tag"] .= ',';
}
$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
@@ -1146,6 +1152,7 @@ class ostatus {
continue;
}
+ /// @TODO One statment is okay (until if () )
$arr = array();
$arr["network"] = $details["network"];
$arr["uri"] = $single_conv->id;
@@ -2211,7 +2218,7 @@ class ostatus {
$owner = $r[0];
- if(!strlen($last_update))
+ if (!strlen($last_update))
$last_update = 'now -30 days';
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
diff --git a/include/uimport.php b/include/uimport.php
index 707d535fc8..b27f9dc126 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -1,283 +1,283 @@
-insert_id();
-}
-
-function last_error() {
- global $db;
- return $db->error;
-}
-
-/**
- * Remove columns from array $arr that aren't in table $table
- *
- * @param string $table Table name
- * @param array &$arr Column=>Value array from json (by ref)
- */
-function check_cols($table, &$arr) {
- $query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
- logger("uimport: $query", LOGGER_DEBUG);
- $r = q($query);
- $tcols = array();
- // get a plain array of column names
- foreach ($r as $tcol) {
- $tcols[] = $tcol['Field'];
- }
- // remove inexistent columns
- foreach ($arr as $icol => $ival) {
- if (!in_array($icol, $tcols)) {
- unset($arr[$icol]);
- }
- }
-}
-
-/**
- * Import data into table $table
- *
- * @param string $table Table name
- * @param array $arr Column=>Value array from json
- */
-function db_import_assoc($table, $arr) {
- if (isset($arr['id']))
- unset($arr['id']);
- check_cols($table, $arr);
- $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
- $vals = implode("','", array_map('dbesc', array_values($arr)));
- $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
- logger("uimport: $query", LOGGER_TRACE);
- if (IMPORT_DEBUG)
- return true;
- return q($query);
-}
-
-function import_cleanup($newuid) {
- dba::delete('user', array('uid' => $newuid));
-}
-
-/**
- * @brief Import account file exported from mod/uexport
- *
- * @param App $a Friendica App Class
- * @param array $file array from $_FILES
- */
-function import_account(App $a, $file) {
- logger("Start user import from " . $file['tmp_name']);
- /*
- STEPS
- 1. checks
- 2. replace old baseurl with new baseurl
- 3. import data (look at user id and contacts id)
- 4. archive non-dfrn contacts
- 5. send message to dfrn contacts
- */
-
- $account = json_decode(file_get_contents($file['tmp_name']), true);
- if ($account === null) {
- notice(t("Error decoding account file"));
- return;
- }
-
-
- if (!x($account, 'version')) {
- notice(t("Error! No version data in file! This is not a Friendica account file?"));
- return;
- }
-
- /*
- // this is not required as we remove columns in json not in current db schema
- if ($account['schema'] != DB_UPDATE_VERSION) {
- notice(t("Error! I can't import this file: DB schema version is not compatible."));
- return;
- }
- */
-
- // 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 (dbm::is_result($r) > 0) {
- notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
- return;
- }
- // check if username matches deleted account
- $r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']);
- if ($r === false) {
- logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
- notice(t('Error! Cannot check nickname'));
- return;
- }
- if (dbm::is_result($r) > 0) {
- notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
- return;
- }
-
- $oldbaseurl = $account['baseurl'];
- $newbaseurl = App::get_baseurl();
- $olduid = $account['user']['uid'];
-
- unset($account['user']['uid']);
- unset($account['user']['account_expired']);
- unset($account['user']['account_expires_on']);
- unset($account['user']['expire_notification_sent']);
- foreach ($account['user'] as $k => &$v) {
- $v = str_replace($oldbaseurl, $newbaseurl, $v);
- }
-
-
- // import user
- $r = db_import_assoc('user', $account['user']);
- if ($r === false) {
- //echo ""; var_dump($r, $query, mysql_error()); killme();
- logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL);
- notice(t("User creation error"));
- return;
- }
- $newuid = last_insert_id();
- //~ $newuid = 1;
-
- // Generate a new guid for the account. Otherwise there will be problems with diaspora
- q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",
- dbesc(generate_user_guid()), intval($newuid));
-
- foreach ($account['profile'] as &$profile) {
- foreach ($profile as $k => &$v) {
- $v = str_replace($oldbaseurl, $newbaseurl, $v);
- foreach (array("profile", "avatar") as $k)
- $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
- }
- $profile['uid'] = $newuid;
- $r = db_import_assoc('profile', $profile);
- if ($r === false) {
- logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
- info(t("User profile creation error"));
- import_cleanup($newuid);
- return;
- }
- }
-
- $errorcount = 0;
- foreach ($account['contact'] as &$contact) {
- if ($contact['uid'] == $olduid && $contact['self'] == '1') {
- foreach ($contact as $k => &$v) {
- $v = str_replace($oldbaseurl, $newbaseurl, $v);
- foreach (array("profile", "avatar", "micro") as $k)
- $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
- }
- }
- if ($contact['uid'] == $olduid && $contact['self'] == '0') {
- // set contacts 'avatar-date' to NULL_DATE to let poller to update urls
- $contact["avatar-date"] = NULL_DATE;
-
-
- switch ($contact['network']) {
- case NETWORK_DFRN:
- // send relocate message (below)
- break;
- case NETWORK_ZOT:
- /// @TODO handle zot network
- break;
- case NETWORK_MAIL2:
- /// @TODO ?
- break;
- case NETWORK_FEED:
- case NETWORK_MAIL:
- // Nothing to do
- break;
- default:
- // archive other contacts
- $contact['archive'] = "1";
- }
- }
- $contact['uid'] = $newuid;
- $r = db_import_assoc('contact', $contact);
- if ($r === false) {
- logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
- $errorcount++;
- } else {
- $contact['newid'] = last_insert_id();
- }
- }
- if ($errorcount > 0) {
- notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount));
- }
-
- foreach ($account['group'] as &$group) {
- $group['uid'] = $newuid;
- $r = db_import_assoc('group', $group);
- if ($r === false) {
- logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
- } else {
- $group['newid'] = last_insert_id();
- }
- }
-
- foreach ($account['group_member'] as &$group_member) {
- $group_member['uid'] = $newuid;
-
- $import = 0;
- foreach ($account['group'] as $group) {
- if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {
- $group_member['gid'] = $group['newid'];
- $import++;
- break;
- }
- }
- foreach ($account['contact'] as $contact) {
- if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) {
- $group_member['contact-id'] = $contact['newid'];
- $import++;
- break;
- }
- }
- if ($import == 2) {
- $r = db_import_assoc('group_member', $group_member);
- if ($r === false) {
- logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
- }
- }
- }
-
- foreach ($account['photo'] as &$photo) {
- $photo['uid'] = $newuid;
- $photo['data'] = hex2bin($photo['data']);
-
- $p = new Photo($photo['data'], $photo['type']);
- $r = $p->store(
- $photo['uid'], $photo['contact-id'], //0
- $photo['resource-id'], $photo['filename'], $photo['album'], $photo['scale'], $photo['profile'], //1
- $photo['allow_cid'], $photo['allow_gid'], $photo['deny_cid'], $photo['deny_gid']
- );
-
- if ($r === false) {
- logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
- }
- }
-
- foreach ($account['pconfig'] as &$pconfig) {
- $pconfig['uid'] = $newuid;
- $r = db_import_assoc('pconfig', $pconfig);
- if ($r === false) {
- logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
- }
- }
-
- // send relocate messages
- proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
-
- info(t("Done. You can now login with your username and password"));
- goaway(App::get_baseurl() . "/login");
-}
+insert_id();
+}
+
+function last_error() {
+ global $db;
+ return $db->error;
+}
+
+/**
+ * Remove columns from array $arr that aren't in table $table
+ *
+ * @param string $table Table name
+ * @param array &$arr Column=>Value array from json (by ref)
+ */
+function check_cols($table, &$arr) {
+ $query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
+ logger("uimport: $query", LOGGER_DEBUG);
+ $r = q($query);
+ $tcols = array();
+ // get a plain array of column names
+ foreach ($r as $tcol) {
+ $tcols[] = $tcol['Field'];
+ }
+ // remove inexistent columns
+ foreach ($arr as $icol => $ival) {
+ if (!in_array($icol, $tcols)) {
+ unset($arr[$icol]);
+ }
+ }
+}
+
+/**
+ * Import data into table $table
+ *
+ * @param string $table Table name
+ * @param array $arr Column=>Value array from json
+ */
+function db_import_assoc($table, $arr) {
+ if (isset($arr['id']))
+ unset($arr['id']);
+ check_cols($table, $arr);
+ $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
+ $vals = implode("','", array_map('dbesc', array_values($arr)));
+ $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
+ logger("uimport: $query", LOGGER_TRACE);
+ if (IMPORT_DEBUG) {
+ return true;
+ }
+ return q($query);
+}
+
+/**
+ * @brief Import account file exported from mod/uexport
+ *
+ * @param App $a Friendica App Class
+ * @param array $file array from $_FILES
+ */
+function import_account(App $a, $file) {
+ logger("Start user import from " . $file['tmp_name']);
+ /*
+ STEPS
+ 1. checks
+ 2. replace old baseurl with new baseurl
+ 3. import data (look at user id and contacts id)
+ 4. archive non-dfrn contacts
+ 5. send message to dfrn contacts
+ */
+
+ $account = json_decode(file_get_contents($file['tmp_name']), true);
+ if ($account === null) {
+ notice(t("Error decoding account file"));
+ return;
+ }
+
+
+ if (!x($account, 'version')) {
+ notice(t("Error! No version data in file! This is not a Friendica account file?"));
+ return;
+ }
+
+ /*
+ * @TODO Old-lost code?
+ // this is not required as we remove columns in json not in current db schema
+ if ($account['schema'] != DB_UPDATE_VERSION) {
+ notice(t("Error! I can't import this file: DB schema version is not compatible."));
+ return;
+ }
+ */
+
+ // 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 (dbm::is_result($r) > 0) {
+ notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
+ return;
+ }
+ // check if username matches deleted account
+ $r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']);
+ if ($r === false) {
+ logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
+ notice(t('Error! Cannot check nickname'));
+ return;
+ }
+ if (dbm::is_result($r) > 0) {
+ notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
+ return;
+ }
+
+ $oldbaseurl = $account['baseurl'];
+ $newbaseurl = App::get_baseurl();
+ $olduid = $account['user']['uid'];
+
+ unset($account['user']['uid']);
+ unset($account['user']['account_expired']);
+ unset($account['user']['account_expires_on']);
+ unset($account['user']['expire_notification_sent']);
+
+ foreach ($account['user'] as $k => &$v) {
+ $v = str_replace($oldbaseurl, $newbaseurl, $v);
+ }
+
+ // import user
+ $r = db_import_assoc('user', $account['user']);
+ if ($r === false) {
+ //echo ""; var_dump($r, $query, mysql_error()); killme();
+ logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL);
+ notice(t("User creation error"));
+ return;
+ }
+ $newuid = last_insert_id();
+ //~ $newuid = 1;
+
+ // Generate a new guid for the account. Otherwise there will be problems with diaspora
+ q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",
+ dbesc(generate_user_guid()), intval($newuid));
+
+ foreach ($account['profile'] as &$profile) {
+ foreach ($profile as $k => &$v) {
+ $v = str_replace($oldbaseurl, $newbaseurl, $v);
+ foreach (array("profile", "avatar") as $k) {
+ $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+ }
+ }
+ $profile['uid'] = $newuid;
+ $r = db_import_assoc('profile', $profile);
+ if ($r === false) {
+ logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ info(t("User profile creation error"));
+ dba::delete('user', array('uid' => $newuid));
+ return;
+ }
+ }
+
+ $errorcount = 0;
+ foreach ($account['contact'] as &$contact) {
+ if ($contact['uid'] == $olduid && $contact['self'] == '1') {
+ foreach ($contact as $k => &$v) {
+ $v = str_replace($oldbaseurl, $newbaseurl, $v);
+ foreach (array("profile", "avatar", "micro") as $k) {
+ $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+ }
+ }
+ }
+ if ($contact['uid'] == $olduid && $contact['self'] == '0') {
+ // set contacts 'avatar-date' to NULL_DATE to let poller to update urls
+ $contact["avatar-date"] = NULL_DATE;
+
+ switch ($contact['network']) {
+ case NETWORK_DFRN:
+ // send relocate message (below)
+ break;
+ case NETWORK_ZOT:
+ /// @TODO handle zot network
+ break;
+ case NETWORK_MAIL2:
+ /// @TODO ?
+ break;
+ case NETWORK_FEED:
+ case NETWORK_MAIL:
+ // Nothing to do
+ break;
+ default:
+ // archive other contacts
+ $contact['archive'] = "1";
+ }
+ }
+ $contact['uid'] = $newuid;
+ $r = db_import_assoc('contact', $contact);
+ if ($r === false) {
+ logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ $errorcount++;
+ } else {
+ $contact['newid'] = last_insert_id();
+ }
+ }
+ if ($errorcount > 0) {
+ notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount));
+ }
+
+ foreach ($account['group'] as &$group) {
+ $group['uid'] = $newuid;
+ $r = db_import_assoc('group', $group);
+ if ($r === false) {
+ logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ } else {
+ $group['newid'] = last_insert_id();
+ }
+ }
+
+ foreach ($account['group_member'] as &$group_member) {
+ $group_member['uid'] = $newuid;
+
+ $import = 0;
+ foreach ($account['group'] as $group) {
+ if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {
+ $group_member['gid'] = $group['newid'];
+ $import++;
+ break;
+ }
+ }
+ foreach ($account['contact'] as $contact) {
+ if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) {
+ $group_member['contact-id'] = $contact['newid'];
+ $import++;
+ break;
+ }
+ }
+ if ($import == 2) {
+ $r = db_import_assoc('group_member', $group_member);
+ if ($r === false) {
+ logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ }
+ }
+ }
+
+ foreach ($account['photo'] as &$photo) {
+ $photo['uid'] = $newuid;
+ $photo['data'] = hex2bin($photo['data']);
+
+ $p = new Photo($photo['data'], $photo['type']);
+ $r = $p->store(
+ $photo['uid'], $photo['contact-id'], //0
+ $photo['resource-id'], $photo['filename'], $photo['album'], $photo['scale'], $photo['profile'], //1
+ $photo['allow_cid'], $photo['allow_gid'], $photo['deny_cid'], $photo['deny_gid']
+ );
+
+ if ($r === false) {
+ logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ }
+ }
+
+ foreach ($account['pconfig'] as &$pconfig) {
+ $pconfig['uid'] = $newuid;
+ $r = db_import_assoc('pconfig', $pconfig);
+ if ($r === false) {
+ logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ }
+ }
+
+ // send relocate messages
+ proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
+
+ info(t("Done. You can now login with your username and password"));
+ goaway(App::get_baseurl() . "/login");
+}
diff --git a/mod/login.php b/mod/login.php
index 79bd04862e..09f1f5d5cc 100644
--- a/mod/login.php
+++ b/mod/login.php
@@ -6,6 +6,7 @@ function login_content(App $a) {
if (x($_SESSION, 'theme')) {
unset($_SESSION['theme']);
}
+
if (x($_SESSION, 'mobile-theme')) {
unset($_SESSION['mobile-theme']);
}
@@ -13,6 +14,6 @@ function login_content(App $a) {
if (local_user()) {
goaway(z_root());
}
-
+
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
}
diff --git a/mod/pretheme.php b/mod/pretheme.php
index e5bebc4eb7..b4eaa05536 100644
--- a/mod/pretheme.php
+++ b/mod/pretheme.php
@@ -19,6 +19,6 @@ function pretheme_init(App $a) {
}
echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits));
}
-
+
killme();
}
diff --git a/mod/uimport.php b/mod/uimport.php
index 127933b96e..b9bde23880 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -1,77 +1,77 @@
-config['register_policy']) {
- case REGISTER_OPEN:
- $blocked = 0;
- $verified = 1;
- break;
-
- case REGISTER_APPROVE:
- $blocked = 1;
- $verified = 0;
- break;
-
- default:
- case REGISTER_CLOSED:
- if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
- notice(t('Permission denied.') . EOL);
- return;
- }
- $blocked = 1;
- $verified = 0;
- break;
- }
-
- if (x($_FILES, 'accountfile')) {
- /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE
- import_account($a, $_FILES['accountfile']);
- return;
- }
-}
-
-function uimport_content(App $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'),
- '$import' => array(
- 'title' => t("Move account"),
- 'intro' => t("You can import an account from another Friendica server."),
- 'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
- 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
- 'field' => array('accountfile', t('Account file'), '', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')),
- ),
- ));
-}
+config['register_policy']) {
+ case REGISTER_OPEN:
+ $blocked = 0;
+ $verified = 1;
+ break;
+
+ case REGISTER_APPROVE:
+ $blocked = 1;
+ $verified = 0;
+ break;
+
+ default:
+ case REGISTER_CLOSED:
+ if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
+ notice(t('Permission denied.') . EOL);
+ return;
+ }
+ $blocked = 1;
+ $verified = 0;
+ break;
+ }
+
+ if (x($_FILES, 'accountfile')) {
+ /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE
+ import_account($a, $_FILES['accountfile']);
+ return;
+ }
+}
+
+function uimport_content(App $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'),
+ '$import' => array(
+ 'title' => t("Move account"),
+ 'intro' => t("You can import an account from another Friendica server."),
+ 'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
+ 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
+ 'field' => array('accountfile', t('Account file'), '', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')),
+ ),
+ ));
+}
diff --git a/view/php/default.php b/view/php/default.php
index 17d4961fcd..5adef21a2d 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -1,19 +1,19 @@
-
-
-
- <?php if(x($page,'title')) echo $page['title'] ?>
-
-
-
-
-
-
-
-
-
-
-
- <?php if(x($page,'title')) echo $page['title'] ?>
+
+
+
+
+
+
+
+
+
+
+
+ <?php if(x($page,'title')) echo $page['title'] ?>
-
-
-
-
-
-
-
-
-
-
+
+
+
+ <?php if(x($page,'title')) echo $page['title'] ?>
+
+
+
+
+
+
+
+
+
diff --git a/view/templates/group_drop.tpl b/view/templates/group_drop.tpl
index 0e3c320a94..b9a6953d8b 100644
--- a/view/templates/group_drop.tpl
+++ b/view/templates/group_drop.tpl
@@ -1,11 +1,11 @@
diff --git a/view/templates/groupeditor.tpl b/view/templates/groupeditor.tpl
index 28abc486ed..bde686040b 100644
--- a/view/templates/groupeditor.tpl
+++ b/view/templates/groupeditor.tpl
@@ -59,4 +59,3 @@
-
diff --git a/view/theme/frio/js/mod_group.js b/view/theme/frio/js/mod_group.js
index e6d73809e0..bc513aca9e 100644
--- a/view/theme/frio/js/mod_group.js
+++ b/view/theme/frio/js/mod_group.js
@@ -5,9 +5,9 @@
*/
-$(document).ready(function(){
+$(document).ready(function() {
// Add an event listeners on buttons for switching the contact list view
- $("body").on("click", ".group-list-switcher", function(){
+ $("body").on("click", ".group-list-switcher", function() {
switchGroupViewMode(this);
});
});
@@ -15,11 +15,11 @@ $(document).ready(function(){
/**
* @brief Change the group membership of the contacts and fetch the new grup list
* as html
- *
+ *
* @param {int} gid The group ID
* @param {int} cid The contact ID
* @param {string} sec_token The security token
- *
+ *
* @returns {undefined}
*/
function groupChangeMember(gid, cid, sec_token) {
@@ -42,7 +42,7 @@ function groupChangeMember(gid, cid, sec_token) {
/**
* @brief Change the group list view mode
- *
+ *
* @param {object} elm The button element of the view mode switcher
* @returns {undefined}
*/
@@ -53,7 +53,7 @@ function switchGroupViewMode(elm) {
$(elm).addClass("active");
// Add or remove the css classes for the group list with regard to the active view mode
- if (elm.id === "group-list-small") {
+ if (elm.id === "group-list-small") {
$("#contact-group-list > li").addClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12");
} else {
$("#contact-group-list > li").removeClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12");
@@ -62,7 +62,7 @@ function switchGroupViewMode(elm) {
/**
* @brief Filter the group member list for contacts
- *
+ *
* @returns {undefined}
*/
function filterList() {
diff --git a/view/theme/frio/templates/admin_aside.tpl b/view/theme/frio/templates/admin_aside.tpl
index 2ef95fa26e..ec19ec92e9 100644
--- a/view/theme/frio/templates/admin_aside.tpl
+++ b/view/theme/frio/templates/admin_aside.tpl
@@ -83,4 +83,3 @@
-
diff --git a/view/theme/frio/templates/group_edit.tpl b/view/theme/frio/templates/group_edit.tpl
index 7f735469be..d94dd3311d 100644
--- a/view/theme/frio/templates/group_edit.tpl
+++ b/view/theme/frio/templates/group_edit.tpl
@@ -1,5 +1,5 @@
-{{* This template is for the "group" module. It provides the user the possibility to
+{{* This template is for the "group" module. It provides the user the possibility to
modify a specific contact group (remove contact group, edit contact group name,
add or remove contacts to the contact group.
*}}
@@ -40,11 +40,11 @@
-
diff --git a/view/theme/frio/templates/groupeditor.tpl b/view/theme/frio/templates/groupeditor.tpl
index 7d412766f9..8d1db5b222 100644
--- a/view/theme/frio/templates/groupeditor.tpl
+++ b/view/theme/frio/templates/groupeditor.tpl
@@ -5,7 +5,7 @@
{{* The contacts who are already members of the contact group *}}
- {{foreach $groupeditor.members as $contact}}
+ {{foreach $groupeditor.members as $contact}}
- {{include file="contact_template.tpl"}}
{{/foreach}}
diff --git a/view/theme/frost-mobile/php/default.php b/view/theme/frost-mobile/php/default.php
index 062ec3b8a9..9d920c2f62 100644
--- a/view/theme/frost-mobile/php/default.php
+++ b/view/theme/frost-mobile/php/default.php
@@ -1,45 +1,45 @@
-
-
-
- <?php if(x($page,'title')) echo $page['title'] ?>
-
-
-
-module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
-
-
- module === 'home' ) { ?>
-
-
- 
-
-
-
- module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
- ?>
-
-
-
-
-
-
-
-
-
- <?php if(x($page,'title')) echo $page['title'] ?>
+
+
+
+module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
+
+
+ module === 'home' ) { ?>
+
+
+
+
+
+
+ module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+ ?>
+
+
+
+
+
+
+
+
+
+
+ module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
+
+
+
+
+
+
+ <?php if(x($page,'title')) echo $page['title'] ?>
-
-
-
-module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
-
-
- module === 'home' ) { ?>
-
-
- 
-
-
-
- module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <?php if(x($page,'title')) echo $page['title'] ?>
+
+
+
+module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
+
+
+ module === 'home' ) { ?>
+
+
+
+
+
+
+ module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+