'
+ el.item.label
+ 'execute(array(
$esId,
$userId,
@@ -26,11 +26,11 @@ class Invite {
time()
));
- return \OCP\DB::insertid(`*PREFIX*office_invite`);
+ return \OCP\DB::insertid(`*PREFIX*documents_invite`);
}
public static function accept($esId){
- $query = \OCP\DB::prepare('UPDATE `*PREFIX*office_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?');
+ $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?');
$query->execute(array(
self::STATUS_ACCEPTED,
$esId,
@@ -39,7 +39,7 @@ class Invite {
}
public static function decline($esId){
- $query = \OCP\DB::prepare('UPDATE `*PREFIX*office_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?');
+ $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?');
$query->execute(array(
self::STATUS_DECLINED,
$esId,
@@ -49,13 +49,13 @@ class Invite {
public static function getAllInvites(){
- $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_invite` WHERE `uid`= ?');
+ $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('office');
+ $l10n = \OCP\Util::getL10N('documents');
return array(
self::STATUS_SENT => $l10n->t('Sent'),
@@ -65,7 +65,7 @@ class Invite {
}
public static function getRecipientStatusesAsArray(){
- $l10n = \OCP\Util::getL10N('office');
+ $l10n = \OCP\Util::getL10N('documents');
return array(
self::STATUS_SENT => $l10n->t('Incoming'),
diff --git a/lib/member.php b/lib/member.php
index ca1ff012..500eef1c 100644
--- a/lib/member.php
+++ b/lib/member.php
@@ -1,7 +1,7 @@
execute(array(
$esId,
\OCP\User::getUser(),
@@ -28,11 +28,11 @@ class Member {
time()
));
- return \OCP\DB::insertid(`*PREFIX*office_member`);
+ return \OCP\DB::insertid(`*PREFIX*documents_member`);
}
public static function getMember($id){
- $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`= ?');
+ $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `member_id`= ?');
$result = $query->execute(array($id));
return $result->fetchRow();
}
@@ -45,13 +45,13 @@ class Member {
$placeholders = array_fill(0, $memberCount, '?');
$stmt = implode(', ', $placeholders);
- $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`IN (' . $stmt . ')');
+ $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `member_id`IN (' . $stmt . ')');
$result = $query->execute($ids);
return $result->fetchAll();
}
public static function updateMemberActivity($memberId){
- $query = \OCP\DB::prepare('UPDATE `*PREFIX*office_member` SET `last_activity`=? WHERE `member_id`=?');
+ $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_member` SET `last_activity`=? WHERE `member_id`=?');
$query->execute(array(
time(),
$memberId
@@ -65,7 +65,7 @@ class Member {
$activeSince = $lastActivity;
}
- $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `es_id`= ? and `last_activity` > ?');
+ $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `es_id`= ? and `last_activity` > ?');
$result = $query->execute(array($esId, $activeSince));
return $result->fetchAll();
}
@@ -78,7 +78,7 @@ class Member {
public static function cleanSession($esId){
$time = self::getInactivityPeriod();
- $query = \OCP\DB::prepare('SELECT `member_id` FROM `*PREFIX*office_member` WHERE `es_id`= ? AND `last_activity`execute(array(
$esId,
$time,
@@ -97,7 +97,7 @@ class Member {
* @param timestamp $time
*/
protected static function deactivate($esId, $time){
- $query = \OCP\DB::prepare('UPDATE `*PREFIX*office_member` SET `status`=? WHERE `es_id`=? AND `last_activity`execute(array(
self::MEMBER_STATUS_INACTIVE,
$esId,
diff --git a/lib/op.php b/lib/op.php
index ba162dcd..bf331e5f 100644
--- a/lib/op.php
+++ b/lib/op.php
@@ -1,6 +1,6 @@
execute(array(
$esId,
$memberId,
@@ -22,7 +22,7 @@ class Op {
));
// throw something - if query fails - thats fatal
- return \OCP\DB::insertid(`*PREFIX*office_op`);
+ return \OCP\DB::insertid(`*PREFIX*documents_op`);
}
public static function addOpsArray($esId, $memberId, $ops){
@@ -38,7 +38,7 @@ class Op {
* @returns "" when there are no Ops, or the seq of the last Op
*/
public static function getHeadSeq($esId){
- $query = \OCP\DB::prepare('SELECT `seq` FROM `*PREFIX*office_op` WHERE `es_id`=? ORDER BY `seq` DESC LIMIT 1');
+ $query = \OCP\DB::prepare('SELECT `seq` FROM `*PREFIX*documents_op` WHERE `es_id`=? ORDER BY `seq` DESC LIMIT 1');
$result = $query->execute(array(
$esId
))
@@ -67,7 +67,7 @@ class Op {
if ($seq == ""){
$seq = -1;
}
- $query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*office_op` WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC');
+ $query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*documents_op` WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC');
$result = $query->execute(array($esId, $seq));
return $result->fetchAll();
}
diff --git a/lib/request.php b/lib/request.php
index bdcfe735..07f51a54 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -1,6 +1,6 @@
self::getUniqueSessionId(),
@@ -32,20 +32,20 @@ class Session {
}
public static function getAll(){
- $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_session`');
+ $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_session`');
$result = $query->execute();
return $result->fetchAll();
}
public static function getSession($id){
- $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_session` WHERE `es_id`= ?');
+ $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_session` WHERE `es_id`= ?');
$result = $query->execute(array($id));
return $result->fetchRow();
}
public static function getInfo($esId){
- $query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*office_session` AS s LEFT JOIN `*PREFIX*office_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`es_id` = ? GROUP BY `m`.`es_id`');
+ $query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*documents_session` AS s LEFT JOIN `*PREFIX*documents_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`es_id` = ? GROUP BY `m`.`es_id`');
$result = $query->execute(
array(
\OCP\User::getUser(),
@@ -61,7 +61,7 @@ class Session {
}
public static function getSessionByFileId($fileId){
- $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_session` WHERE `file_id`= ?');
+ $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_session` WHERE `file_id`= ?');
$result = $query->execute(array($fileId));
return $result->fetchRow();
}
@@ -74,7 +74,7 @@ class Session {
$placeholders = array_fill(0, $fileIdCount, '?');
$stmt = implode(', ', $placeholders);
- $query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*office_session` AS s LEFT JOIN `*PREFIX*office_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`file_id` IN (' . $stmt .') GROUP BY `m`.`es_id`');
+ $query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*documents_session` AS s LEFT JOIN `*PREFIX*documents_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`file_id` IN (' . $stmt .') GROUP BY `m`.`es_id`');
$result = $query->execute(
array_merge(array(\OCP\User::getUser()), $fileIds)
);
diff --git a/lib/storage.php b/lib/storage.php
index f945f113..13386f72 100755
--- a/lib/storage.php
+++ b/lib/storage.php
@@ -1,7 +1,7 @@
is_dir(self::OFFICE_DIRNAME)) {
- $view->mkdir(self::OFFICE_DIRNAME);
+ if (!$view->is_dir(self::DOCUMENTS_DIRNAME)) {
+ $view->mkdir(self::DOCUMENTS_DIRNAME);
}
- //if (!self::$officeView){
- // self::$officeView = new \OC\Files\View('/' . $uid . self::OFFICE_DIRNAME);
+ //if (!self::$documentsView){
+ // self::$documentsView = new \OC\Files\View('/' . $uid . self::DOCUMENTS_DIRNAME);
//}
// it was a bad idea to use a static method.
// to be changed later
- return new \OC\Files\View('/' . $uid . self::OFFICE_DIRNAME);
+ return new \OC\Files\View('/' . $uid . self::DOCUMENTS_DIRNAME);
}
public static function storeDocument($uid, $filePath){
@@ -43,13 +43,13 @@ class View extends \OC\Files\View{
$newName = '/' . sha1($view->file_get_contents($relPath)) . '.odt';
- $view->copy($relPath, self::OFFICE_DIRNAME . $newName);
+ $view->copy($relPath, self::DOCUMENTS_DIRNAME . $newName);
\OC_FileProxy::$enabled = $proxyStatus;
return $newName;
}
public static function getHashByGenesis($uid, $genesisPath){
- $officeView = self::initOfficeView($uid);
- return sha1($officeView->file_get_contents($genesisPath));
+ $documentsView = self::initDocumentsView($uid);
+ return sha1($documentsView->file_get_contents($genesisPath));
}
}
diff --git a/settings.php b/settings.php
index 3536a4f3..a03e6051 100644
--- a/settings.php
+++ b/settings.php
@@ -1,7 +1,7 @@
assign('unstable', $unstable);
return $tmpl->fetchPage();
diff --git a/templates/documents.php b/templates/documents.php
index 433947a4..db1e287d 100755
--- a/templates/documents.php
+++ b/templates/documents.php
@@ -5,7 +5,7 @@
-