From d1aee9fe6874081da7ce1d4b0f737d3bb68639c4 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 12 Feb 2014 17:22:00 +0300 Subject: [PATCH] Remove dead code --- ajax/sessionController.php | 21 ---------- ajax/userController.php | 21 ---------- appinfo/routes.php | 14 ------- css/style.css | 13 ------ js/documents.js | 8 ---- lib/invite.php | 79 ------------------------------------- templates/part.sessions.php | 6 --- 7 files changed, 162 deletions(-) delete mode 100644 lib/invite.php delete mode 100644 templates/part.sessions.php diff --git a/ajax/sessionController.php b/ajax/sessionController.php index 0f458c37..fee50ad2 100644 --- a/ajax/sessionController.php +++ b/ajax/sessionController.php @@ -186,25 +186,4 @@ class SessionController extends Controller{ )); } - public static function listAllHtml(){ - self::preDispatch(); - $session = new Db_Session(); - $sessions = $session->getCollection(); - - $preparedSessions = array_map( - function($x){ - return ($x['es_id']); - }, $sessions - ); - - $invites = Invite::getAllInvites(); - if (!is_array($invites)){ - $invites = array(); - } - - $tmpl = new \OCP\Template('documents', 'part.sessions', ''); - $tmpl->assign('invites', $invites); - $tmpl->assign('sessions', $sessions); - echo $tmpl->fetchPage(); - } } diff --git a/ajax/userController.php b/ajax/userController.php index 21646219..1b366916 100644 --- a/ajax/userController.php +++ b/ajax/userController.php @@ -39,27 +39,6 @@ class UserController extends Controller{ \OCP\JSON::success(); } - /** - * Invite users to the editing session - */ - public static function invite(){ - self::preDispatch(); - $invitees = @$_POST['users']; - - if (is_array($invitees)){ - $invitees = array_unique($invitees); - - $esId = @$_POST['esId']; - foreach ($invitees as $userId){ - try { - Invite::add($esId, $userId); - } catch (\Exception $e) { - - } - } - } - \OCP\JSON::success(); - } /** * Stub - sends a generic avatar diff --git a/appinfo/routes.php b/appinfo/routes.php index 6c57cd7d..3a41ffed 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -52,15 +52,6 @@ $this->create('documents_session_info', 'ajax/session/info') ->action('\OCA\Documents\SessionController', 'info') ; -$this->create('documents_session_listhtml', 'ajax/session/listHtml') - ->get() - ->action('\OCA\Documents\SessionController', 'listAllHtml') -; -$this->create('documents_session_listhtml', 'ajax/session/listHtml') - ->post() - ->action('\OCA\Documents\SessionController', 'listAllHtml') -; - $this->create('documents_session_joinasuser', 'ajax/session/joinasuser/{file_id}') ->get() ->action('\OCA\Documents\SessionController', 'joinAsUser') @@ -100,8 +91,3 @@ $this->create('documents_user_disconnectGuest', 'ajax/user/disconnectGuest/{memb ->post() ->action('\OCA\Documents\UserController', 'disconnectGuest') ; - -$this->create('documents_user_invite', 'ajax/user/invite') - ->post() - ->action('\OCA\Documents\UserController', 'invite') -; diff --git a/css/style.css b/css/style.css index 56e58230..13c36867 100755 --- a/css/style.css +++ b/css/style.css @@ -139,19 +139,6 @@ float: left; } -#invite-block{ - position: absolute; - top:3em; - margin-top:-3px; - left:0; - padding: 10px; - background-color: #bbb; -} - -#invitee-list li{ - padding: 5px 0 5px 20px; -} - #mainContainer{ position:absolute; z-index:500; diff --git a/js/documents.js b/js/documents.js index 6cfeafd0..8e32fc55 100644 --- a/js/documents.js +++ b/js/documents.js @@ -299,14 +299,6 @@ var documentsMain = { ); } }, - - sendInvite: function() { - var users = []; - $('input[name=invitee\\[\\]]').each(function(i, e) { - users.push($(e).val()); - }); - $.post(OC.Router.generate('documents_user_invite'), {users: users}); - }, renameDocument: function(name) { var url = OC.Router.generate('documents_rename') + '/' + documentsMain.fileId; diff --git a/lib/invite.php b/lib/invite.php deleted file mode 100644 index ff4934a0..00000000 --- a/lib/invite.php +++ /dev/null @@ -1,79 +0,0 @@ -execute(array( - $esId, - $userId, - self::STATUS_SENT, - time() - )); - - return \OCP\DB::insertid(`*PREFIX*documents_invite`); - } - - public static function accept($esId){ - $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); - $query->execute(array( - self::STATUS_ACCEPTED, - $esId, - \OCP\User::getUser() - )); - } - - public static function decline($esId){ - $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); - $query->execute(array( - self::STATUS_DECLINED, - $esId, - \OCP\User::getUser() - )); - } - - - public static function getAllInvites(){ - $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_invite` WHERE `uid`= ?'); - $result = $query->execute(array(\OCP\User::getUser())); - return $result->fetchAll(); - } - - public static function getSenderStatusesAsArray(){ - $l10n = \OCP\Util::getL10N('documents'); - - return array( - self::STATUS_SENT => $l10n->t('Sent'), - self::STATUS_DECLINED => $l10n->t('Declined'), - self::STATUS_ACCEPTED => $l10n->t('Accepted') - ); - } - - public static function getRecipientStatusesAsArray(){ - $l10n = \OCP\Util::getL10N('documents'); - - return array( - self::STATUS_SENT => $l10n->t('Incoming'), - self::STATUS_DECLINED => $l10n->t('Declined'), - self::STATUS_ACCEPTED => $l10n->t('Accepted') - ); - } -} \ No newline at end of file diff --git a/templates/part.sessions.php b/templates/part.sessions.php deleted file mode 100644 index c7aff1ea..00000000 --- a/templates/part.sessions.php +++ /dev/null @@ -1,6 +0,0 @@ - -
- - -
Session:
-