diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-07-12 12:11:11 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-07-12 12:11:11 +0200 |
| commit | daed1bed57811b677073f4678ef35ea86c8e7a1d (patch) | |
| tree | 856b682c57b797c7d9a35571aba39b73dd5b0d90 /apps/dav/lib | |
| parent | b7de6d7a24f76c91dffe1644c4b24e0a27b43c14 (diff) | |
| download | nextcloud-server-daed1bed57811b677073f4678ef35ea86c8e7a1d.tar.gz nextcloud-server-daed1bed57811b677073f4678ef35ea86c8e7a1d.zip | |
Also shorten the name of the invitation tokens
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/dav/lib')
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php b/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php index e855b57ee9f..942f8e23ecb 100644 --- a/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php +++ b/apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php @@ -45,7 +45,7 @@ class CleanupInvitationTokenJob extends TimedJob { public function run($argument) { $query = $this->db->getQueryBuilder(); - $query->delete('calendar_invitation_tokens') + $query->delete('calendar_invitations') ->where($query->expr()->lt('expiration', $query->createNamedParameter($this->timeFactory->getTime()))) ->execute(); diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index 40b4ee355f3..4065c21b8a1 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -536,7 +536,7 @@ class IMipPlugin extends SabreIMipPlugin { $uid = $vevent->{'UID'}; $query = $this->db->getQueryBuilder(); - $query->insert('calendar_invitation_tokens') + $query->insert('calendar_invitations') ->values([ 'token' => $query->createNamedParameter($token), 'attendee' => $query->createNamedParameter($attendee), diff --git a/apps/dav/lib/Controller/InvitationResponseController.php b/apps/dav/lib/Controller/InvitationResponseController.php index 08298a29f0f..e3bdab90aaf 100644 --- a/apps/dav/lib/Controller/InvitationResponseController.php +++ b/apps/dav/lib/Controller/InvitationResponseController.php @@ -162,7 +162,7 @@ class InvitationResponseController extends Controller { private function getTokenInformation(string $token) { $query = $this->db->getQueryBuilder(); $query->select('*') - ->from('calendar_invitation_tokens') + ->from('calendar_invitations') ->where($query->expr()->eq('token', $query->createNamedParameter($token))); $stmt = $query->execute(); $row = $stmt->fetch(\PDO::FETCH_ASSOC); diff --git a/apps/dav/lib/Migration/Version1006Date20180619154313.php b/apps/dav/lib/Migration/Version1006Date20180619154313.php index 8fb82ffed67..91d4826c277 100644 --- a/apps/dav/lib/Migration/Version1006Date20180619154313.php +++ b/apps/dav/lib/Migration/Version1006Date20180619154313.php @@ -22,8 +22,8 @@ class Version1006Date20180619154313 extends SimpleMigrationStep { /** @var ISchemaWrapper $schema */ $schema = $schemaClosure(); - if (!$schema->hasTable('calendar_invitation_tokens')) { - $table = $schema->createTable('calendar_invitation_tokens'); + if (!$schema->hasTable('calendar_invitations')) { + $table = $schema->createTable('calendar_invitations'); $table->addColumn('id', Type::BIGINT, [ 'autoincrement' => true, @@ -62,8 +62,8 @@ class Version1006Date20180619154313 extends SimpleMigrationStep { 'unsigned' => true, ]); - $table->setPrimaryKey(['id'], 'calendar_invitation_tokens_id_idx'); - $table->addIndex(['token'], 'calendar_invitation_tokens_token_idx'); + $table->setPrimaryKey(['id']); + $table->addIndex(['token'], 'calendar_invitation_tokens'); return $schema; } |