added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-21 23:04:09 +01:00
parent e6a4a736fc
commit d3e666f71a
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
7 changed files with 88 additions and 91 deletions

View file

@ -153,8 +153,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
if ($post_id) { if ($post_id) {
proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id); proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
return intval($post_id); return intval($post_id);
} } else {
else {
return -3; return -3;
} }

View file

@ -88,20 +88,19 @@ function dirfind_content(&$a, $prefix = "") {
if (get_config('system','diaspora_enabled')) { if (get_config('system','diaspora_enabled')) {
$diaspora = NETWORK_DIASPORA; $diaspora = NETWORK_DIASPORA;
} } else {
else {
$diaspora = NETWORK_DFRN; $diaspora = NETWORK_DFRN;
} }
if (!get_config('system','ostatus_disabled')) { if (!get_config('system','ostatus_disabled')) {
$ostatus = NETWORK_OSTATUS; $ostatus = NETWORK_OSTATUS;
} } else {
else {
$ostatus = NETWORK_DFRN; $ostatus = NETWORK_DFRN;
} }
$search2 = "%".$search."%"; $search2 = "%".$search."%";
/// @TODO These 2 SELECTs are not checked on validity with dbm::is_result()
$count = q("SELECT count(*) AS `total` FROM `gcontact` $count = q("SELECT count(*) AS `total` FROM `gcontact`
LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
AND `contact`.`network` = `gcontact`.`network` AND `contact`.`network` = `gcontact`.`network`
@ -200,8 +199,7 @@ function dirfind_content(&$a, $prefix = "") {
$photo_menu = contact_photo_menu($contact[0]); $photo_menu = contact_photo_menu($contact[0]);
$details = _contact_detail_for_template($contact[0]); $details = _contact_detail_for_template($contact[0]);
$alt_text = $details['alt_text']; $alt_text = $details['alt_text'];
} } else {
else {
$photo_menu = array(); $photo_menu = array();
} }
} else { } else {
@ -243,8 +241,7 @@ function dirfind_content(&$a, $prefix = "") {
'$paginate' => paginate($a), '$paginate' => paginate($a),
)); ));
} } else {
else {
info( t('No matches') . EOL); info( t('No matches') . EOL);
} }

View file

@ -56,10 +56,11 @@ function follow_content(App &$a) {
// NOTREACHED // NOTREACHED
} }
if ($ret["network"] == NETWORK_MAIL) if ($ret["network"] == NETWORK_MAIL) {
$ret["url"] = $ret["addr"]; $ret["url"] = $ret["addr"];
}
if($ret['network'] === NETWORK_DFRN) { if ($ret['network'] === NETWORK_DFRN) {
$request = $ret["request"]; $request = $ret["request"];
$tpl = get_markup_template('dfrn_request.tpl'); $tpl = get_markup_template('dfrn_request.tpl');
} else { } else {
@ -84,20 +85,22 @@ function follow_content(App &$a) {
$r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'", $r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
normalise_link($ret["url"])); normalise_link($ret["url"]));
if (!$r) if (!$r) {
$r = array(array("location" => "", "about" => "", "keywords" => "")); $r = array(array("location" => "", "about" => "", "keywords" => ""));
else } else {
$gcontact_id = $r[0]["id"]; $gcontact_id = $r[0]["id"];
}
if($ret['network'] === NETWORK_DIASPORA) { if ($ret['network'] === NETWORK_DIASPORA) {
$r[0]["location"] = ""; $r[0]["location"] = "";
$r[0]["about"] = ""; $r[0]["about"] = "";
} }
$header = $ret["name"]; $header = $ret["name"];
if ($ret["addr"] != "") if ($ret["addr"] != "") {
$header .= " <".$ret["addr"].">"; $header .= " <".$ret["addr"].">";
}
//$header .= " (".network_to_name($ret['network'], $ret['url']).")"; //$header .= " (".network_to_name($ret['network'], $ret['url']).")";
$header = t("Connect/Follow"); $header = t("Connect/Follow");
@ -176,8 +179,7 @@ function follow_post(App &$a) {
notice($result['message']); notice($result['message']);
} }
goaway($return_url); goaway($return_url);
} } elseif ($result['cid']) {
elseif ($result['cid']) {
goaway(App::get_baseurl().'/contacts/'.$result['cid']); goaway(App::get_baseurl().'/contacts/'.$result['cid']);
} }

View file

@ -16,7 +16,6 @@ function home_init(App &$a) {
}} }}
if(! function_exists('home_content')) { if(! function_exists('home_content')) {
function home_content(App &$a) { function home_content(App &$a) {
@ -35,9 +34,8 @@ function home_content(App &$a) {
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.App::get_baseurl().'/home.css'.'" media="all" />'; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.App::get_baseurl().'/home.css'.'" media="all" />';
} }
$o .= file_get_contents('home.html');} $o .= file_get_contents('home.html');
} else {
else {
$o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>'; $o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
} }
@ -48,5 +46,4 @@ function home_content(App &$a) {
return $o; return $o;
}} }}

View file

@ -11,17 +11,16 @@ function install_init(App &$a){
echo "ok"; echo "ok";
killme(); killme();
} }
// We overwrite current theme css, because during install we could not have a working mod_rewrite // We overwrite current theme css, because during install we could not have a working mod_rewrite
// so we could not have a css at all. Here we set a static css file for the install procedure pages // so we could not have a css at all. Here we set a static css file for the install procedure pages
$a->config['system']['theme'] = "../install"; $a->config['system']['theme'] = "../install";
$a->theme['stylesheet'] = App::get_baseurl()."/view/install/style.css"; $a->theme['stylesheet'] = App::get_baseurl()."/view/install/style.css";
global $install_wizard_pass; global $install_wizard_pass;
if (x($_POST,'pass')) if (x($_POST,'pass')) {
$install_wizard_pass = intval($_POST['pass']); $install_wizard_pass = intval($_POST['pass']);
}
} }
@ -63,7 +62,7 @@ function install_post(App &$a) {
return; return;
} }
}*/ }*/
if(get_db_errno()) { if (get_db_errno()) {
$a->data['db_conn_failed']=true; $a->data['db_conn_failed']=true;
} }
@ -107,17 +106,18 @@ function install_post(App &$a) {
$result = file_put_contents('.htconfig.php', $txt); $result = file_put_contents('.htconfig.php', $txt);
if(! $result) { if (! $result) {
$a->data['txt'] = $txt; $a->data['txt'] = $txt;
} }
$errors = load_database($db); $errors = load_database($db);
if($errors) if ($errors) {
$a->data['db_failed'] = $errors; $a->data['db_failed'] = $errors;
else } else {
$a->data['db_installed'] = true; $a->data['db_installed'] = true;
}
return; return;
break; break;
@ -125,10 +125,11 @@ function install_post(App &$a) {
} }
function get_db_errno() { function get_db_errno() {
if(class_exists('mysqli')) if (class_exists('mysqli')) {
return mysqli_connect_errno(); return mysqli_connect_errno();
else } else {
return mysql_errno(); return mysql_errno();
}
} }
function install_content(App &$a) { function install_content(App &$a) {
@ -140,23 +141,23 @@ function install_content(App &$a) {
if(x($a->data,'db_conn_failed')) { if (x($a->data,'db_conn_failed')) {
$install_wizard_pass = 2; $install_wizard_pass = 2;
$wizard_status = t('Could not connect to database.'); $wizard_status = t('Could not connect to database.');
} }
if(x($a->data,'db_create_failed')) { if (x($a->data,'db_create_failed')) {
$install_wizard_pass = 2; $install_wizard_pass = 2;
$wizard_status = t('Could not create table.'); $wizard_status = t('Could not create table.');
} }
$db_return_text=""; $db_return_text="";
if(x($a->data,'db_installed')) { if (x($a->data,'db_installed')) {
$txt = '<p style="font-size: 130%;">'; $txt = '<p style="font-size: 130%;">';
$txt .= t('Your Friendica site database has been installed.') . EOL; $txt .= t('Your Friendica site database has been installed.') . EOL;
$db_return_text .= $txt; $db_return_text .= $txt;
} }
if(x($a->data,'db_failed')) { if (x($a->data,'db_failed')) {
$txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL; $txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
$txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>" ; $txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>" ;
$txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL ; $txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL ;
@ -176,7 +177,7 @@ function install_content(App &$a) {
} }
} }
if(x($a->data,'txt') && strlen($a->data['txt'])) { if (x($a->data,'txt') && strlen($a->data['txt'])) {
$db_return_text .= manual_config($a); $db_return_text .= manual_config($a);
} }
@ -205,16 +206,19 @@ function install_content(App &$a) {
check_keys($checks); check_keys($checks);
if(x($_POST,'phpath')) if (x($_POST,'phpath')) {
$phpath = notags(trim($_POST['phpath'])); $phpath = notags(trim($_POST['phpath']));
}
check_php($phpath, $checks); check_php($phpath, $checks);
check_htaccess($checks); check_htaccess($checks);
/// @TODO Maybe move this out?
function check_passed($v, $c){ function check_passed($v, $c){
if ($c['required']) if ($c['required']) {
$v = $v && $c['status']; $v = $v && $c['status'];
}
return $v; return $v;
} }
$checkspassed = array_reduce($checks, "check_passed", true); $checkspassed = array_reduce($checks, "check_passed", true);
@ -343,7 +347,7 @@ function check_php(&$phpath, &$checks) {
$passed = strlen($phpath); $passed = strlen($phpath);
} }
$help = ""; $help = "";
if(!$passed) { if (!$passed) {
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL ; $help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL ;
$help .= EOL . EOL ; $help .= EOL . EOL ;
@ -370,7 +374,7 @@ function check_php(&$phpath, &$checks) {
} }
if($passed2) { if ($passed2) {
$str = autoname(8); $str = autoname(8);
$cmd = "$phpath testargs.php $str"; $cmd = "$phpath testargs.php $str";
$result = trim(shell_exec($cmd)); $result = trim(shell_exec($cmd));
@ -392,15 +396,17 @@ function check_keys(&$checks) {
$res = false; $res = false;
if(function_exists('openssl_pkey_new')) if (function_exists('openssl_pkey_new')) {
$res=openssl_pkey_new(array( $res = openssl_pkey_new(array(
'digest_alg' => 'sha1', 'digest_alg' => 'sha1',
'private_key_bits' => 4096, 'private_key_bits' => 4096,
'encrypt_key' => false )); 'encrypt_key' => false
));
}
// Get private key // Get private key
if(! $res) { if (! $res) {
$help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL; $help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL;
$help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'); $help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
} }
@ -420,7 +426,7 @@ function check_funcs(&$checks) {
check_add($ck_funcs, t('XML PHP module'), true, true, ""); check_add($ck_funcs, t('XML PHP module'), true, true, "");
check_add($ck_funcs, t('iconv module'), true, true, ""); check_add($ck_funcs, t('iconv module'), true, true, "");
if(function_exists('apache_get_modules')){ if (function_exists('apache_get_modules')){
if (! in_array('mod_rewrite',apache_get_modules())) { if (! in_array('mod_rewrite',apache_get_modules())) {
check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.')); check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
} else { } else {
@ -428,31 +434,31 @@ function check_funcs(&$checks) {
} }
} }
if(! function_exists('curl_init')){ if (! function_exists('curl_init')){
$ck_funcs[0]['status']= false; $ck_funcs[0]['status']= false;
$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.'); $ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
} }
if(! function_exists('imagecreatefromjpeg')){ if (! function_exists('imagecreatefromjpeg')){
$ck_funcs[1]['status']= false; $ck_funcs[1]['status']= false;
$ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.'); $ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.');
} }
if(! function_exists('openssl_public_encrypt')) { if (! function_exists('openssl_public_encrypt')) {
$ck_funcs[2]['status']= false; $ck_funcs[2]['status']= false;
$ck_funcs[2]['help']= t('Error: openssl PHP module required but not installed.'); $ck_funcs[2]['help']= t('Error: openssl PHP module required but not installed.');
} }
if(! function_exists('mysqli_connect')){ if (! function_exists('mysqli_connect')){
$ck_funcs[3]['status']= false; $ck_funcs[3]['status']= false;
$ck_funcs[3]['help']= t('Error: mysqli PHP module required but not installed.'); $ck_funcs[3]['help']= t('Error: mysqli PHP module required but not installed.');
} }
if(! function_exists('mb_strlen')){ if (! function_exists('mb_strlen')){
$ck_funcs[4]['status']= false; $ck_funcs[4]['status']= false;
$ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.'); $ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.');
} }
if(! function_exists('mcrypt_create_iv')){ if (! function_exists('mcrypt_create_iv')){
$ck_funcs[5]['status']= false; $ck_funcs[5]['status']= false;
$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.'); $ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
} }
if(! function_exists('iconv_strlen')){ if (! function_exists('iconv_strlen')){
$ck_funcs[7]['status']= false; $ck_funcs[7]['status']= false;
$ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.'); $ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
} }
@ -487,7 +493,7 @@ function check_funcs(&$checks) {
function check_htconfig(&$checks) { function check_htconfig(&$checks) {
$status = true; $status = true;
$help = ""; $help = "";
if( (file_exists('.htconfig.php') && !is_writable('.htconfig.php')) || if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
(!file_exists('.htconfig.php') && !is_writable('.')) ) { (!file_exists('.htconfig.php') && !is_writable('.')) ) {
$status=false; $status=false;
@ -504,7 +510,7 @@ function check_htconfig(&$checks) {
function check_smarty3(&$checks) { function check_smarty3(&$checks) {
$status = true; $status = true;
$help = ""; $help = "";
if( !is_writable('view/smarty3') ) { if (!is_writable('view/smarty3') ) {
$status=false; $status=false;
$help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL; $help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;
@ -532,8 +538,7 @@ function check_htaccess(&$checks) {
$help = t('Url rewrite in .htaccess is not working. Check your server configuration.'); $help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
} }
check_add($checks, t('Url rewrite is working'), $status, true, $help); check_add($checks, t('Url rewrite is working'), $status, true, $help);
} } else {
else {
// cannot check modrewrite if libcurl is not installed // cannot check modrewrite if libcurl is not installed
/// @TODO Maybe issue warning here? /// @TODO Maybe issue warning here?
} }
@ -552,8 +557,7 @@ function check_imagik(&$checks) {
} }
if ($imagick == false) { if ($imagick == false) {
check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, ""); check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, "");
} } else {
else {
check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, ""); check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
if ($imagick) { if ($imagick) {
check_add($checks, t('ImageMagick supports GIF'), $gif, false, ""); check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
@ -562,7 +566,6 @@ function check_imagik(&$checks) {
} }
function manual_config(App &$a) { function manual_config(App &$a) {
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8'); $data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'); $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');

View file

@ -19,14 +19,15 @@ function invite_post(App &$a) {
check_form_security_token_redirectOnErr('/', 'send_invite'); check_form_security_token_redirectOnErr('/', 'send_invite');
$max_invites = intval(get_config('system','max_invites')); $max_invites = intval(get_config('system','max_invites'));
if(! $max_invites) if (! $max_invites) {
$max_invites = 50; $max_invites = 50;
}
$current_invites = intval(get_pconfig(local_user(),'system','sent_invites')); $current_invites = intval(get_pconfig(local_user(),'system','sent_invites'));
if($current_invites > $max_invites) { if ($current_invites > $max_invites) {
notice( t('Total invitation limit exceeded.') . EOL); notice( t('Total invitation limit exceeded.') . EOL);
return; return;
}; }
$recips = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : array()); $recips = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : array());
@ -34,23 +35,24 @@ function invite_post(App &$a) {
$total = 0; $total = 0;
if(get_config('system','invitation_only')) { if (get_config('system','invitation_only')) {
$invonly = true; $invonly = true;
$x = get_pconfig(local_user(),'system','invites_remaining'); $x = get_pconfig(local_user(),'system','invites_remaining');
if((! $x) && (! is_site_admin())) if ((! $x) && (! is_site_admin())) {
return; return;
}
} }
foreach($recips as $recip) { foreach ($recips as $recip) {
$recip = trim($recip); $recip = trim($recip);
if(! valid_email($recip)) { if (! valid_email($recip)) {
notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL); notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
continue; continue;
} }
if($invonly && ($x || is_site_admin())) { if ($invonly && ($x || is_site_admin())) {
$code = autoname(8) . srand(1000,9999); $code = autoname(8) . srand(1000,9999);
$nmessage = str_replace('$invite_code',$code,$message); $nmessage = str_replace('$invite_code',$code,$message);
@ -59,16 +61,17 @@ function invite_post(App &$a) {
dbesc(datetime_convert()) dbesc(datetime_convert())
); );
if(! is_site_admin()) { if (! is_site_admin()) {
$x --; $x --;
if($x >= 0) if ($x >= 0) {
set_pconfig(local_user(),'system','invites_remaining',$x); set_pconfig(local_user(),'system','invites_remaining',$x);
else } else {
return; return;
}
} }
} } else {
else
$nmessage = $message; $nmessage = $message;
}
$res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'), $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'),
$nmessage, $nmessage,
@ -76,7 +79,7 @@ function invite_post(App &$a) {
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
if($res) { if ($res) {
$total ++; $total ++;
$current_invites ++; $current_invites ++;
set_pconfig(local_user(),'system','sent_invites',$current_invites); set_pconfig(local_user(),'system','sent_invites',$current_invites);
@ -84,8 +87,7 @@ function invite_post(App &$a) {
notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL); notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
return; return;
} }
} } else {
else {
notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL); notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
} }
@ -105,26 +107,24 @@ function invite_content(App &$a) {
$tpl = get_markup_template('invite.tpl'); $tpl = get_markup_template('invite.tpl');
$invonly = false; $invonly = false;
if(get_config('system','invitation_only')) { if (get_config('system','invitation_only')) {
$invonly = true; $invonly = true;
$x = get_pconfig(local_user(),'system','invites_remaining'); $x = get_pconfig(local_user(),'system','invites_remaining');
if((! $x) && (! is_site_admin())) { if ((! $x) && (! is_site_admin())) {
notice( t('You have no more invitations available') . EOL); notice( t('You have no more invitations available') . EOL);
return ''; return '';
} }
} }
$dirloc = get_config('system','directory'); $dirloc = get_config('system','directory');
if(strlen($dirloc)) { if (strlen($dirloc)) {
if ($a->config['register_policy'] == REGISTER_CLOSED) { if ($a->config['register_policy'] == REGISTER_CLOSED) {
$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo'); $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo');
} } elseif($a->config['register_policy'] != REGISTER_CLOSED) {
elseif($a->config['register_policy'] != REGISTER_CLOSED) {
$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl()) $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl())
. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo'); . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo');
} }
} } else {
else {
$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
return $o; return $o;
} }

View file

@ -43,8 +43,7 @@ function starred_init(App &$a) {
$rand = '_=' . time(); $rand = '_=' . time();
if (strpos($return_path, '?')) { if (strpos($return_path, '?')) {
$rand = "&$rand"; $rand = "&$rand";
} } else {
else {
$rand = "?$rand"; $rand = "?$rand";
} }