open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of kde:owncloud

Browse Source
remotes/origin/stable
Bartek Przybylski 14 years ago
parent e78d1dd676 96ad8a15b4
commit f2229e0427
5 changed files with 47 additions and 55 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .htaccess
  2. 4
      apps/files_sharing/appinfo/app.php
  3. 35
      apps/files_sharing/lib_share.php
  4. 21
      apps/files_sharing/sharedstorage.php
  5. 12
      lib/setup.php

2
.htaccess
Unescape View File

@ -1,5 +1,7 @@
ErrorDocument 404 //owncloud/core/templates/404.php
<IfModule mod_php5.c>
php_value upload_max_filesize 512M
php_value post_max_size 512M
SetEnv htaccessWorking true
</IfModule>
Options -Indexes

4
apps/files_sharing/appinfo/app.php
Unescape View File

@ -1,8 +1,10 @@
<?php
require_once('apps/files_sharing/lib_share.php');
require_once('apps/files_sharing/sharedstorage.php');
OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
OC_Hook::connect("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
OC_Filesystem::registerStorageType("shared", "OC_Filestorage_Shared", array("datadir" => "string"));
OC_Util::addScript("files_sharing", "share");
OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min");

35
apps/files_sharing/lib_share.php
Unescape View File

@ -20,9 +20,6 @@
*
*/
OC_Hook::connect("OC_FILESYSTEM","post_delete", "OC_Share", "deleteItem");
OC_Hook::connect("OC_FILESYSTEM","post_rename", "OC_Share", "renameItem");
/**
* This class manages shared items within the database.
*/
@ -177,6 +174,7 @@ class OC_Share {
$query = OC_DB::prepare("SELECT uid_shared_with, permissions FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ?");
return $query->execute(array($source, OC_User::getUser()))->fetchAll();
}
/**
* Get all items the current user is sharing
* @return An array with all items the user is sharing
@ -301,18 +299,6 @@ class OC_Share {
}
}
/**
* Set the source location to a new value
* @param $oldSource The current source location
* @param $newTarget The new source location
*/
public static function setSource($oldSource, $newSource) {
$oldSource = self::cleanPath($oldSource);
$newSource = self::cleanPath($newSource);
$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET source = REPLACE(source, ?, ?) WHERE uid_owner = ?");
$query->execute(array($oldSource, $newSource, OC_User::getUser()));
}
/**
* Set the target location to a new value
*
@ -360,9 +346,10 @@ class OC_Share {
/**
* Unshare the item from the current user, removes it only from the database and doesn't touch the source file
*
* You must use the pullOutOfFolder() function to unshare a file inside a shared folder and set $newTarget to nothing
* You must use the pullOutOfFolder() function before you call unshareFromMySelf() and set the delete parameter to false to unshare from self a file inside a shared folder
*
* @param $target The target location of the item
* @param $delete (Optional) If true delete the entry from the database, if false the permission is set to UNSHARED
*/
public static function unshareFromMySelf($target, $delete = true) {
$target = self::cleanPath($target);
@ -377,25 +364,23 @@ class OC_Share {
/**
* Remove the item from the database, the owner deleted the file
* @param $arguments Array of arguments passed from OC_HOOK
* @param $arguments Array of arguments passed from OC_Hook
*/
public static function deleteItem($arguments) {
$source = "/".OC_User::getUser()."/files".$arguments['path'];
$source = self::cleanPath($source);
$source = "/".OC_User::getUser()."/files".self::cleanPath($arguments['path']);
$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
$query->execute(array(strlen($source), $source, OC_User::getUser()));
}
/**
* Rename the item in the database, the owner renamed the file
* @param $arguments Array of arguments passed from OC_HOOK
* @param $arguments Array of arguments passed from OC_Hook
*/
public static function renameItem($arguments) {
$oldSource = "/".OC_User::getUser()."/files".$arguments['oldpath'];
$oldSource = self::cleanPath($oldSource);
$newSource = "/".OC_User::getUser()."/files".$arguments['newpath'];
$newSource = self::cleanPath($newSource);
self::setSource($oldSource, $newSource);
$oldSource = "/".OC_User::getUser()."/files".self::cleanPath($arguments['oldpath']);
$newSource = "/".OC_User::getUser()."/files".self::cleanPath($arguments['newpath']);
$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET source = REPLACE(source, ?, ?) WHERE uid_owner = ?");
$query->execute(array($oldSource, $newSource, OC_User::getUser()));
}
}

21
apps/files_sharing/sharedstorage.php
Unescape View File

@ -79,37 +79,37 @@ class OC_Filestorage_Shared extends OC_Filestorage {
public function opendir($path) {
if ($path == "" || $path == "/") {
global $FAKEDIRS;
$path = $this->datadir.$path;
$sharedItems = OC_Share::getItemsInFolder($path);
if (empty($sharedItems)) {
return false;
}
} else {
global $FAKEDIRS;
$files = array();
foreach ($sharedItems as $item) {
// If item is in the root of the shared storage provider add it to the fakedirs
if (dirname($item['target'])."/" == $path) {
// If item is in the root of the shared storage provider and the item exists add it to the fakedirs
if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) {
$files[] = basename($item['target']);
}
}
$FAKEDIRS['shared'] = $files;
return opendir('fakedir://shared');
}
} else {
$source = $this->getSource($path);
if ($source) {
$storage = OC_Filesystem::getStorage($source);
$dh = $storage->opendir($this->getInternalPath($source));
// Remove any duplicate or trailing '/'
$path = rtrim($this->datadir.$path, "/");
$path = preg_replace('{(/)\1+}', "/", $path);
$modifiedItems = OC_Share::getItemsInFolder($source);
if ($modifiedItems && $dh) {
global $FAKEDIRS;
$sources = array();
$targets = array();
// Remove any duplicate or trailing '/'
$path = preg_replace('{(/)\1+}', "/", $path);
$targetFolder = rtrim($this->datadir.$path, "/");
foreach ($modifiedItems as $item) {
// If the item is in the current directory and has a different name than the source, add it to the arrays
if (dirname($item['target']) == $path) {
// If the item is in the current directory and the item exists add it to the arrays
if (dirname($item['target']) == $targetFolder && $this->file_exists($path."/".basename($item['target']))) {
// If the item was unshared from self, add it it to the arrays
if ($item['permissions'] == OC_Share::UNSHARED) {
$sources[] = basename($item['source']);
@ -124,6 +124,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
if (empty($sources)) {
return $dh;
} else {
global $FAKEDIRS;
$files = array();
while (($filename = readdir($dh)) !== false) {
if ($filename != "." && $filename != "..") {

12
lib/setup.php
Unescape View File

@ -273,12 +273,14 @@ class OC_Setup {
* create .htaccess files for apache hosts
*/
private static function createHtaccess() {
global $SERVERROOT;
global $WEBROOT;
$SERVERROOT=OC::$SERVERROOT;
$WEBROOT=OC::$WEBROOT;
$content = "ErrorDocument 404 /$WEBROOT/core/templates/404.php\n";//custom 404 error page
$content.= "php_value upload_max_filesize 20M\n";//upload limit
$content.= "php_value post_max_size 20M\n";
$content.= "SetEnv htaccessWorking true\n";
$content.= '<IfModule mod_php5.c>';
$content.= 'php_value upload_max_filesize 512M';//upload limit
$content.= 'php_value post_max_size 512M';
$content.= 'SetEnv htaccessWorking true';
$content.= '</IfModule>';
$content.= "Options -Indexes\n";
@file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it

Write Preview
Loading…
Cancel
Save