From 62f0266f467a03ce313edd8dc582c5c194cd5396 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 8 Jan 2018 14:45:21 -0800
Subject: scrutinizer issues: none worthy of including in 3.0, there will
 likely be a few hundred more before all is said and done.

---
 Zotlabs/Module/Api.php | 10 ++++++----
 boot.php               |  1 +
 include/event.php      |  6 +++---
 include/import.php     |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Zotlabs/Module/Api.php b/Zotlabs/Module/Api.php
index a2a1aac1d..aa0fca54d 100644
--- a/Zotlabs/Module/Api.php
+++ b/Zotlabs/Module/Api.php
@@ -39,10 +39,12 @@ class Api extends \Zotlabs\Web\Controller {
 					
 			// get consumer/client from request token
 			try {
-				$request = OAuth1Request::from_request();
+				$request = \OAuth1Request::from_request();
 			}
 			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)) 
 					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());
 				set_config('oauth', $verifier, local_channel());
@@ -63,7 +65,7 @@ class Api extends \Zotlabs\Web\Controller {
 					$glue = '?';
 					if(strstr($consumer->callback_url,$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();
 				}
 							
diff --git a/boot.php b/boot.php
index 2917410b4..ae2628bc9 100755
--- a/boot.php
+++ b/boot.php
@@ -48,6 +48,7 @@ require_once('include/zid.php');
 require_once('include/xchan.php');
 require_once('include/hubloc.php');
 require_once('include/attach.php');
+require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'STD_VERSION',             '3.1' );
diff --git a/include/event.php b/include/event.php
index 282c1a9d7..c1cf59425 100644
--- a/include/event.php
+++ b/include/event.php
@@ -6,6 +6,8 @@
 
 use Sabre\VObject;
 
+require_once('include/bbcode.php');
+
 /**
  * @brief Returns an event as HTML.
  *
@@ -14,7 +16,6 @@ use Sabre\VObject;
  */
 function format_event_html($ev) {
 
-	require_once('include/bbcode.php');
 
 	if(! ((is_array($ev)) && count($ev)))
 		return '';
@@ -192,7 +193,7 @@ function format_todo_ical($ev) {
 
 
 function format_ical_text($s) {
-	require_once('include/bbcode.php');
+
 	require_once('include/html2plain.php');
 
 	$s = html2plain(bbcode($s));
@@ -983,7 +984,6 @@ function event_store_item($arr, $event) {
 
 	require_once('include/datetime.php');
 	require_once('include/items.php');
-	require_once('include/bbcode.php');
 
 	$item = null;
 
diff --git a/include/import.php b/include/import.php
index 5a655ce4c..51791347a 100644
--- a/include/import.php
+++ b/include/import.php
@@ -184,7 +184,7 @@ function import_profiles($channel, $profiles) {
  *
  * @param array $channel
  * @param array $hublocs
- * @param unknown $seize
+ * @param boolean $seize
  * @param boolean $moving (optional) default false
  */
 function import_hublocs($channel, $hublocs, $seize, $moving = false) {
-- 
cgit v1.2.3