Merge pull request #255 from owncloud/scrutinizer-fixes

Scrutinizer fixes

ajax/documentController.php

@@ -63,7 +63,7 @@ class DocumentController extends Controller{
 	
 
 	public static function rename($args){
-		$uid = self::preDispatch();
+		self::preDispatch();
 		
 		$fileId = intval(Helper::getArrayValueByKey($args, 'file_id', 0));
 		$name = Helper::getArrayValueByKey($_POST, 'name');

ajax/otpoll.php

@@ -67,6 +67,7 @@ try{
 				try {
 					$member->updateActivity($memberId);
 				} catch (\Exception $e){
+					//Db error. Not critical
 				}
 
 				// TODO handle the case ($currentHead == "") && ($seqHead != "")

ajax/sessionController.php

@@ -18,7 +18,7 @@ class SessionController extends Controller{
 		self::preDispatchGuest();
 		
 		$uid = Helper::getArrayValueByKey($_POST, 'name');
-		$guestUid = substr($uid, 0, 16);
+		$uid = substr($uid, 0, 16);
 		
 		try {
 			$token = Helper::getArrayValueByKey($args, 'token');
@@ -74,9 +74,9 @@ class SessionController extends Controller{
 			$currentMember = new Db_Member();
 			$currentMember->load($memberId);
 			if (is_null($currentMember->getIsGuest()) || $currentMember->getIsGuest()){
-				$uid = self::preDispatchGuest();
+				self::preDispatchGuest();
 			} else {
-				self::preDispatch();
+				$uid = self::preDispatch();
 			}
 			
 			//check if member belongs to the session
@@ -84,7 +84,8 @@ class SessionController extends Controller{
 				throw new \Exception($memberId . ' does not belong to session ' . $esId);
 			}
 			
-			$sessionRevision = @$_SERVER['HTTP_WEBODF_SESSION_REVISION'];
+			// Extra info for future usage
+			// $sessionRevision = Helper::getArrayValueByKey($_SERVER, 'HTTP_WEBODF_SESSION_REVISION');
 			
 			$stream = fopen('php://input','r');
 			if (!$stream){
@@ -110,10 +111,12 @@ class SessionController extends Controller{
 			} catch (\Exception $e){
 				//File was deleted or unshared. We need to save content as new file anyway
 				//Sorry, but for guests it would be lost :(
-				$view = new \OC\Files\View('/' . $uid . '/files');
+				if (isset($uid)){
+					$view = new \OC\Files\View('/' . $uid . '/files');
 		
-				$dir = \OCP\Config::getUserValue(\OCP\User::getUser(), 'documents', 'save_path', '');
-				$path = Helper::getNewFileName($view, $dir . 'New Document.odt');
+					$dir = \OCP\Config::getUserValue(\OCP\User::getUser(), 'documents', 'save_path', '');
+					$path = Helper::getNewFileName($view, $dir . 'New Document.odt');
+				}
 			}
 			
 			$member = new Db_Member();

lib/converter.php

@@ -30,7 +30,7 @@ class Converter {
 	
 	public static function checkConnection(){
 		$expected = file_get_contents(__DIR__ . '/response.odt');
-		$converted = self::convertExternal('');
+		$converted = self::convertExternal('', 'application/vnd.oasis.opendocument.text');
 		
 		return $converted === $expected;
 	}

lib/db.php

@@ -100,12 +100,12 @@ abstract class Db {
 		}
 		$count = count($value);
 		if ($count===0){
-			return 0;
+			return;
 		} elseif ($count===1){
-			$result = $this->execute('DELETE FROM ' . $this->tableName . ' WHERE `'. $field .'` =?', $value);
+			$this->execute('DELETE FROM ' . $this->tableName . ' WHERE `'. $field .'` =?', $value);
 		} else {
 			$stmt = $this->buildInQuery($field, $value);
-			$result = $this->execute('DELETE FROM ' . $this->tableName . ' WHERE ' . $stmt, $value);
+			$this->execute('DELETE FROM ' . $this->tableName . ' WHERE ' . $stmt, $value);
 		}
 	}
 	

lib/db/member.php

@@ -12,6 +12,12 @@
 
 namespace OCA\Documents;
 
+/*
+ * @method boolean getIsGuest()
+ * @method string getEsId()
+ * @method string getToken()
+ */
+
 class Db_Member extends Db{
 
 	const DB_TABLE = '`*PREFIX*documents_member`';

lib/db/session.php

@@ -13,7 +13,14 @@
 namespace OCA\Documents;
 
 /**
- *  Session management 
+ *  Session management
+ * 
+ * @method string getEsId()
+ * @method int getFileId()
+ * @method string getGenesisUrl()
+ * @method string getOwner()
+ * @method string getGenesisHash()
+ * 
  */
 class Db_Session extends \OCA\Documents\Db {