DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #383 from owncloud/cleanup-file-model

Browse Source 
Remove stinky code, ref #287
This commit is contained in:
VicDeo 2014-10-17 00:15:14 +03:00
commit f741f14ccf
1 changed files with 9 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/file.php
View File

@ -20,14 +20,13 @@
* *
*/ */
namespace OCA\Documents; namespace OCA\Documents;
class File { class File {
protected $fileId; protected $fileId;
protected $owner; protected $owner;
protected $path; protected $path;
protected $sharing; protected $sharing = array();
protected $token =''; protected $token ='';
protected $passwordProtected = false; protected $passwordProtected = false;
@ -43,8 +42,6 @@ class File {
//please send me a link to video tutorial :/ //please send me a link to video tutorial :/
if (!is_null($shareOps)){ if (!is_null($shareOps)){
$this->sharing = $shareOps; $this->sharing = $shareOps;
} else {
$this->sharing = $this->getSharingOps();
} }
} }
@ -97,7 +94,7 @@ class File {
} }
public function checkPassword($password){ public function checkPassword($password){
$shareId = $this->getShareId(); $shareId = $this->sharing[0]['id'];
if (!$this->isPasswordProtected() if (!$this->isPasswordProtected()
|| (\OC::$server->getSession()->exists('public_link_authenticated') || (\OC::$server->getSession()->exists('public_link_authenticated')
&& \OC::$server->getSession()->get('public_link_authenticated') === $shareId && \OC::$server->getSession()->get('public_link_authenticated') === $shareId
@ -109,8 +106,12 @@ class File {
// Check Password // Check Password
$forcePortable = (CRYPT_BLOWFISH != 1); $forcePortable = (CRYPT_BLOWFISH != 1);
$hasher = new \PasswordHash(8, $forcePortable); $hasher = new \PasswordHash(8, $forcePortable);
if ($hasher->CheckPassword($password.\OC_Config::getValue('passwordsalt', ''), if (
$this->getPassword())) { $hasher->CheckPassword(
$password.\OC_Config::getValue('passwordsalt', ''),
$this->getPassword()
)
) {
// Save item id in session for future request // Save item id in session for future request
\OC::$server->getSession()->set('public_link_authenticated', $shareId); \OC::$server->getSession()->set('public_link_authenticated', $shareId);
return true; return true;
@ -143,7 +144,6 @@ class File {
return $permissions; return $permissions;
} }
/** /**
* *
* @return string owner of the current file item * @return string owner of the current file item
@ -196,41 +196,4 @@ class File {
protected function getPassword(){ protected function getPassword(){
return $this->sharing[0]['share_with']; return $this->sharing[0]['share_with'];
} }
protected function getShareId(){
return $this->sharing[0]['id'];
}
protected function getSharingOps(){
$where = 'AND `file_source`=?';
$values = array($this->fileId);
if (\OCP\User::isLoggedIn()){
$where .= ' AND ((`share_type`=' . \OCP\Share::SHARE_TYPE_USER . ' AND `share_with`=?) OR `share_type`=' . \OCP\Share::SHARE_TYPE_LINK . ')';
$values[] = \OCP\User::getUser();
} else {
$where .= ' AND (`share_type`=' . \OCP\Share::SHARE_TYPE_LINK . ')';
}
$query = \OC_DB::prepare('SELECT `*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, '
.'`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
.'`*PREFIX*share`.`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
.'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`'
.'FROM `*PREFIX*share` INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `item_type` = \'file\' ' . $where);
$result = $query->execute($values);
$shares = $result->fetchAll();
$origins = array();
if (is_array($shares)){
foreach ($shares as $share){
$origin = \OCP\Share::resolveReShare($share);
if (!isset($origin['path']) && isset($origin['file_target'])){
$origin['path'] = 'files/' . $origin['file_target'];
}
$origins[] = $origin;
}
}
return $origins;
}
} }