From: Hypolite Petovan Date: Sun, 26 Nov 2017 19:18:45 +0000 (-0500) Subject: Fix formatting X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=90a8ae2cb8335f7260e9301e4fe057f64e55f3b4;p=friendica.git Fix formatting - include/auth.php - include/oauth.php - include/user.php - mod/removeme.php - src/Worker/Queue.php --- diff --git a/include/auth.php b/include/auth.php index f852ea28a5..90509468c5 100644 --- a/include/auth.php +++ b/include/auth.php @@ -5,8 +5,8 @@ use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Database\DBM; -require_once('include/security.php'); -require_once('include/datetime.php'); +require_once 'include/security.php'; +require_once 'include/datetime.php'; // When the "Friendica" cookie is set, take the value to authenticate and renew the cookie. if (isset($_COOKIE["Friendica"])) { @@ -19,7 +19,7 @@ if (isset($_COOKIE["Friendica"])) { if ($r) { if ($data->hash != cookie_hash($r[0])) { - logger("Hash for user ".$data->uid." doesn't fit."); + logger("Hash for user " . $data->uid . " doesn't fit."); nuke_session(); goaway(System::baseUrl()); } @@ -28,14 +28,15 @@ if (isset($_COOKIE["Friendica"])) { // Expires after 7 days by default, // can be set via system.auth_cookie_lifetime $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7); - new_cookie($authcookiedays*24*60*60, $r[0]); + new_cookie($authcookiedays * 24 * 60 * 60, $r[0]); // Do the authentification if not done by now if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) { authenticate_success($r[0]); - if (Config::get('system','paranoia')) + if (Config::get('system', 'paranoia')) { $_SESSION['addr'] = $data->ip; + } } } } @@ -44,18 +45,16 @@ if (isset($_COOKIE["Friendica"])) { // login/logout -if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params') || ($_POST['auth-params'] !== 'login'))) { - - if ((x($_POST,'auth-params') && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) { - +if (isset($_SESSION) && x($_SESSION, 'authenticated') && (!x($_POST, 'auth-params') || ($_POST['auth-params'] !== 'login'))) { + if ((x($_POST, 'auth-params') && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) { // process logout request call_hooks("logging_out"); nuke_session(); - info(t('Logged out.').EOL); + info(t('Logged out.') . EOL); goaway(System::baseUrl()); } - if (x($_SESSION,'visitor_id') && !x($_SESSION,'uid')) { + if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) { $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($_SESSION['visitor_id']) ); @@ -64,15 +63,13 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' } } - if (x($_SESSION,'uid')) { - + if (x($_SESSION, 'uid')) { // already logged in user returning - - $check = Config::get('system','paranoia'); + $check = Config::get('system', 'paranoia'); // extra paranoia - if the IP changed, log them out if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) { - logger('Session address changed. Paranoid setting in effect, blocking session. '. - $_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']); + logger('Session address changed. Paranoid setting in effect, blocking session. ' . + $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); nuke_session(); goaway(System::baseUrl()); } @@ -91,61 +88,54 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' // stays logged in for a long time, e.g. with "Remember Me" $login_refresh = false; if (!x($_SESSION['last_login_date'])) { - $_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); + $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); } - if (strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0) { - - $_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); + if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) { + $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); $login_refresh = true; } authenticate_success($r[0], false, false, $login_refresh); } } else { - session_unset(); + if (x($_POST, 'password') && strlen($_POST['password'])) { + $encrypted = hash('whirlpool', trim($_POST['password'])); + } else { + if ((x($_POST, 'openid_url')) && strlen($_POST['openid_url']) || + (x($_POST, 'username')) && strlen($_POST['username'])) { - if (x($_POST,'password') && strlen($_POST['password'])) - $encrypted = hash('whirlpool',trim($_POST['password'])); - else { - if ((x($_POST,'openid_url')) && strlen($_POST['openid_url']) || - (x($_POST,'username')) && strlen($_POST['username'])) { - - $noid = Config::get('system','no_openid'); + $noid = Config::get('system', 'no_openid'); - $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username'])); + $openid_url = trim((strlen($_POST['openid_url']) ? $_POST['openid_url'] : $_POST['username'])); // validate_url alters the calling parameter - $temp_string = $openid_url; // if it's an email address or doesn't resolve to a URL, fail. - - if ($noid || strpos($temp_string,'@') || !validate_url($temp_string)) { + if ($noid || strpos($temp_string, '@') || !validate_url($temp_string)) { $a = get_app(); - notice(t('Login failed.').EOL); + notice(t('Login failed.') . EOL); goaway(System::baseUrl()); // NOTREACHED } // Otherwise it's probably an openid. - try { require_once('library/openid.php'); $openid = new LightOpenID; $openid->identity = $openid_url; $_SESSION['openid'] = $openid_url; $_SESSION['remember'] = $_POST['remember']; - $openid->returnUrl = System::baseUrl(true).'/openid'; + $openid->returnUrl = System::baseUrl(true) . '/openid'; goaway($openid->authUrl()); } catch (Exception $e) { - notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'

'.t('The error message was:').' '.$e->getMessage()); + notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '

' . t('The error message was:') . ' ' . $e->getMessage()); } // NOTREACHED } } - if (x($_POST,'auth-params') && $_POST['auth-params'] === 'login') { - + if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') { $record = null; $addon_auth = array( @@ -162,12 +152,11 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' * and later plugins should not interfere with an earlier one that succeeded. * */ - call_hooks('authenticate', $addon_auth); - if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) + if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) { $record = $addon_auth['user_record']; - else { + } else { // process normal login request @@ -178,23 +167,24 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' dbesc(trim($_POST['username'])), dbesc($encrypted) ); - if (DBM::is_result($r)) + if (DBM::is_result($r)) { $record = $r[0]; + } } if (!$record || !count($record)) { - logger('authenticate: failed login attempt: '.notags(trim($_POST['username'])).' from IP '.$_SERVER['REMOTE_ADDR']); - notice(t('Login failed.').EOL); + logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); + notice(t('Login failed.') . EOL); goaway(System::baseUrl()); } - if (! $_POST['remember']) { + if (!$_POST['remember']) { new_cookie(0); // 0 means delete on browser exit } // if we haven't failed up this point, log them in. $_SESSION['remember'] = $_POST['remember']; - $_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); + $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); authenticate_success($record, true, true); } } @@ -202,8 +192,8 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params' /** * @brief Kills the "Friendica" cookie and all session data */ -function nuke_session() { - +function nuke_session() +{ new_cookie(-3600); // make sure cookie is deleted on browser close, as a security measure session_unset(); session_destroy(); diff --git a/include/oauth.php b/include/oauth.php index c6993d05b0..8834b93555 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -182,93 +182,3 @@ class FKOAuth1 extends OAuthServer { } } -/* -class FKOAuth2 extends OAuth2 { - - private function db_secret($client_secret){ - return hash('whirlpool',$client_secret); - } - - public function addClient($client_id, $client_secret, $redirect_uri) { - $client_secret = $this->db_secret($client_secret); - $r = q("INSERT INTO clients (client_id, pw, redirect_uri) VALUES ('%s', '%s', '%s')", - dbesc($client_id), - dbesc($client_secret), - dbesc($redirect_uri) - ); - - return $r; - } - - protected function checkClientCredentials($client_id, $client_secret = NULL) { - $client_secret = $this->db_secret($client_secret); - - $r = q("SELECT pw FROM clients WHERE client_id = '%s'", - dbesc($client_id)); - - if ($client_secret === NULL) - return $result !== FALSE; - - return $result["client_secret"] == $client_secret; - } - - protected function getRedirectUri($client_id) { - $r = q("SELECT redirect_uri FROM clients WHERE client_id = '%s'", - dbesc($client_id)); - if ($r === FALSE) - return FALSE; - - return isset($r[0]["redirect_uri"]) && $r[0]["redirect_uri"] ? $r[0]["redirect_uri"] : NULL; - } - - protected function getAccessToken($oauth_token) { - $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'", - dbesc($oauth_token)); - - if (DBM::is_result($r)) - return $r[0]; - return null; - } - - - - protected function setAccessToken($oauth_token, $client_id, $expires, $scope = NULL) { - $r = q("INSERT INTO tokens (id, client_id, expires, scope) VALUES ('%s', '%s', %d, '%s')", - dbesc($oauth_token), - dbesc($client_id), - intval($expires), - dbesc($scope)); - - return $r; - } - - protected function getSupportedGrantTypes() { - return array( - OAUTH2_GRANT_TYPE_AUTH_CODE, - ); - } - - - protected function getAuthCode($code) { - $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'", - dbesc($code)); - - if (DBM::is_result($r)) - return $r[0]; - return null; - } - - protected function setAuthCode($code, $client_id, $redirect_uri, $expires, $scope = NULL) { - $r = q("INSERT INTO auth_codes - (id, client_id, redirect_uri, expires, scope) VALUES - ('%s', '%s', '%s', %d, '%s')", - dbesc($code), - dbesc($client_id), - dbesc($redirect_uri), - intval($expires), - dbesc($scope)); - return $r; - } - -} -*/ diff --git a/include/user.php b/include/user.php index be03637df9..d82671b86b 100644 --- a/include/user.php +++ b/include/user.php @@ -4,13 +4,12 @@ use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Database\DBM; -require_once('include/network.php'); -require_once('include/plugin.php'); -require_once('include/text.php'); -require_once('include/pgettext.php'); -require_once('include/datetime.php'); -require_once('include/enotify.php'); - +require_once 'include/network.php'; +require_once 'include/plugin.php'; +require_once 'include/text.php'; +require_once 'include/pgettext.php'; +require_once 'include/datetime.php'; +require_once 'include/enotify.php'; function create_user($arr) { @@ -388,7 +387,7 @@ function user_create_self_contact($uid) { * @param string $email * @param string $sitename * @param string $username - * @return NULL|boolean from notification() and email() inherited + * @return NULL|boolean from notification() and email() inherited */ function send_register_pending_eml($email, $sitename, $username) { $body = deindent(t(' diff --git a/mod/removeme.php b/mod/removeme.php index b1ad2e5ca0..2f4349a704 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -4,21 +4,21 @@ use Friendica\App; use Friendica\Core\System; use Friendica\Model\User; -function removeme_post(App $a) { - - if (! local_user()) { +function removeme_post(App $a) +{ + if (!local_user()) { return; } - if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) { + if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) { return; } - if ((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) { + if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) { return; } - if ((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) { + if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) { return; } @@ -32,12 +32,11 @@ function removeme_post(App $a) { User::remove($a->user['uid']); // NOTREACHED } - } -function removeme_content(App $a) { - - if (! local_user()) { +function removeme_content(App $a) +{ + if (!local_user()) { goaway(System::baseUrl()); } @@ -59,5 +58,4 @@ function removeme_content(App $a) { )); return $o; - } diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php index c15ccfb986..73726098e9 100644 --- a/src/Worker/Queue.php +++ b/src/Worker/Queue.php @@ -1,4 +1,5 @@ PRIORITY_LOW, 'dont_fork' => true), "Queue", (int)$q_item['id']); + logger('Call queue for id ' . $q_item['id']); + Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Queue", (int) $q_item['id']); } } return; @@ -88,10 +90,10 @@ class Queue { return; } - $dead = Cache::get($cachekey_deadguy.$c[0]['notify']); + $dead = Cache::get($cachekey_deadguy . $c[0]['notify']); if (!is_null($dead) && $dead) { - logger('queue: skipping known dead url: '.$c[0]['notify']); + logger('queue: skipping known dead url: ' . $c[0]['notify']); update_queue_time($q_item['id']); return; } @@ -99,17 +101,17 @@ class Queue { $server = PortableContact::detectServer($c[0]['url']); if ($server != "") { - $vital = Cache::get($cachekey_server.$server); + $vital = Cache::get($cachekey_server . $server); if (is_null($vital)) { - logger("Check server ".$server." (".$c[0]["network"].")"); + logger("Check server " . $server . " (" . $c[0]["network"] . ")"); $vital = PortableContact::checkServer($server, $c[0]["network"], true); - Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR); + Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR); } if (!is_null($vital) && !$vital) { - logger('queue: skipping dead server: '.$server); + logger('queue: skipping dead server: ' . $server); update_queue_time($q_item['id']); return; } @@ -134,24 +136,24 @@ class Queue { switch ($contact['network']) { case NETWORK_DFRN: - logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>'); + logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>'); $deliver_status = DFRN::deliver($owner, $contact, $data); if ($deliver_status == (-1)) { update_queue_time($q_item['id']); - Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); + Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); } else { remove_queue_item($q_item['id']); } break; case NETWORK_OSTATUS: if ($contact['notify']) { - logger('queue: slapdelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>'); + logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>'); $deliver_status = slapper($owner, $contact['notify'], $data); if ($deliver_status == (-1)) { update_queue_time($q_item['id']); - Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); + Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); } else { remove_queue_item($q_item['id']); } @@ -159,12 +161,12 @@ class Queue { break; case NETWORK_DIASPORA: if ($contact['notify']) { - logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>'); + logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>'); $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true); if ($deliver_status == (-1)) { update_queue_time($q_item['id']); - Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); + Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); } else { remove_queue_item($q_item['id']); } @@ -182,7 +184,7 @@ class Queue { } break; } - logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>'); + logger('Deliver status ' . (int) $deliver_status . ' for item ' . $q_item['id'] . ' to ' . $contact['name'] . ' <' . $contact['url'] . '>'); return; }