OC_Share no longer exists. remove hooks that would trigger require_once / autoloading...

diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
index e52f633cf14de17b5d9d11a62d1bee48f99ef4aa..2cbed5bf572dfea39412dbedf5e02515420a1889 100644 (file)
--- a/apps/admin_audit/appinfo/app.php
+++ b/apps/admin_audit/appinfo/app.php
@@ -13,6 +13,9 @@ OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, 'OC
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_read, 'OC_Admin_Audit_Hooks_Handlers', 'read');
 OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_delete, 'OC_Admin_Audit_Hooks_Handlers', 'delete');
 
+//FIXME OC_Share does no longer exist
+/*
 OCP\Util::connectHook('OC_Share', 'public', 'OC_Admin_Audit_Hooks_Handlers', 'share_public');
 OCP\Util::connectHook('OC_Share', 'public-download', 'OC_Admin_Audit_Hooks_Handlers', 'share_public_download');
 OCP\Util::connectHook('OC_Share', 'user', 'OC_Admin_Audit_Hooks_Handlers', 'share_user');
+*/
\ No newline at end of file

diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
index c5aec97d93949ceae324971fd1901e7f4cd89032..17a553837da07ba420649520342ce123e4460746 100644 (file)
--- a/apps/admin_audit/lib/hooks_handlers.php
+++ b/apps/admin_audit/lib/hooks_handlers.php
@@ -63,7 +63,8 @@ class OC_Admin_Audit_Hooks_Handlers {
                $permissions = $params['permissions'];
                $with = $params['with'];
                $user = OCP\User::getUser();
-               $rw = $permissions & OC_Share::WRITE ? 'w' : 'o';
+               //$rw = $permissions & OC_Share::WRITE ? 'w' : 'o'; //FIXME OC_Share no longer exists, hack to check permissions
+               $rw = $permissions & 1 ? 'w' : 'o';
                self::log('Shared "'.$path.'" (r'.$rw.') with user "'.$with.'" by '.$user);
        }
        static protected function log($msg) {

diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 1d219719b2d3167b7d61dd2ce5b5daf78c69c96b..bcbe5985fb6f2b80fc88becb03e0dee9d590de65 100644 (file)
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -4,6 +4,7 @@ $RUNTIME_APPTYPES=array('authentication');
 OC_App::loadApps($RUNTIME_APPTYPES);
 
 OCP\JSON::checkAppEnabled('files_sharing');
+//FIXME lib_share / OC_Share no longer exists
 require_once 'lib_share.php';
 
 //get the path of the shared file
@@ -75,6 +76,7 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
                header("Content-Length: " . OC_Filesystem::filesize($source));
                //download the file
                @ob_clean();
+               //FIXME OC_Share no longer exists
                OCP\Util::emitHook('OC_Share', 'public-download', array('source'=>$source, 'token'=>$token));
                OC_Filesystem::readfile($source);
        }

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index f146676757d1686fa42e98394cadca9d258c6a77..30f0b93a7ffd32a916c806859cd3dab46c5c0e93 100644 (file)
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -64,14 +64,15 @@ class Storage {
                        $files_view = \OCP\Files::getStorage("files");\r
                        $users_view = \OCP\Files::getStorage("files_versions");\r
                        $users_view->chroot(\OCP\User::getUser().'/');\r
-                               \r
-                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
-                               $pos = strpos($source, '/files', 1);\r
-                               $uid = substr($source, 1, $pos - 1);\r
-                               $filename = substr($source, $pos + 6);\r
-                       } else {\r
+                        \r
+                       //FIXME OC_Share no longer exists\r
+                       //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                       //      $pos = strpos($source, '/files', 1);\r
+                       //      $uid = substr($source, 1, $pos - 1);\r
+                       //      $filename = substr($source, $pos + 6);\r
+                       //} else {\r
                                $uid = \OCP\User::getUser();\r
-                       }\r
+                       //}\r
                                \r
                        $versionsFolderName=\OCP\Config::getSystemValue('datadirectory') .  $this->view->getAbsolutePath('');\r
                                \r
@@ -134,13 +135,14 @@ class Storage {
                        $users_view = \OCP\Files::getStorage("files_versions");\r
                        $users_view->chroot(\OCP\User::getUser().'/');\r
                                \r
-                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
-                               $pos = strpos($source, '/files', 1);\r
-                               $uid = substr($source, 1, $pos - 1);\r
-                               $filename = substr($source, $pos + 6);\r
-                       } else {\r
+                       //FIXME OC_Share no longer exists\r
+                       //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                       //      $pos = strpos($source, '/files', 1);\r
+                       //      $uid = substr($source, 1, $pos - 1);\r
+                       //      $filename = substr($source, $pos + 6);\r
+                       //} else {\r
                                $uid = \OCP\User::getUser();\r
-                       }\r
+                       //}\r
                                \r
                        // rollback\r
                        if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {\r
@@ -163,10 +165,11 @@ class Storage {
        public static function isversioned($filename) {\r
                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
                        $versions_fileview = \OCP\Files::getStorage("files_versions");\r
-                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
-                               $pos = strpos($source, '/files', 1);\r
-                               $filename = substr($source, $pos + 6);\r
-                       }\r
+                       //FIXME OC_Share no longer exists\r
+                       //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                       //      $pos = strpos($source, '/files', 1);\r
+                       //      $filename = substr($source, $pos + 6);\r
+                       //}\r
 \r
                        $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');\r
                        \r
@@ -194,13 +197,14 @@ class Storage {
 \r
                if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {\r
 \r
-                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
-                               $pos = strpos($source, '/files', 1);\r
-                               $uid = substr($source, 1, $pos - 1);\r
-                               $filename = substr($source, $pos + 6);\r
-                       } else {\r
+                       //FIXME OC_Share no longer exists\r
+                       //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                       //      $pos = strpos($source, '/files', 1);\r
+                       //      $uid = substr($source, 1, $pos - 1);\r
+                       //      $filename = substr($source, $pos + 6);\r
+                       //} else {\r
                                $uid = \OCP\User::getUser();\r
-                       }\r
+                       //}\r
                        $versions_fileview = \OCP\Files::getStorage('files_versions');\r
                        $versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');\r
                        $versions = array();\r
@@ -267,13 +271,14 @@ class Storage {
        public static function expire($filename) {\r
                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
 \r
-                       if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
-                               $pos = strpos($source, '/files', 1);\r
-                               $uid = substr($source, 1, $pos - 1);\r
-                               $filename = substr($source, $pos + 6);\r
-                       } else {\r
+                       //FIXME OC_Share no longer exists\r
+                       //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
+                       //      $pos = strpos($source, '/files', 1);\r
+                       //      $uid = substr($source, 1, $pos - 1);\r
+                       //      $filename = substr($source, $pos + 6);\r
+                       //} else {\r
                                $uid = \OCP\User::getUser();\r
-                       }\r
+                       //}\r
                        $versions_fileview = \OCP\Files::getStorage("files_versions");\r
                        $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');\r
 \r