harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed several little nit bugs that cropped up during deployment

Browse Source
This commit is contained in:
friendica 2012-12-06 00:03:24 -08:00
parent d715febf7c
commit c6b8ab534f
9 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
boot.php
View File

@ -626,6 +626,12 @@ if(! class_exists('App')) {
}
function set_baseurl($url) {
if(is_array($this->config) && array_key_exists('system',$this->config) &&
array_key_exists('baseurl',$this->config['system']) && strlen($this->config['system']['baseurl'])) {
$url = $a->config['system']['baseurl'];
}
$parsed = @parse_url($url);
$this->baseurl = $url;
@ -860,13 +866,13 @@ function is_ajax() {
if(! function_exists('check_config')) {
function check_config(&$a) {
function check_config(&$a) {
$build = get_config('system','build');
if(! x($build))
$build = set_config('system','build',DB_UPDATE_VERSION);
$url = get_config('system','url');
// $url = get_config('system','baseurl');
// if the url isn't set or the stored url is radically different
// than the currently visited url, store the current value accordingly.
@ -874,10 +880,10 @@ if(! function_exists('check_config')) {
// and www.example.com vs example.com.
// We will only change the url to an ip address if there is no existing setting
if(! x($url))
$url = set_config('system','url',$a->get_baseurl());
if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
$url = set_config('system','url',$a->get_baseurl());
// if(! x($url))
// $url = set_config('system','baseurl',$a->get_baseurl());
// if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
// $url = set_config('system','baseurl',$a->get_baseurl());

2
include/account.php
View File

@ -263,7 +263,7 @@ function send_verification_email($email,$password) {
'$password' => $password,
));
$res = mail($email, sprintf( t('Registration details for %s'), get_config('config','sitename')),
$res = mail($email, sprintf( t('Registration details for %s'), get_config('system','sitename')),
$email_msg,
'From: ' . t('Administrator') . '@' . get_app()->get_hostname() . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"

2
include/cli_startup.php
View File

@ -24,7 +24,7 @@ function cli_startup() {
load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','url'));
$a->set_baseurl(get_config('system','baseurl'));
load_hooks();

2
include/gprobe.php
View File

@ -24,7 +24,7 @@ function gprobe_run($argv, $argc){
load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','url'));
$a->set_baseurl(get_config('system','baseurl'));
load_hooks();

2
include/onepoll.php
View File

@ -29,7 +29,7 @@ function onepoll_run($argv, $argc){
load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','url'));
$a->set_baseurl(get_config('system','baseurl'));
load_hooks();

2
include/poller.php
View File

@ -40,7 +40,7 @@ function poller_run($argv, $argc){
}
$a->set_baseurl(get_config('system','url'));
$a->set_baseurl(get_config('system','baseurl'));
load_hooks();

30
view/en/register_open_eml.tpl
View File

@ -1,32 +1,16 @@
Dear $[username],
Thank you for registering at $[sitename]. Your account has been created.
An account has been created at $[sitename] for this email address.
The login details are as follows:
Site Location: $[siteurl]
Login Name: $[email]
Password: $[password]
Login: $[email]
Password: $[password]
You may change your password from your account "Settings" page after logging
in.
If this account was created without your knowledge and is not desired, please
login and remove the account from the links on the Settings page, and we
apologise for any inconvenience.
Please take a few moments to review the other account settings on that page.
You may also wish to add some basic information to your default profile
(on the "Profiles" page) so that other people can easily find you.
We recommend setting your full name, adding a profile photo,
adding some profile "keywords" (very useful in making new friends) - and
perhaps what country you live in; if you do not wish to be more specific
than that.
We fully respect your right to privacy, and none of these items are necessary.
If you are new and do not know anybody here, they may help
you to make some new and interesting friends.
Thank you and welcome to $[sitename].
Thank you and welcome.
Sincerely,
$[sitename] Administrator

6
view/theme/redbasic/css/style.css
View File

@ -409,13 +409,13 @@ div.wall-item-content-wrapper.shiny {
margin-bottom: 25px;
}
#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
#label-register-name, #label-register-nickname, #label-register-openid {
float: left;
width: 350px;
margin-top: 10px;
}
#register-name, #register-email, #register-nickname {
#register-name, #register-nickname {
float: left;
margin-top: 10px;
width: 150px;
@ -659,6 +659,7 @@ input#dfrn-url {
.profile-edit-side-link {
opacity: 0.3;
filter:alpha(opacity=30);
float: right;
}
.profile-edit-side-link:hover {
opacity: 1.0;
@ -3552,6 +3553,7 @@ nav #nav-help-link,
nav #nav-search-link,
nav #nav-directory-link,
nav #nav-apps-link,
nav #nav-user-linkmenu,
nav #nav-site-linkmenu {
float: right;
}

31
view/tpl/nav.tpl
View File

@ -10,21 +10,6 @@
</li>
{{ endif }}
{{ if $userinfo }}
<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
{{ if $localuser }}
<ul id="nav-user-menu" class="menu-popup">
{{ for $nav.usermenu as $usermenu }}
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
{{ endfor }}
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
</ul>
{{ endif }}
</li>
{{ endif }}
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu $sel.network">
@ -72,6 +57,22 @@
</ul>
</li>
{{ if $userinfo }}
<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
{{ if $localuser }}
<ul id="nav-user-menu" class="menu-popup">
{{ for $nav.usermenu as $usermenu }}
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
{{ endfor }}
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
</ul>
{{ endif }}
</li>
{{ endif }}
{{ if $nav.help }}
<li id="nav-help-link" class="nav-menu $sel.help">
<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>