Merge branch 'master' of https://github.com/friendica/friendica
This commit is contained in:
Thomas Willingham
commit
610c78f9e0
6
boot.php
6
boot.php
|
|
@ -10,7 +10,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1390' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1391' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1151 );
|
||||
|
||||
|
|
@ -442,8 +442,8 @@ if(! class_exists('App')) {
|
|||
$this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
|
||||
$this->pager['itemspage'] = 50;
|
||||
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
|
||||
if($this->pager['start'] < 1)
|
||||
$this->pager['start'] = 1;
|
||||
if($this->pager['start'] < 0)
|
||||
$this->pager['start'] = 0;
|
||||
$this->pager['total'] = 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -607,6 +607,9 @@ function validate_url(&$url) {
|
|||
if(! function_exists('validate_email')) {
|
||||
function validate_email($addr) {
|
||||
|
||||
if(get_config('system','disable_email_validation'))
|
||||
return true;
|
||||
|
||||
if(! strpos($addr,'@'))
|
||||
return false;
|
||||
$h = substr($addr,strpos($addr,'@') + 1);
|
||||
|
|
|
|||
|
|
@ -656,6 +656,10 @@ function search($s,$id='search-box',$url='/search',$save = false) {
|
|||
|
||||
if(! function_exists('valid_email')) {
|
||||
function valid_email($x){
|
||||
|
||||
if(get_config('system','disable_email_validation'))
|
||||
return true;
|
||||
|
||||
if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
|
||||
return true;
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -99,11 +99,11 @@ function create_user($arr) {
|
|||
|
||||
|
||||
if(! allowed_email($email))
|
||||
$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
|
||||
$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
|
||||
|
||||
if((! valid_email($email)) || (! validate_email($email)))
|
||||
$result['message'] .= t('Not a valid email address.') . EOL;
|
||||
|
||||
|
||||
// Disallow somebody creating an account using openid that uses the admin email address,
|
||||
// since openid bypasses email verification. We'll allow it if there is not yet an admin account.
|
||||
|
||||
|
|
|
|||
|
|
@ -224,6 +224,7 @@ function message_content(&$a) {
|
|||
// list messages
|
||||
|
||||
$o .= $header;
|
||||
|
||||
|
||||
$r = q("SELECT count(*) AS `total` FROM `mail`
|
||||
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
|
||||
|
|
@ -232,7 +233,7 @@ function message_content(&$a) {
|
|||
);
|
||||
if(count($r))
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
|
||||
$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
|
||||
`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
|
||||
count( * ) as count
|
||||
|
|
@ -243,6 +244,7 @@ function message_content(&$a) {
|
|||
intval($a->pager['start']),
|
||||
intval($a->pager['itemspage'])
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
info( t('No messages.') . EOL);
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1390\n"
|
||||
"Project-Id-Version: 3.0.1391\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-06-30 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-07-01 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -137,7 +137,7 @@ msgstr ""
|
|||
#: ../../addon/facebook/facebook.php:617
|
||||
#: ../../addon/snautofollow/snautofollow.php:64
|
||||
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
|
||||
#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:208
|
||||
#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
|
||||
#: ../../addon/planets/planets.php:158
|
||||
#: ../../addon/uhremotestorage/uhremotestorage.php:89
|
||||
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
|
||||
|
|
@ -4685,23 +4685,23 @@ msgstr ""
|
|||
msgid "Forums:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/page/page.php:163
|
||||
#: ../../addon/page/page.php:165
|
||||
msgid "Page settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/page/page.php:192
|
||||
#: ../../addon/page/page.php:194
|
||||
msgid "Page Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/page/page.php:194
|
||||
#: ../../addon/page/page.php:196
|
||||
msgid "How many forums to display on sidebar without paging"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/page/page.php:197
|
||||
#: ../../addon/page/page.php:199
|
||||
msgid "Randomise Page/Forum list"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/page/page.php:200
|
||||
#: ../../addon/page/page.php:202
|
||||
msgid "Show pages/forums on profile page"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue