merged share folders from horfic

mschering · Sep 5, 2014 · 4d6b8f3 · 4d6b8f3
1 parent 0309175
commit 4d6b8f3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -1,7 +1,13 @@
 <?php
 require_once(dirname(__FILE__).'/../user_groupoffice.php');
 require_once(dirname(__FILE__).'/../group_groupoffice.php');
+
 $userBackend  = new \OCA\groupoffice\User();
-$groupBackend  = new \OCA\groupoffice\Group();
 OC_User::useBackend($userBackend);
+
+$groupBackend  = new \OCA\groupoffice\Group();
 OC_Group::useBackend($groupBackend);
+
+OC::$CLASSPATH['OC\Files\Storage\Groupoffice'] = 'groupoffice/lib/groupofficestorage.php';
+OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Groupoffice', 'setup');
+OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC\Files\Storage\Groupoffice', 'setup');
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -2,12 +2,17 @@
 <info>
 	<id>groupoffice</id>
 	<name>Group-Office integration</name>
-	<description>Use Group-Office users, groups and files. Group-Office must run on the same server.</description>
+	<description>Use Group-Office users, groups and files. Group-Office must run on the same server. Version 1.4.0 now shows ownFolder and all Shared Folders, a user has access to in Group-Office.</description>
 	<licence>AGPL</licence>
-	<author>Intermesh BV</author>
-	<require>4.93</require>
+	<author>Intermesh BV, ALLMENDA Social Business eG, web wack creations</author>
+	<require>6.0.4</require>
+    <version>1.5.0</version>
 	<shipped>false</shipped>
 	<types>
+        <filesystem/>
 		<authentication/>
 	</types>
+    <documentation>
+        <user>hhttps://www.group-office.com/wiki/OwnCloud</user>
+    </documentation>
 </info>
diff --git a/appinfo/version b/appinfo/version
@@ -1 +1 @@
-1.0.0
+1.5.0
diff --git a/user_groupoffice.php b/user_groupoffice.php
@@ -37,10 +37,10 @@ public function __construct() {
 				'user'=>array(
 					'all'=>array(
 						'/$user/files/Group-Office'=>array(
-							'class'=>"\\OC\\Files\\Storage\\Local",
-							'options'=>array(
-								'datadir'=>\GO::config()->file_storage_path.'users/$user'.$this->_groupoffice_mount
-							),
+							'class' => '\\OC\\Files\\Storage\\Groupoffice',
+                                'options' => array(
+                                    'user' => '$user'
+                                ),
 							'priority'=>150
 						)
 					)