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

scrutinizer issues: none worthy of including in 3.0, there will likely be a few hundred more before all is said and done.

Browse Source
This commit is contained in:
zotlabs 2018-01-08 14:45:21 -08:00
parent 0d415fb3c9
commit 62f0266f46
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Module/Api.php
View File

@ -39,10 +39,12 @@ class Api extends \Zotlabs\Web\Controller {
// get consumer/client from request token // get consumer/client from request token
try { try {
$request = OAuth1Request::from_request(); $request = \OAuth1Request::from_request();
} }
catch(\Exception $e) { catch(\Exception $e) {
echo "<pre>"; var_dump($e); killme(); logger('OAuth exception: ' . print_r($e,true));
// echo "<pre>"; var_dump($e);
killme();
} }
@ -52,7 +54,7 @@ class Api extends \Zotlabs\Web\Controller {
if (is_null($app)) if (is_null($app))
return "Invalid request. Unknown token."; return "Invalid request. Unknown token.";
$consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']); $consumer = new \OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']);
$verifier = md5($app['secret'] . local_channel()); $verifier = md5($app['secret'] . local_channel());
set_config('oauth', $verifier, local_channel()); set_config('oauth', $verifier, local_channel());
@ -63,7 +65,7 @@ class Api extends \Zotlabs\Web\Controller {
$glue = '?'; $glue = '?';
if(strstr($consumer->callback_url,$glue)) if(strstr($consumer->callback_url,$glue))
$glue = '?'; $glue = '?';
goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier)); goaway($consumer->callback_url . $glue . "oauth_token=" . \OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . \OAuth1Util::urlencode_rfc3986($verifier));
killme(); killme();
} }

1
boot.php
View File

@ -48,6 +48,7 @@ require_once('include/zid.php');
require_once('include/xchan.php'); require_once('include/xchan.php');
require_once('include/hubloc.php'); require_once('include/hubloc.php');
require_once('include/attach.php'); require_once('include/attach.php');
require_once('include/bbcode.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '3.1' ); define ( 'STD_VERSION', '3.1' );

6
include/event.php
View File

@ -6,6 +6,8 @@
use Sabre\VObject; use Sabre\VObject;
require_once('include/bbcode.php');
/** /**
* @brief Returns an event as HTML. * @brief Returns an event as HTML.
* *
@ -14,7 +16,6 @@ use Sabre\VObject;
*/ */
function format_event_html($ev) { function format_event_html($ev) {
require_once('include/bbcode.php');
if(! ((is_array($ev)) && count($ev))) if(! ((is_array($ev)) && count($ev)))
return ''; return '';
@ -192,7 +193,7 @@ function format_todo_ical($ev) {
function format_ical_text($s) { function format_ical_text($s) {
require_once('include/bbcode.php');
require_once('include/html2plain.php'); require_once('include/html2plain.php');
$s = html2plain(bbcode($s)); $s = html2plain(bbcode($s));
@ -983,7 +984,6 @@ function event_store_item($arr, $event) {
require_once('include/datetime.php'); require_once('include/datetime.php');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/bbcode.php');
$item = null; $item = null;

2
include/import.php
View File

@ -184,7 +184,7 @@ function import_profiles($channel, $profiles) {
* *
* @param array $channel * @param array $channel
* @param array $hublocs * @param array $hublocs
* @param unknown $seize * @param boolean $seize
* @param boolean $moving (optional) default false * @param boolean $moving (optional) default false
*/ */
function import_hublocs($channel, $hublocs, $seize, $moving = false) { function import_hublocs($channel, $hublocs, $seize, $moving = false) {