Merge pull request #95 from v1r0x/rem-share-mgr0.7.2.2

remove unused share manager

3 files changed, 2 insertions, 32 deletions

diff --git a/appinfo/application.php b/appinfo/application.php
index 123e436d..8a13efc0 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -44,7 +44,6 @@ class Application extends App {
 				$c->query('Request'),
 				$c->query('UserManager'),
 				$c->query('GroupManager'),
-				$server->getShareManager(),
 				$c->query('AvatarManager'),
 				$c->query('Logger'),
 				$c->query('L10N'),
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 2b2b1806..c31d2b63 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -30,7 +30,6 @@ use \OCA\Polls\Db\ParticipationTextMapper;
 use \OCA\Polls\Db\TextMapper;
 use \OCP\IUserManager;
 use \OCP\IGroupManager;
-use \OCP\Share\IManager;
 use \OCP\IAvatarManager;
 use \OCP\ILogger;
 use \OCP\IL10N;
@@ -60,13 +59,11 @@ class PageController extends Controller {
     private $trans;
     private $userMgr;
     private $groupManager;
-    private $shareManager;
     private $allowedGroups;
     private $allowedUsers;
     public function __construct($appName, IRequest $request,
                 IUserManager $manager,
                 IGroupManager $groupManager,
-                IManager $shareManager,
                 IAvatarManager $avatarManager,
                 ILogger $logger,
                 IL10N $trans,
@@ -83,7 +80,6 @@ class PageController extends Controller {
         parent::__construct($appName, $request);
         $this->manager = $manager;
         $this->groupManager = $groupManager;
-        $this->shareManager = $shareManager;
         $this->avatarManager = $avatarManager;
         $this->logger = $logger;
         $this->trans = $trans;
@@ -98,30 +94,6 @@ class PageController extends Controller {
         $this->participationTextMapper = $ParticipationTextMapper;
         $this->textMapper = $textMapper;
         $this->userMgr = \OC::$server->getUserManager();
-        
-        /*if(!$this->shareManager->sharingDisabledForUser($this->userId)) {
-            if($this->shareManager->shareWithGroupMembersOnly()) {
-               $groups = OCP\OC_Group::getUserGroups($this->userId);
-            } else if($this->shareManager->allowGroupSharing()) {
-               $groups = \OC_Group::getGroups();
-            }
-            sort($groups, SORT_NATURAL | SORT_FLAG_CASE );
-            $this->allowedGroups = $groups;
-        }
-        $allUsers = \OC_User::GetUsers();
-        if (!(\OC_User::isAdminUser($this->userId))) {
-            $usersSharedGroups = \OC_Group::usersInGroups($this->allowedGroups);
-            $usersNoGroup = array_diff($allUsers, \OC_Group::usersInGroups($allUsers));
-            if($this->shareManager->shareWithGroupMembersOnly()) {
-                $users = $usersSharedGroups;
-            } else {
-                $users = array_merge($usersSharedGroups , $usersNoGroup);
-            }
-        } else {
-            $users = $allUsers;
-        }
-        sort($users, SORT_NATURAL | SORT_FLAG_CASE );
-        $this->allowedUsers = $users;*/
     }
 
     /**
@@ -244,7 +216,7 @@ class PageController extends Controller {
         if($this->userId !== $poll->getOwner()) return new TemplateResponse('polls', 'no.create.tmpl');
         if($poll->getType() === '0') $dates = $this->dateMapper->findByPoll($poll->getId());
         else $dates = $this->textMapper->findByPoll($poll->getId());
-        return new TemplateResponse('polls', 'create.tmpl', ['poll' => $poll, 'dates' => $dates, 'userId' => $this->userId, 'userMgr' => $this->manager, 'shareManager' => $this->shareManager, 'urlGenerator' => $this->urlGenerator]);
+        return new TemplateResponse('polls', 'create.tmpl', ['poll' => $poll, 'dates' => $dates, 'userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator]);
     }
 
     /**
@@ -315,7 +287,7 @@ class PageController extends Controller {
      * @NoCSRFRequired
      */
     public function createPoll() {
-        return new TemplateResponse('polls', 'create.tmpl', ['userId' => $this->userId, 'userMgr' => $this->manager, 'shareManager' => $this->shareManager, 'urlGenerator' => $this->urlGenerator]);
+        return new TemplateResponse('polls', 'create.tmpl', ['userId' => $this->userId, 'userMgr' => $this->manager, 'urlGenerator' => $this->urlGenerator]);
     }
 
     /**
diff --git a/templates/create.tmpl.php b/templates/create.tmpl.php
index 2fe28e42..cac94a13 100644
--- a/templates/create.tmpl.php
+++ b/templates/create.tmpl.php
@@ -6,7 +6,6 @@
     \OCP\Util::addScript('polls', 'jquery.datetimepicker.full.min');
     $userId = $_['userId'];
     $userMgr = $_['userMgr'];
-	$shareMgr = $_['shareManager'];
     $urlGenerator = $_['urlGenerator'];
     $isUpdate = isset($_['poll']) && $_['poll'] !== null;
     $isAnonymous = false;