1 files changed, 70 insertions, 2 deletions

diff --git a/include/api.php b/include/api.php
index 16dbb569b..b51bcc5f0 100644
--- a/include/api.php
+++ b/include/api.php
@@ -75,8 +75,9 @@ require_once('include/attach.php');
 		try {
 			$oauth = new FKOAuth1();
 			$req = OAuthRequest::from_request();
+
 			list($consumer,$token) = $oauth->verify_request($req);
-//			list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request());
+
 			if (!is_null($token)){
 				$oauth->loginUser($token->uid);
 
@@ -627,6 +628,71 @@ require_once('include/attach.php');
 	api_register_func('api/red/files','api_attach_list', true);
 
 
+
+
+
+	function api_file_meta(&$a,$type) {
+		if (api_user()===false) return false;
+		if(! $_REQUEST['file_id']) return false;
+		$r = q("select * from attach where uid = %d and hash = '%s' limit 1",
+			intval(api_user()),
+			dbesc($_REQUEST['file_id'])
+		);
+		if($r) {
+			unset($r[0]['data']);				
+			$ret = array('attach' => $r[0]);
+			json_return_and_die($ret);
+		}
+		killme();
+	}
+
+	api_register_func('api/red/filemeta', 'api_file_meta', true);
+
+
+	function api_file_data(&$a,$type) {
+		if (api_user()===false) return false;
+		if(! $_REQUEST['file_id']) return false;
+		$start = (($_REQUEST['start']) ? intval($_REQUEST['start']) : 0);
+		$length = (($_REQUEST['length']) ? intval($_REQUEST['length']) : 0);
+
+		$r = q("select * from attach where uid = %d and hash = '%s' limit 1",
+			intval(api_user()),
+			dbesc($_REQUEST['file_id'])
+		);
+		if($r) {
+			$ptr = $r[0];
+			if($length === 0)
+				$length = intval($ptr['filesize']);
+
+			if($ptr['is_dir'])
+				$ptr['data'] = '';
+			elseif(! intval($r[0]['os_storage'])) {
+				$ptr['start'] = $start;
+				$x = substr(dbunescbin($ptr['data'],$start,$length));
+				$ptr['length'] = strlen($x);
+				$ptr['data'] = base64_encode($x);
+			}
+			else {
+				$fp = fopen(dbunescbin($ptr['data']),'r');
+				if($fp) {
+					$seek = fseek($fp,$start,SEEK_SET);
+					$x = fread($fp,$length);
+					$ptr['start'] = $start;
+					$ptr['length'] = strlen($x);
+					$ptr['data'] = base64_encode($x);
+				}
+			}
+				
+			$ret = array('attach' => $ptr);
+			json_return_and_die($ret);
+		}
+		killme();
+	}
+
+	api_register_func('api/red/filedata', 'api_file_data', true);
+
+
+
 	function api_file_detail(&$a,$type) {
 		if (api_user()===false) return false;
 		if(! $_REQUEST['file_id']) return false;
@@ -826,6 +892,7 @@ require_once('include/attach.php');
 			require_once('include/html2bbcode.php');
 
 			$txt = requestdata('htmlstatus');
+
 			if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) {
 
 				$txt = html2bb_video($txt);
@@ -837,9 +904,10 @@ require_once('include/attach.php');
 				$purifier = new HTMLPurifier($config);
 				$txt = $purifier->purify($txt);
 
-				$_REQUEST['body'] = html2bbcode($txt);
 			}
 
+			$_REQUEST['body'] = html2bbcode($txt);
+
 		}
 		else
 			$_REQUEST['body'] = requestdata('status');