clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4092 from MrPetovan/task/3954-move-auth-to-src

Browse Source 
Move auth to src
This commit is contained in:
Tobias Diekershoff
2018-01-04 18:06:42 +01:00
committed by GitHub
parent 6e71a84075 520a068500
commit 04589ecd38
31 changed files with 783 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Group.php
View File

@@ -61,7 +61,7 @@ class Group extends BaseObject
* @param int $cid
* @return array
*/
private static function getIdsByContactId($cid)
public static function getIdsByContactId($cid)
{
$condition = ['contact-id' => $cid];
$stmt = dba::select('group_member', ['gid'], $condition);

6
src/Model/User.php
View File

@@ -198,8 +198,6 @@ class User
$password = $password1;
}
$tmp_str = $openid_url;
if ($using_invites) {
if (!$invite_id) {
throw new Exception(t('An invitation is required.'));
@@ -212,7 +210,7 @@ class User
if (!x($username) || !x($email) || !x($nickname)) {
if ($openid_url) {
if (!validate_url($tmp_str)) {
if (!validate_url($openid_url)) {
throw new Exception(t('Invalid OpenID url'));
}
$_SESSION['register'] = 1;
@@ -235,7 +233,7 @@ class User
throw new Exception(t('Please enter the required information.'));
}
if (!validate_url($tmp_str)) {
if (!validate_url($openid_url)) {
$openid_url = '';
}