diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8ffd2d3f0e696a9d3fbee50d505a0c2123d19a0
--- /dev/null
+++ b/app/controllers/course/wiki.php
@@ -0,0 +1,1084 @@
+<?php
+/**
+ * wiki.php - wiki controller
+ *
+ * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>, Rasmus Fuhse <fuhse@data-quest.de>
+ * @license GPL2 or any later version
+ * @since 3.3
+ */
+
+class Course_WikiController extends AuthenticatedController
+{
+ protected $allow_nobody = true;
+ protected $with_session = true;
+ protected $_autobind = true;
+
+ public function before_filter(&$action, &$args)
+ {
+ parent::before_filter($action, $args);
+ object_set_visit_module('wiki');
+ $this->range = Context::get();
+ }
+
+ public function page_action($page_id = null)
+ {
+ if ($page_id === null) {
+ $page_id = $this->range->getConfiguration()->WIKI_STARTPAGE_ID;
+ }
+ Navigation::activateItem('/course/wiki/start');
+ PageLayout::setTitle(Navigation::getItem('/course/wiki')->getTitle());
+
+ $this->page = new WikiPage($page_id);
+
+ $sidebar = Sidebar::Get();
+ if (!$this->page->isReadable()) {
+ throw new AccessDeniedException();
+ }
+
+ if (!$this->page->isNew()) {
+ // Table of Contents/QuickLinks
+ $widget = Sidebar::Get()->addWidget(new ListWidget());
+ $widget->setTitle(_('QuickLinks'));
+ $quicklinks = WikiPage::findOneBySQL("`name` = 'toc' AND `range_id` = ?", [$this->range->id]);
+ $toc_content = $quicklinks ? '<div class="wikitoc" id="00toc">' . wikiReady($quicklinks['content'], true, $this->range->id) . '</div>' : '';
+ $toc_content_empty = !trim(strip_tags($toc_content));
+ if (
+ (!$quicklinks && $GLOBALS['perm']->have_studip_perm($this->range->getConfiguration()->WIKI_CREATE_PERMISSION, $this->range->id))
+ || ($quicklinks && $quicklinks->isEditable())
+ ) {
+ $extra = sprintf(
+ '<a href="%s">%s</a>',
+ URLHelper::getLink('dispatch.php/course/wiki/edit_toc'),
+ $toc_content_empty
+ ? Icon::create('add')->asImg(['title' => _('Erstellen')])
+ : Icon::create('edit')->asImg(['title' => _('Bearbeiten')])
+ );
+ $widget->setExtra($extra);
+ }
+ $element = new WidgetElement($toc_content_empty ? _('Keine QuickLinks vorhanden') : $toc_content);
+ $element->icon = Icon::create('link-intern');
+ $widget->addElement($element);
+ }
+
+ $this->edit_perms = $this->range->getConfiguration()->WIKI_CREATE_PERMISSION;
+ if (
+ $this->edit_perms === 'all'
+ || $GLOBALS['perm']->have_studip_perm($this->edit_perms, $this->range->id)
+ ) {
+ $actions = new ActionsWidget();
+ $actions->addLink(
+ _('Neue Wiki-Seite anlegen'),
+ $this->new_pageURL($this->page->id),
+ Icon::create('add'),
+ ['data-dialog' => 'width=700']
+ );
+ if ($GLOBALS['perm']->have_studip_perm('tutor', $this->range->id)) {
+ $actions->addLink(
+ _('Wiki verwalten'),
+ $this->adminURL(),
+ Icon::create('admin'),
+ ['data-dialog' => 'width=700']
+ );
+ }
+ if ($GLOBALS['perm']->have_studip_perm('tutor', $this->range->id)) { //minimum perm tutor necessary
+ $actions->addLink(
+ _('Seiten aus Veranstaltung importieren'),
+ $this->importURL(),
+ Icon::create('import'),
+ ['data-dialog' => 'width=700']
+ );
+ }
+ $sidebar->addWidget($actions);
+ }
+
+ if (!$this->page->isNew()) {
+ //then the wiki is not empty
+ $search = new SearchWidget($this->searchURL());
+ $search->addNeedle(
+ _('Im Wiki suchen'),
+ 'search',
+ true
+ );
+ $sidebar->addWidget($search);
+
+ $sidebar->addWidget($this->getViewsWidget($this->page, 'read'));
+
+ $exports = new ExportWidget();
+ $exports->addLink(
+ _('Als PDF exportieren'),
+ $this->pdfURL($this->page->id),
+ Icon::create('file-pdf')
+ );
+ $sidebar->addWidget($exports);
+ }
+
+ $startPage = WikiPage::find($this->range->getConfiguration()->WIKI_STARTPAGE_ID);
+ $this->contentbar = ContentBar::get()
+ ->setTOC(CoreWiki::getTOC($this->page->parent && $startPage ? $startPage : $this->page, $this->page['name']))
+ ->setIcon(Icon::create('wiki'))
+ ->setInfo(sprintf(
+ _('Version %1$s, geändert von %2$s <br> am %3$s'),
+ $this->page->versionnumber,
+ sprintf(
+ '<a href="%s">%s</a>',
+ URLHelper::getLink('dispatch.php/profile', ['username' => get_username($this->page['user_id'])]),
+ htmlReady(get_fullname($this->page['user_id']))
+ ),
+ date('d.m.Y H:i:s', $this->page['chdate'])
+ ));
+ $action_menu = ActionMenu::get();
+ if ($this->page->isEditable()) {
+ $action_menu->addLink(
+ $this->editURL($this->page),
+ _('Bearbeiten'),
+ Icon::create('edit')
+ );
+ $action_menu->addLink(
+ $this->pagesettingsURL($this->page->id),
+ _('Seiteneinstellungen'),
+ Icon::create('settings'),
+ ['data-dialog' => 'width=700']
+ );
+ $action_menu->addButton(
+ 'delete',
+ _('Seite löschen'),
+ Icon::create('trash'),
+ ['data-confirm' => _('Wollen Sie wirklich die komplette Seite löschen?'), 'form' => 'delete_page']
+ );
+ }
+ $action_menu->addLink(
+ '#',
+ _('Als Vollbild anzeigen'),
+ Icon::create('screen-full'),
+ ['class' => 'fullscreen-trigger hidden-medium-down']
+ );
+ $this->contentbar->setActionMenu($action_menu);
+ }
+
+ public function pagesettings_action(WikiPage $page)
+ {
+ if (!$page->isEditable()) {
+ throw new AccessDeniedException();
+ }
+ $options = [
+ '' => _('Keine')
+ ];
+ $descendants_ids = array_map(
+ function ($d) {
+ return $d->id;
+ },
+ $page->getDescendants()
+ );
+ WikiPage::findEachBySQL(
+ function (WikiPage $p) use ($page, &$options, $descendants_ids) {
+ if ($p->id !== $page->id && !in_array($p->id, $descendants_ids)) {
+ $options[$p->id] = $p->name;
+ }
+ },
+ 'range_id = ? ORDER BY name',
+ [$this->range->id]
+ );
+ $groups = [
+ 'all' => _('Alle'),
+ 'tutor' => _('Lehrende und Tutoren/Tutorinnen'),
+ 'dozent' => _('Nur Lehrende')
+ ];
+ Statusgruppen::findEachBySQL(
+ function (Statusgruppen $group) use (&$groups) {
+ $groups[$group->id] = $group->name;
+ },
+ '`range_id` = ? ORDER BY `name`',
+ [$this->range->id]
+ );
+ $oldname = $page->name;
+ $this->form = \Studip\Forms\Form::fromSORM(
+ $page,
+ [
+ 'legend' => _('Seiteneinstellung'),
+ 'fields' => [
+ 'name' => [
+ 'label' => _('Titel der Seite'),
+ 'required' => true,
+ 'validate' => function ($value, $input) {
+ $page = $input->getContextObject();
+ if ($value !== $page->name) {
+ $page2 = WikiPage::findOneBySQL('`range_id` = :range_id AND `name` = :name', [
+ 'range_id' => $page['range_id'],
+ 'name' => $value
+ ]);
+ if ($page2) {
+ return _('Dieser Name ist bereits vergeben.');
+ }
+ }
+ return true;
+ }
+ ],
+ 'parent_id' => [
+ 'label' => _('Ãœbergeordnete Seite im Inhaltsverzeichnis'),
+ 'type' => 'select',
+ 'options' => $options
+ ],
+ 'read_permission' => [
+ 'label' => _('Lesezugriff für'),
+ 'type' => 'select',
+ 'options' => $groups
+ ],
+ 'write_permission' => [
+ 'label' => _('Schreibzugriff für'),
+ 'type' => 'select',
+ 'options' => $groups
+ ]
+ ]
+ ],
+ $this->pagesettingsURL($page->id)
+ )->addStoreCallback(function ($form, $values) use ($oldname) {
+ if ($values['name'] === $oldname) {
+ return;
+ }
+ $page = $form->getLastPart()->getContextObject();
+ $other_pages = WikiPage::findBySQL(
+ "`range_id` = :range_id AND `page_id` != :page_id AND `content` LIKE :search",
+ [
+ 'page_id' => $page->id,
+ 'range_id' => $page['range_id'],
+ 'search' => '%' . $oldname . '%',
+ ]
+ );
+
+ foreach ($other_pages as $p2) {
+ $p2['content'] = preg_replace(
+ "/\[\[\s*" . $oldname . "\b/",
+ "[[ " . $values['name'],
+ $p2['content']
+ );
+ $p2->store();
+ }
+ })->validate();
+ if (Request::isPost()) {
+ $this->form->store();
+ PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.'));
+ if ($page->isReadable()) {
+ $this->redirect($this->pageURL($page->id));
+ } else {
+ $this->redirect($this->allpagesURL());
+ }
+ return;
+ }
+ $this->render_form($this->form);
+ }
+
+ public function delete_action(WikiPage $page)
+ {
+ if (!Request::isPost() || !CSRFProtection::verifyRequest()) {
+ throw new AccessDeniedException();
+ }
+ $name = $page->name;
+ $page->delete();
+ PageLayout::postSuccess(sprintf(_('Die Seite %s wurde gelöscht.'), htmlReady($name)));
+ $this->redirect($this->allpagesURL());
+ }
+
+ public function allpages_action()
+ {
+ Navigation::activateItem('/course/wiki/allpages');
+ $this->pages = WikiPage::findBySQL(
+ "`range_id` = ? ORDER BY `name` ASC",
+ [$this->range->id]
+ );
+ if ($GLOBALS['perm']->have_studip_perm('tutor', $this->range->id)) {
+ $actions = new ActionsWidget();
+ $actions->addLink(
+ _('Neue Wiki-Seite anlegen'),
+ $this->new_pageURL(),
+ Icon::create('add'),
+ ['data-dialog' => 'width=700']
+ );
+ $actions->addLink(
+ _('Wiki verwalten'),
+ $this->adminURL(),
+ Icon::create('admin'),
+ ['data-dialog' => 'width=700']
+ );
+ Sidebar::Get()->addWidget($actions);
+ }
+
+ $search = new SearchWidget($this->searchURL());
+ $search->addNeedle(
+ _('Im Wiki suchen'),
+ 'search',
+ true
+ );
+ Sidebar::Get()->addWidget($search);
+
+ $widget = new ExportWidget();
+ $widget->addLink(
+ _('Alle Wiki-Seiten als PDF exportieren'),
+ $this->pdf_allpagesURL(),
+ Icon::create('file-pdf')
+ );
+ Sidebar::Get()->addWidget($widget);
+ }
+
+ public function admin_action()
+ {
+ if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->range->id)) {
+ throw new AccessDeniedException();
+ }
+ $this->config = $this->range->getConfiguration();
+ $this->pages = WikiPage::findBySQL(
+ '`range_id` = ? ORDER BY `name` ASC',
+ [$this->range->id]
+ );
+ }
+
+ public function store_course_config_action()
+ {
+ if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->range->id)) {
+ throw new AccessDeniedException();
+ }
+ CSRFProtection::verifyUnsafeRequest();
+ $this->config = $this->range->getConfiguration();
+ $this->config->store('WIKI_STARTPAGE_ID', trim(Request::option('wiki_startpage_id')));
+ if (
+ $this->config->WIKI_CREATE_PERMISSION === 'all'
+ || $GLOBALS['perm']->have_studip_perm($this->config->WIKI_CREATE_PERMISSION, Context::getId())
+ ) {
+ $this->config->store('WIKI_CREATE_PERMISSION', trim(Request::option('wiki_create_permission')));
+ }
+ if (
+ $this->config->WIKI_RENAME_PERMISSION === 'all'
+ || $GLOBALS['perm']->have_studip_perm($this->config->WIKI_RENAME_PERMISSION, $this->range->id)
+ ) {
+ $this->config->store('WIKI_RENAME_PERMISSION', trim(Request::option('wiki_rename_permission')));
+ }
+ PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.'));
+ if (WikiPage::countBySQL('`range_id` = ? ORDER BY `name` ASC', [$this->range->id]) > 0) {
+ $this->redirect($this->allpagesURL());
+ } else {
+ $this->redirect($this->pageURL());
+ }
+ }
+
+ public function edit_action(WikiPage $page = null)
+ {
+ if ($page->isNew() && Request::get('keyword')) {
+ $name = trim(Request::get('keyword'));
+ $page = WikiPage::findOneBySQL('`name` = :name AND `range_id` = :range_id', [
+ 'name' => $name,
+ 'range_id' => Context::getId()
+ ]);
+ if (!$page) {
+ $page = WikiPage::create([
+ 'name' => $name,
+ 'range_id' => Context::getId(),
+ 'parent_id' => Request::option('parent_id', $this->range->getConfiguration()->WIKI_STARTPAGE_ID),
+ ]);
+ }
+ $this->redirect($this->editURL($page));
+ return;
+ }
+ if (!$page->isEditable()) {
+ throw new AccessDeniedException();
+ }
+ Navigation::activateItem('/course/wiki/start');
+ $user = User::findCurrent();
+ WikiOnlineEditingUser::deleteBySQL(
+ "`page_id` = :page_id AND `chdate` < UNIX_TIMESTAMP() - :threshold",
+ [
+ 'page_id' => $page->id,
+ 'threshold' => WikiOnlineEditingUser::$threshold
+ ]
+ );
+ $pageData = [
+ 'page_id' => $page->id,
+ 'user_id' => $user->id
+ ];
+ $online_user = WikiOnlineEditingUser::findOneBySQL(
+ '`page_id` = :page_id AND `user_id` = :user_id',
+ $pageData
+ );
+ if (!$online_user) {
+ $online_user = WikiOnlineEditingUser::build($pageData);
+ }
+ $editingUsers = WikiOnlineEditingUser::countBySQL(
+ "`page_id` = ? AND `editing` = 1 AND `user_id` != ?",
+ [$page->id, $user->id]
+ );
+ $online_user->editing = $editingUsers === 0 ? 1 : 0;
+ $online_user->chdate = time();
+ $online_user->store();
+ $this->me_online = $online_user;
+ $this->online_users = WikiOnlineEditingUser::findBySQL(
+ "JOIN `auth_user_md5` USING (`user_id`)
+ WHERE `page_id` = ?
+ ORDER BY Nachname, Vorname",
+ [$page->id]
+ );
+ $startPage = WikiPage::find($this->range->getConfiguration()->WIKI_STARTPAGE_ID);
+ $this->contentbar = ContentBar::get()
+ ->setTOC(CoreWiki::getTOC($startPage, $page['name']))
+ ->setIcon(Icon::create('wiki'))
+ ->setInfo(_('Zuletzt gespeichert') .': '. '<studip-date-time :timestamp="Math.floor(lastSaveDate / 1000)" :relative="true"></studip-date-time>');
+ }
+
+ public function apply_editing_action(WikiPage $page)
+ {
+ if (!$page->isEditable() || !Request::isPost()) {
+ throw new AccessDeniedException();
+ }
+ $user = User::findCurrent();
+ $pageData = [
+ 'page_id' => $page->id,
+ 'user_id' => $user->id
+ ];
+ $online_user = WikiOnlineEditingUser::findOneBySQL(
+ '`page_id` = :page_id AND `user_id` = :user_id',
+ $pageData
+ );
+ if (!$online_user) {
+ $online_user = WikiOnlineEditingUser::build($pageData);
+ }
+ $editingUsers = WikiOnlineEditingUser::countBySQL(
+ "`page_id` = ? AND `editing` = 1 AND `user_id` != ?",
+ [$page->id, $user->id]
+ );
+ if ($editingUsers > 0) {
+ $online_user->editing_request = 1;
+ } else {
+ $online_user->editing = 1;
+ }
+ $online_user->store();
+ $output = [
+ 'me_online' => $online_user->toArray(),
+ 'users' => $page->getOnlineUsers()
+ ];
+ $this->render_json($output);
+ }
+
+ public function leave_editing_action(WikiPage $page)
+ {
+ if (!$page->isEditable()) {
+ throw new AccessDeniedException();
+ }
+ $user = User::findCurrent();
+ $pageData = [
+ 'page_id' => $page->id,
+ 'user_id' => $user->id
+ ];
+ WikiOnlineEditingUser::deleteBySQL(
+ '`page_id` = :page_id AND `user_id` = :user_id',
+ $pageData
+ );
+ $this->redirect($this->pageURL($page));
+ }
+
+ public function delegate_edit_mode_action(WikiPage $page, $user_id)
+ {
+ if (!$page->isEditable() || !Request::isPost()) {
+ throw new AccessDeniedException();
+ }
+ $user = User::findCurrent();
+ $pageData = [
+ 'page_id' => $page->id,
+ 'user_id' => $user->id
+ ];
+ $online_user_me = WikiOnlineEditingUser::findOneBySQL(
+ '`page_id` = :page_id AND `user_id` = :user_id',
+ $pageData
+ );
+ if (!$online_user_me->editing) {
+ $this->render_json([
+ 'error' => 'not_in_edit_mode'
+ ]);
+ }
+ $online_user_them = WikiOnlineEditingUser::findOneBySQL(
+ '`page_id` = :page_id AND `user_id` = :user_id',
+ ['page_id' => $page->id, 'user_id' => $user_id]
+ );
+ if (!$online_user_them || !$online_user_them->editing_request) {
+ $this->render_json([
+ 'error' => 'user_not_requested_edit_mode'
+ ]);
+ }
+
+ $online_user_me->editing = 0;
+ $online_user_me->store();
+
+ $online_user_them->editing_request = 1; //that will be set to 0 by the user themself
+ $online_user_them->editing = 1;
+ $online_user_them->store();
+
+ $this->render_json([
+ 'message' => 'edit mode delegated'
+ ]);
+ }
+
+ public function save_action(WikiPage $page)
+ {
+ CSRFProtection::verifyUnsafeRequest();
+
+ if (!$page->isEditable()) {
+ throw new AccessDeniedException();
+ }
+
+ $page->content = \Studip\Markup::markAsHtml(trim(Request::get('content')));
+ $page->store();
+ PageLayout::postSuccess(_('Die Seite wurde gespeichert.'));
+ $this->redirect($this->pageURL($page));
+ }
+
+ public function edit_toc_action()
+ {
+ $quicklinks = WikiPage::findOneBySQL(
+ "`name` = 'toc' AND `range_id` = ?",
+ [$this->range->id]
+ );
+ if (!$quicklinks) {
+ $quicklinks = WikiPage::create([
+ 'range_id' => $this->range->id,
+ 'name' => 'toc'
+ ]);
+ }
+ $this->redirect($this->editURL($quicklinks));
+ }
+
+ public function newpages_action()
+ {
+ Navigation::activateItem('/course/wiki/listnew');
+ $statement = DBManager::get()->prepare("
+ SELECT `wiki_pages`.`page_id` AS `id`,
+ 0 AS `is_version`,
+ `wiki_pages`.`chdate` AS `timestamp`
+ FROM `wiki_pages`
+ WHERE `wiki_pages`.`range_id` = :range_id
+
+ UNION
+
+ SELECT `wiki_versions`.`version_id` AS `id`,
+ 1 AS `is_version`,
+ `wiki_versions`.`mkdate` AS `timestamp`
+ FROM `wiki_versions`
+ JOIN `wiki_pages` USING (`page_id`)
+ WHERE `wiki_pages`.`range_id` = :range_id
+ ORDER BY `timestamp`
+ ");
+ $statement->execute([
+ 'range_id' => $this->range->id
+ ]);
+ $this->versions = [];
+ foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
+ if ($row['is_version']) {
+ $this->versions[] = WikiVersion::find($row['id']);
+ } else {
+ $this->versions[] = WikiPage::find($row['id']);
+ }
+ }
+ }
+
+ public function history_action(WikiPage $page)
+ {
+ Navigation::activateItem('/course/wiki/start');
+ Sidebar::Get()->addWidget($this->getViewsWidget($this->page, 'history'));
+ }
+
+ public function version_action(WikiVersion $version)
+ {
+ Navigation::activateItem('/course/wiki/start');
+ Sidebar::Get()->addWidget($this->getViewsWidget($version->page, 'history'));
+ $startPage = WikiPage::find($this->range->getConfiguration()->WIKI_STARTPAGE_ID);
+ $this->contentbar = ContentBar::get()
+ ->setTOC(CoreWiki::getTOC($startPage, $version->page['name']))
+ ->setIcon(Icon::create('wiki'))
+ ->setInfo(sprintf(
+ _('Version %1$s vom %2$s'),
+ $version->versionnumber,
+ date('d.m.Y H:i:s', $version['mkdate'])
+ ));
+ }
+
+ public function blame_action(WikiPage $page)
+ {
+ Navigation::activateItem('/course/wiki/start');
+ Sidebar::Get()->addWidget($this->getViewsWidget($page, 'blame'));
+
+ $version = WikiVersion::findOneBySQL(
+ "`page_id` = ? ORDER BY `mkdate` LIMIT 1",
+ [$page->id]
+ );
+ $lines = Studip\Markup::removeHtml($version->content);
+ $lines = explode("\n", str_replace("\r", '', $lines));
+ $this->line_versions = array_fill(0, count($lines), $version);
+
+ $this->diffarray = WikiDiffer::toDiffLineArray($version->content, $version->user_id);
+ $differ = new WikiDiffer();
+ $k = 0;
+ while ($version && !is_a($version, WikiPage::class)) {
+ $version = $version->successor;
+ if ($version) {
+ $diffarray2 = WikiDiffer::toDiffLineArray($version->content, $version->user_id);
+ $newarray = $differ->arr_compare('diff', $this->diffarray, $diffarray2);
+ $this->diffarray = []; //completely rewrite $this->diffarray with newer version
+ foreach ($newarray as $number => $i) {
+ if ($i->status['diff'] !== '-') {
+ $this->diffarray[] = $i;
+ }
+ if ($i->status['diff'] === '+') {
+ $this->line_versions[$number] = $version;
+ }
+ }
+ }
+ $k++;
+ if ($k > 100) {
+ break;
+ }
+ }
+ $this->diffarray[] = null;
+ }
+
+ public function diff_action(WikiPage $page)
+ {
+ Navigation::activateItem('/course/wiki/start');
+ Sidebar::Get()->addWidget($this->getViewsWidget($page, 'diff'));
+
+ $this->diffs = [];
+ $last_version = null;
+ foreach (array_reverse($page->versions->getArrayCopy()) as $version) {
+ if ($last_version === null) {
+ $last_version = $version;
+ $this->diffs[] = [
+ 'diff' => WikiDiffer::doDiff(
+ Studip\Markup::removeHtml($version->content),
+ ''
+ ),
+ 'version' => $version
+ ];
+ continue;
+ }
+
+ $this->diffs[] = [
+ 'diff' => WikiDiffer::doDiff(
+ Studip\Markup::removeHtml($version->content),
+ Studip\Markup::removeHtml($last_version->content)
+ ),
+ 'version' => $version
+ ];
+
+ $last_version = $version;
+ }
+ $this->diffs[] = [
+ 'diff' => WikiDiffer::doDiff(
+ Studip\Markup::removeHtml($page->content),
+ $last_version !== null ? Studip\Markup::removeHtml($last_version->content) : ''
+ ),
+ 'version' => $page
+ ];
+ }
+
+ public function versiondiff_action (WikiPage $page, $version_id = null)
+ {
+ if ($version_id !== null) {
+ $this->version = WikiVersion::find($version_id);
+ }
+ if (
+ ($this->version && $this->version->page_id != $page->id)
+ || !$page->isReadable()
+ ) {
+ throw new AccessDeniedException();
+ }
+ PageLayout::setTitle(_('Änderungen dieser Version'));
+ $content = $this->version ? $this->version->content : $page->content;
+ $predecessor = $this->version ? $this->version->predecessor : $page->predecessor;
+
+ $this->diff = WikiDiffer::doDiff(
+ Studip\Markup::removeHtml($content),
+ Studip\Markup::removeHtml($predecessor ? $predecessor->content : '')
+ );
+ if (!$this->version) {
+ $this->version = $page;
+ }
+ }
+
+ public function new_page_action($parent_id = null)
+ {
+ if (
+ $this->range->getConfiguration()->WIKI_CREATE_PERMISSION !== 'all'
+ && !$GLOBALS['perm']->have_studip_perm($this->range->getConfiguration()->WIKI_CREATE_PERMISSION, $this->range->id)
+ ) {
+ throw new AccessDeniedException();
+ }
+ $page = new WikiPage();
+ $page->parent_id = $parent_id ?? $this->range->getConfiguration()->WIKI_STARTPAGE_ID;
+ $parent_id = $parent_id ?? $this->range->getConfiguration()->WIKI_STARTPAGE_ID;
+ PageLayout::setTitle(_('Neue Wikiseite erstellen'));
+ $options = [
+ '-' => _('Keine')
+ ];
+ WikiPage::findEachBySQL(
+ function (WikiPage $p) use (&$options) {
+ $options[$p->id] = $p->name;
+ },
+ 'range_id = ? ORDER BY name',
+ [$this->range->id]
+ );
+ $this->form = \Studip\Forms\Form::fromSORM(
+ $page,
+ [
+ 'legend' => _('Daten'),
+ 'fields' => [
+ 'range_id' => [
+ 'type' => 'no',
+ 'mapper' => function () { return $this->range->id; }
+ ],
+ 'name' => [
+ 'required' => true,
+ 'label' => _('Name der Seite'),
+ 'validate' => function ($value, $input) {
+ $name_count = WikiPage::countBySql('`name` = :name AND `range_id` = :range_id', [
+ 'name' => $value,
+ 'range_id' => $this->range->id
+ ]);
+ if ($name_count === 0) {
+ return true;
+ } else {
+ return _('Name existiert schon.');
+ }
+ }
+ ],
+ 'parent_id' => [
+ 'label' => _('Ãœbergeordnete Seite im Inhaltsverzeichnis'),
+ 'type' => 'select',
+ 'options' => $options
+ ],
+ 'autocreate_links' => [
+ 'label' => _('Den Seitennamen der neuen Seite automatisch in anderen Wikiseiten verlinken.'),
+ 'type' => 'checkbox',
+ 'permission' => WikiPage::countBySql("`range_id` = ?", [$this->range->id]) > 0
+ ]
+ ]
+ ],
+ $this->allpagesURL()
+ )->addStoreCallback(function ($form, $values) {
+ $page = $form->getLastPart()->getContextObject();
+ $other_pages = WikiPage::countBySQL(
+ "`range_id` = :range_id AND `page_id` != :page_id",
+ [
+ 'page_id' => $page->id,
+ 'range_id' => $page->range_id,
+ ]
+ );
+ if ($other_pages == 0) {
+ $this->range->getConfiguration()->store('WIKI_STARTPAGE_ID', $page->id);
+ }
+ if (Request::bool('autocreate_links')) {
+ $pages = WikiPage::findBySQL(
+ "`range_id` = :range_id AND `content` LIKE :search",
+ [
+ 'range_id' => $this->range->id,
+ 'search' => '%' . $values['name'] . '%',
+ ]
+ );
+ foreach ($pages as $page) {
+ $page->content = preg_replace(
+ "/\b" . $values['name'] . "\b/",
+ '[[ ' . $values['name'] . ' ]]',
+ $page->content
+ );
+ $page->store();
+ }
+ }
+ }
+ )->setURL($this->new_pageURL($parent_id))
+ ->validate();
+ if (Request::isPost()) {
+ $this->form->store();
+ $this->redirect($this->editURL($page));
+ } else {
+ $this->render_form($this->form);
+ }
+ }
+
+ public function search_action()
+ {
+ Navigation::activateItem('/course/wiki/allpages');
+ if (Request::get('search')) {
+ $statement = DBManager::get()->prepare("
+ SELECT `wiki_pages`.`page_id`,
+ `wiki_pages`.`name` LIKE :searchterm AS `is_in_name`,
+ `wiki_pages`.`content` LIKE :searchterm AS `is_in_content`,
+ `wiki_versions`.`content` LIKE :searchterm AS `is_in_history`,
+ `wiki_versions`.`name` LIKE :searchterm AS `is_in_old_name`,
+ `wiki_versions`.`version_id`
+ FROM `wiki_pages`
+ LEFT JOIN `statusgruppe_user` ON (`statusgruppe_user`.`statusgruppe_id` = `wiki_pages`.`read_permission`)
+ LEFT JOIN `wiki_versions` ON (`wiki_versions`.`page_id` = `wiki_pages`.`page_id` AND (`wiki_versions`.`content` LIKE :searchterm OR `wiki_versions`.`name` LIKE :searchterm))
+ WHERE `wiki_pages`.`range_id` = :range_id
+ AND (`wiki_pages`.`name` LIKE :searchterm
+ OR `wiki_pages`.`content` LIKE :searchterm
+ OR `wiki_versions`.`content` LIKE :searchterm
+ OR `wiki_versions`.`name` LIKE :searchterm
+ )
+ AND (
+ `wiki_pages`.`read_permission` = 'all'
+ OR `statusgruppe_user`.`user_id` = :user_id
+ OR `wiki_pages`.`read_permission` = :perm
+ OR (`wiki_pages`.`read_permission` = 'tutor' AND :perm = 'dozent')
+ )
+ ORDER BY `is_in_name` DESC, `is_in_content` DESC, `is_in_old_name` DESC, `is_in_history` DESC
+ ");
+ $search = str_replace(['\\', '_', '%'], ['\\\\', '\\_', '\\%'], Request::get('search'));
+ $perm = $GLOBALS['perm']->get_perm();
+ if (in_array($perm, ['admin', 'root'])) {
+ $perm = 'dozent';
+ }
+ $statement->execute([
+ 'range_id' => $this->range->id,
+ 'searchterm' => '%' . $search . '%',
+ 'perm' => $perm,
+ 'user_id' => User::findCurrent()->id
+ ]);
+ $data = $statement->fetchAll(PDO::FETCH_ASSOC);
+ $this->pages = [];
+ foreach ($data as $row) {
+ if (!isset($this->pages[$row['page_id']])) {
+ $this->pages[$row['page_id']] = [
+ 'page' => WikiPage::find($row['page_id']),
+ 'is_in_name' => $row['is_in_name'],
+ 'is_in_content' => $row['is_in_content'],
+ 'is_in_history' => $row['is_in_history'],
+ 'is_in_old_name' => $row['is_in_old_name'],
+ 'versions' => [$row['version_id']]
+ ];
+ } else {
+ $this->pages[$row['page_id']]['versions'][] = $row['version_id'];
+ $this->pages[$row['page_id']]['is_in_name'] = max($this->pages[$row['page_id']]['is_in_name'], $row['is_in_name']);
+ $this->pages[$row['page_id']]['is_in_content'] = max($this->pages[$row['page_id']]['is_in_content'], $row['is_in_content']);
+ $this->pages[$row['page_id']]['is_in_history'] = max($this->pages[$row['page_id']]['is_in_history'], $row['is_in_history']);
+ $this->pages[$row['page_id']]['is_in_old_name'] = max($this->pages[$row['page_id']]['is_in_old_name'], $row['is_in_old_name']);
+ }
+ }
+ } else {
+ $this->redirect($this->pageURL());
+ }
+
+ $search = new SearchWidget($this->searchURL());
+ $search->addNeedle(
+ _('Im Wiki suchen'),
+ 'search',
+ true
+ );
+ Sidebar::Get()->addWidget($search);
+ }
+
+ public function pdf_action(WikiPage $page)
+ {
+ if (!$page->isReadable()) {
+ throw new AccessDeniedException();
+ }
+ $document = new ExportPDF();
+ $document->SetTitle(_('Wiki: ') . $page->name);
+ $document->setHeaderTitle(sprintf(_('Wiki von "%s"'), $this->range->name));
+ $document->setHeaderSubtitle(sprintf(_('Seite: %s'), $page->name));
+ $document->addPage();
+ $content = $page->content;
+ //remove wiki-links:
+ $content = preg_replace('/\[\[[^|\]]*\|([^]]*)\]\]/', '$1', $content);
+ $content = preg_replace('/\[\[([^|\]]*)\]\]/', '$1', $content);
+ $document->writeHTML($content);
+ $this->render_pdf(
+ $document,
+ Context::getHeaderLine() . ' - ' . $page->name . '.pdf',
+ true
+ );
+ }
+
+ public function pdf_allpages_action()
+ {
+ if (!$GLOBALS['perm']->have_studip_perm('user', Context::getId())) {
+ throw new AccessDeniedException();
+ }
+ $pages = WikiPage::findBySql('`range_id` = ? ORDER BY `name` ASC', [Context::getId()]);
+
+ $document = new ExportPDF();
+ $document->SetTitle(_('Wiki: ') . Context::get()->name);
+ $document->setHeaderTitle(sprintf(_('Wiki von "%s"'), Context::get()->name));
+
+ foreach ($pages as $page) {
+ if (!$page->isReadable()) {
+ continue;
+ }
+
+ $document->setHeaderSubtitle(sprintf(_('Seite: %s'), $page->name));
+ $document->addPage();
+
+ // We need the @ in front since TCPDF might throw warning that can lead
+ // to errors viewing the document
+ $content = $page->content;
+ //remove wiki-links:
+ $content = preg_replace('/\[\[[^|\]]*\|([^]]*)\]\]/', '$1', $content);
+ $content = preg_replace('/\[\[([^|\]]*)\]\]/', '$1', $content);
+ //@$document->addContent($content);
+ @$document->writeHTML($content);
+ }
+ $this->render_pdf(
+ $document,
+ Context::getHeaderLine() . '.pdf',
+ true
+ );
+ }
+
+ protected function getViewsWidget(WikiPage $page, string $action): ViewsWidget
+ {
+ $views = new ViewsWidget();
+ $link = $views->addLink(
+ _('Lesen'),
+ $this->pageURL($page)
+ )->setActive($action === 'read');
+ $link = $views->addLink(
+ _('Seiten-Historie'),
+ $this->historyURL($page)
+ )->setActive($action === 'history');
+ $link = $views->addLink(
+ _('Änderungsliste'),
+ $this->diffURL($page)
+ )->setActive($action === 'diff');
+ $link = $views->addLink(
+ _('Text mit Autor/-innenzuordnung'),
+ $this->blameURL($page)
+ )->setActive($action === 'blame');
+ return $views;
+ }
+
+
+ /**
+ * This action is responsible for importing wiki pages into the wiki
+ * of a course from another course.
+ */
+ public function import_action()
+ {
+ $edit_perms = $this->range->getConfiguration()->WIKI_CREATE_PERMISSION;
+ if ($edit_perms !== 'dozent') {
+ $edit_perms = 'tutor';
+ }
+ if (!$GLOBALS['perm']->have_studip_perm($edit_perms, $this->range->id)) {
+ throw new AccessDeniedException(_('Sie haben keine Berechtigung, Änderungen an Wiki-Seiten vorzunehmen!'));
+ }
+
+ if (!$this->range) {
+ PageLayout::postError(
+ _('Die ausgewählte Veranstaltung wurde nicht gefunden!')
+ );
+ }
+
+ $this->course_search = new QuickSearch(
+ 'selected_range_id',
+ new MyCoursesSearch(
+ 'Seminar_id',
+ $GLOBALS['perm']->get_perm(),
+ [
+ 'userid' => User::findCurrent()->id,
+ 'exclude' => [$this->range->id],
+ 'institutes' => array_column(Institute::getMyInstitutes(), 'Institut_id')
+ ],
+ 's.`Seminar_id` IN (
+ SELECT range_id FROM wiki_pages
+ WHERE range_id = s.`Seminar_id`
+ )'
+ )
+ );
+
+ $this->course_search->fireJSFunctionOnSelect(
+ "function() {jQuery(this).closest('form').submit();}"
+ );
+
+ $this->show_wiki_page_form = false;
+ $this->bad_course_search = false;
+ $this->success = false;
+
+ //The following steps are identical for the search and the import.
+ if (Request::submittedSome('selected_range_id', 'import')) {
+ CSRFProtection::verifyUnsafeRequest();
+
+ //Search for wiki pages in the selected course:
+ $this->selected_range_id = Request::option('selected_range_id');
+ $this->selected_course = Course::find($this->selected_range_id);
+
+ if (!$this->selected_course) {
+ $this->bad_course_search = true;
+ return;
+ }
+
+ $this->wiki_pages = WikiPage::findBySQL(
+ "`range_id` = ? ORDER BY `name`",
+ [$this->selected_course->id]
+ );
+ $this->show_wiki_page_form = true;
+ }
+
+ //The import required additional functionality:
+ if (Request::submitted('import')) {
+ CSRFProtection::verifyUnsafeRequest();
+ $this->selected_wiki_page_ids = Request::getArray('selected_wiki_page_ids');
+ if (!$this->selected_wiki_page_ids) {
+ PageLayout::postInfo(_('Es wurden keine Wiki-Seiten ausgewählt!'));
+ return;
+ }
+
+ $selected_wiki_pages = [];
+ foreach ($this->selected_wiki_page_ids as $id) {
+ $wiki_page = WikiPage::find($id);
+ if ($wiki_page) {
+ $selected_wiki_pages[] = $wiki_page;
+ }
+ }
+
+ if (!$selected_wiki_pages) {
+ PageLayout::postError(_('Es wurden keine Wiki-Seiten gefunden!'));
+ return;
+ }
+
+ $errors = [];
+ foreach ($selected_wiki_pages as $selected_page) {
+ if ($selected_page->isReadable()) {
+ $count = WikiPage::countBySql(
+ "`range_id` = :range_id AND `name` = :name",
+ [
+ 'range_id' => $this->range->id,
+ 'name' => $selected_page['name']
+ ]
+ );
+ if ($count === 0) {
+ $new_page = WikiPage::build([
+ 'range_id' => $this->range->id,
+ 'user_id' => $selected_page->user_id,
+ 'name' => $selected_page->name,
+ 'content' => $selected_page->content,
+ 'chdate' => $selected_page->chdate,
+ ]);
+ if (!$new_page->store()) {
+ $errors[] = sprintf(
+ _('Fehler beim Import der Wiki-Seite %s!'),
+ htmlReady($new_page->name)
+ );
+ }
+ }
+ }
+ }
+ if ($errors) {
+ PageLayout::postError(
+ _('Die folgenden Fehler traten beim Import auf:'),
+ $errors
+ );
+ } else {
+ $this->show_wiki_page_form = false;
+ $this->success = true;
+ PageLayout::postSuccess(
+ ngettext(
+ 'Die Wiki-Seite wurde importiert! Sie ist unter der Ansicht "Alle Seiten" erreichbar.',
+ 'Die Wiki-Seiten wurden importiert! Sie sind unter der Ansicht "Alle Seiten" erreichbar.',
+ count($selected_wiki_pages)
+ )
+ );
+ }
+ }
+ }
+}
diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php
index 0d657fe66c5cf8d78ab8f4f29cf43fdbffab5f36..f8f86773e0b14e81f34b698354c85e5f2de228c0 100644
--- a/app/controllers/jsupdater.php
+++ b/app/controllers/jsupdater.php
@@ -118,6 +118,8 @@ class JsupdaterController extends AuthenticatedController
'messages' => $this->getMessagesUpdates($pageInfo),
'personalnotifications' => $this->getPersonalNotificationUpdates($pageInfo),
'questionnaire' => $this->getQuestionnaireUpdates($pageInfo),
+ 'wiki_page_content' => $this->getWikiPageContents($pageInfo),
+ 'wiki_editor_status' => $this->getWikiEditorStatus($pageInfo),
];
return array_filter($data);
@@ -260,6 +262,104 @@ class JsupdaterController extends AuthenticatedController
return $data;
}
+ private function getWikiPageContents($pageInfo): array
+ {
+ $data = [];
+ if (!empty($pageInfo['wiki_page_content'])) {
+ foreach ($pageInfo['wiki_page_content'] as $page_id) {
+ $page = WikiPage::find($page_id);
+ if ($page && $page->isReadable() && ($page->chdate >= Request::int('server_timestamp'))) {
+ $data['contents'][$page_id] = wikiReady($page->content, true, $page->range_id, $page->id);
+ }
+ }
+ }
+ return $data;
+ }
+
+ private function getWikiEditorStatus($pageInfo): array
+ {
+ $data = [];
+ if (!empty($pageInfo['wiki_editor_status'])) {
+ $user = User::findCurrent();
+ foreach ((array) $pageInfo['wiki_editor_status']['page_ids'] as $page_id) {
+ WikiOnlineEditingUser::deleteBySQL(
+ "`page_id` = :page_id AND `chdate` < UNIX_TIMESTAMP() - :threshold",
+ [
+ 'page_id' => $page_id,
+ 'threshold' => WikiOnlineEditingUser::$threshold
+ ]
+ );
+ $page = WikiPage::find($page_id);
+ if ($page && $page->isEditable()) {
+ if (
+ $pageInfo['wiki_editor_status']['focussed'] == $page_id
+ && !empty($pageInfo['wiki_editor_status']['page_content'])
+ ) {
+ $page->content = \Studip\Markup::markAsHtml(
+ $pageInfo['wiki_editor_status']['page_content']
+ );
+ $page->store();
+ }
+ $onlineData = [
+ 'user_id' => $user->id,
+ 'page_id' => $page_id
+ ];
+ $online = WikiOnlineEditingUser::findOneBySQL(
+ "`user_id` = :user_id AND `page_id` = :page_id",
+ $onlineData
+ );
+ if (!$online) {
+ $online = WikiOnlineEditingUser::build($onlineData);
+ }
+ $editingUsers = WikiOnlineEditingUser::countBySQL(
+ "`page_id` = ? AND `editing` = 1 AND `user_id` != ?",
+ [$page->id, $user->id]
+ );
+ if ($editingUsers > 0) {
+ $online->editing = 0;
+ } elseif ($online->editing && $online->editing_request) {
+ // this is the mode that this user requested the editing mode and was granted to get it:
+ $online->editing_request = 0;
+ } elseif ($online->editing_request) {
+ $other_requests = WikiOnlineEditingUser::countBySql("`page_id` = ? AND `editing_request` = 1 AND `user_id` != ?", [
+ $page->id,
+ $user->id,
+ ]);
+ if ($other_requests === 0) {
+ $online->editing_request = 0;
+ $online->editing = 1;
+ }
+ } else {
+ if ($pageInfo['wiki_editor_status']['focussed'] == $page_id) {
+ $online->editing = 1;
+ } else {
+ $other_users = WikiOnlineEditingUser::countBySql("`page_id` = ? AND `user_id` != ?", [
+ $page->id,
+ $user->id,
+ ]);
+ if ($other_users === 0) {
+ // if I'm the only user I don't need to lose the edit mode
+ $online->editing = 1;
+ } else {
+ $online->editing = 0;
+ }
+ }
+ }
+ $online->chdate = time();
+ $online->store();
+ $data['contents'][$page_id] = wikiReady($page->content, true, $page->range_id, $page_id);
+ $data['wysiwyg_contents'][$page_id] = $page->content;
+ $data['pages'][$page_id]['editing'] = $online->editing;
+ } else {
+ $data['pages'][$page_id]['editing'] = 0;
+ }
+ $data['pages'][$page_id]['chdate'] = $page->chdate;
+ $data['users'][$page_id] = $page->getOnlineUsers();
+ }
+ }
+ return $data;
+ }
+
private function getCoursewareClipboardUpdates($pageInfo)
{
$counter = $pageInfo['coursewareclipboard']['counter'] ?? 0;
diff --git a/app/controllers/public_courses.php b/app/controllers/public_courses.php
index 207a0f11065a37256f1f8ecaf10801e3f18d47cb..8af481926e59ae0b201b7290a7f4a86feec99678 100644
--- a/app/controllers/public_courses.php
+++ b/app/controllers/public_courses.php
@@ -170,15 +170,19 @@ class PublicCoursesController extends AuthenticatedController
// Wiki
if (Config::get()->WIKI_ENABLE) {
- $query = "SELECT range_id, COUNT(DISTINCT keyword) AS count
- FROM wiki
- WHERE range_id IN (?)
- GROUP BY range_id";
+ $query = "SELECT `range_id`, COUNT(`wiki_versions`.`version_id`) + 1 AS count
+ FROM `wiki_pages`
+ LEFT JOIN `wiki_versions` USING (`page_id`)
+ WHERE `range_id` IN (?)
+ GROUP BY `range_id`";
$statement = DBManager::get()->prepare($query);
$statement->execute([$seminar_ids]);
while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
if (isset($seminars[$row['range_id']]['navigations']['CoreWiki'])) {
- $nav = new Navigation('wiki', 'wiki.php');
+ $nav = new Navigation(
+ 'wiki',
+ URLHelper::getURL('dispatch.php/course/wiki/page', ['cid' => $row['range_id']])
+ );
$nav->setImage(Icon::create('wiki', Icon::ROLE_CLICKABLE, ["title" => sprintf(_('%s WikiSeiten'), $row['count'])]));
$seminars[$row['range_id']]['navigations']['CoreWiki'] = $nav;
}
diff --git a/app/controllers/studip_controller.php b/app/controllers/studip_controller.php
index 7444dba4ce13e1ec28cfe09d1dfb1fc6dde7e89b..9e238a1c7b4b42705cfcee51021cb5a620720a11 100644
--- a/app/controllers/studip_controller.php
+++ b/app/controllers/studip_controller.php
@@ -585,6 +585,11 @@ abstract class StudipController extends Trails_Controller
);
}
+ public function render_form(\Studip\Forms\Form $form)
+ {
+ $this->render_text($form->render());
+ }
+
/**
* relays current request to another controller and returns the response
* the other controller is given all assigned properties, additional parameters are passed
diff --git a/app/controllers/wiki.php b/app/controllers/wiki.php
deleted file mode 100644
index 5a5d4a8c0ad97169920e23f9e5e096c5998ca02d..0000000000000000000000000000000000000000
--- a/app/controllers/wiki.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/**
- * wiki.php - wiki controller (currently only a helper)
- *
- * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
- * @license GPL2 or any later version
- * @since 3.3
- */
-require_once 'lib/wiki.inc.php';
-
-class WikiController extends AuthenticatedController
-{
- public function before_filter(&$action, &$args)
- {
- parent::before_filter($action, $args);
-
- $this->keyword = Request::get('keyword');
- $this->range_id = Context::getId();
-
- if (Navigation::hasItem('/course/wiki/show')) {
- Navigation::activateItem('/course/wiki/show');
- }
- }
-
- /**
- * Display dialog to create a new wiki page.
- */
- public function create_action()
- {
- $this->wiki_page_names = Array();
- $wiki_pages = WikiPage::findLatestPages(Context::getId());
- $wiki_pages->filter(function ($wikipage) use (&$wiki_page_names) {
- $wikipage->keyword === 'WikiWikiWeb' ?: $this->wiki_page_names[] = $wikipage->keyword;
- });
- natcasesort($this->wiki_page_names);
- $wikistartpage = WikiPage::findLatestPage(Context::getId(), 'WikiWikiWeb');
- if ($wikistartpage) {
- array_unshift($this->wiki_page_names, 'WikiWikiWeb');
- }
-
- getShowPageInfobox($this->keyword, true);
- }
-
- /**
- * change course permissions of wiki pages
- */
- public function change_courseperms_action()
- {
- if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->range_id)) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Berechtigungen Wiki-Seiten zu ändern!'));
- }
-
- // prevent malformed urls: keyword must be set
- if (!$this->keyword) {
- throw new InvalidArgumentException(_('Es wurde keine Seite übergeben!'));
- }
-
- PageLayout::setTitle(_('Wiki-Einstellungen ändern'));
-
- $this->restricted = CourseConfig::get($this->range_id)->WIKI_COURSE_EDIT_RESTRICTED;
-
- getShowPageInfobox($this->keyword, true);
- }
-
- /**
- * store course permissions of wiki pages
- */
- public function store_courseperms_action()
- {
- CSRFProtection::verifyUnsafeRequest();
-
- if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->range_id)) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Berechtigungen Wiki-Seiten zu ändern!'));
- }
-
- // prevent malformed urls: keyword must be set
- if (!$this->keyword) {
- throw new InvalidArgumentException(_('Es wurde keine Seite übergeben!'));
- }
-
- CourseConfig::get($this->range_id)->store(
- 'WIKI_COURSE_EDIT_RESTRICTED',
- Request::int('courseperms')
- );
- PageLayout::postSuccess(_('Die veranstaltungsbezogenen Berechtigungen auf die Wiki-Seiten wurden geändert!'));
- $this->redirect(URLHelper::getURL('wiki.php', ['keyword' => $this->keyword]));
- }
-
- /**
- * change page permission of a single wiki page
- */
- public function change_page_config_action()
- {
- if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->range_id)) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Berechtigungen Wiki-Seiten zu ändern!'));
- }
-
- // prevent malformed urls: keyword must be set
- if (!$this->keyword) {
- throw new InvalidArgumentException(_('Es wurde keine Seite übergeben!'));
- }
-
- $page = WikiPage::findLatestPage($this->range_id, $this->keyword);
- $this->page = $page;
-
- $this->validKeywords = array_filter(
- WikiPage::findLatestPages($this->range_id)->pluck("keyword"),
- function ($keyword) use ($page) {
- if ($keyword === 'WikiWikiWeb') {
- return false;
- } else {
- return $page->isValidAncestor($keyword);
- }
- }
- );
- natcasesort($this->validKeywords);
- $wikistartpage = WikiPage::findLatestPage(Context::getId(), 'WikiWikiWeb');
- if ($wikistartpage) {
- array_unshift($this->validKeywords, 'WikiWikiWeb');
- }
-
- PageLayout::setTitle(_('Seiten-Einstellungen ändern'));
-
- $this->config = $page->config;
-
- getShowPageInfobox($this->keyword, true);
- }
-
- /**
- * store page config of a wiki page
- */
- public function store_page_config_action()
- {
- CSRFProtection::verifyUnsafeRequest();
-
- if (!$GLOBALS['perm']->have_studip_perm('tutor', $this->range_id)) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Berechtigungen von Wiki-Seiten zu ändern!'));
- }
-
- // prevent malformed urls: keyword must be set
- if (!$this->keyword) {
- throw new InvalidArgumentException(_('Es wurde keine Seite übergeben!'));
- }
-
- $this->store_pageperms();
- $this->store_page_ancestor();
-
- PageLayout::postSuccess(sprintf(
- _('Die Einstellungen für Wiki-Seite "%s" wurden geändert!'),
- htmlReady($this->keyword)
- ));
- $this->redirect(URLHelper::getURL('wiki.php', ['keyword' => $this->keyword]));
- }
-
- /**
- * store page permissions of a wiki page
- */
- public function store_pageperms()
- {
- $wiki_page_config = new WikiPageConfig([$this->range_id, $this->keyword]);
- $wiki_page_config->read_restricted = Request::int('page_read_perms');
- $wiki_page_config->edit_restricted = Request::int('page_edit_perms');
-
- if (Request::int('page_global_perms') || $wiki_page_config->isDefault()) {
- WikiPageConfig::deleteBySQL('range_id = ? AND keyword = ?', [$this->range_id, $this->keyword]);
- } else {
- $wiki_page_config->store();
- }
- }
-
- /**
- * store page ancestor of a wiki page
- */
- public function store_page_ancestor()
- {
- $wikipage = WikiPage::findLatestPage(Context::getId(), $this->keyword);
- if ($wikipage) {
- if ($wikipage->isEditableBy($GLOBALS['user'])) {
- $ancestor = Request::get('ancestor_select') ?: null;
- if ($wikipage->isValidAncestor($ancestor)) {
- $wikipage->setAncestorForAllVersions($ancestor);
- } else {
- PageLayout::postInfo(_('Die Vorgängerseite konnte nicht gespeichert werden.'));
- }
- $wikipage->store();
- } else {
- PageLayout::postInfo(_('Keine Änderung vorgenommen, da zwischenzeitlich die Editier-Berechtigung entzogen wurde.'));
- }
- }
- }
-
- public function store_action($version)
- {
- $body = Studip\Markup::purifyHtml(Request::get('body'));
-
- $ancestor = WikiPage::findLatestPage(Context::getId(), $this->keyword)->ancestor;
-
- submitWikiPage($this->keyword, $version, $body, $GLOBALS['user']->id, $this->range_id, $ancestor);
-
- $latest_version = getLatestVersion($this->keyword, $this->range_id);
-
- if (Request::isXhr()) {
- $this->render_json([
- 'version' => $latest_version['version'],
- 'body' => $latest_version['body'],
- 'messages' => implode(PageLayout::getMessages()) ?: false,
- 'zusatz' => getZusatz($latest_version),
- ]);
- } else {
- // Yeah, wait for the whole trailification of the wiki...
- }
- }
-
- public function version_check_action($version)
- {
- $latest_version = getLatestVersion($this->keyword, $this->range_id);
-
- if (!$latest_version && $version > 1) {
- $this->response->add_header('X-Studip-Error', _('Diese Wiki-Seite existiert nicht mehr!'));
- $this->render_json(false);
- } elseif ($latest_version && $version != $latest_version['version']) {
- $error = _('Die von Ihnen bearbeitete Seite ist nicht mehr aktuell.') . ' ';
- $error .= _('Falls Sie dennoch speichern, überschreiben Sie die getätigte Änderung und es wird unter Umständen zu Datenverlusten kommen.');
- $this->response->add_header('X-Studip-Error', $error);
-
- $this->response->add_header('X-Studip-Confirm', _('Möchten Sie Ihre Version dennoch speichern?'));
-
- $this->render_json(null);
- } else {
- $this->render_json(true);
- }
- }
-
- public function info_action()
- {
- // prevent malformed urls: keyword must be set
- if (!$this->keyword) {
- throw new InvalidArgumentException(_('Es wurde keine Seite übergeben!'));
- }
-
- $this->last_page = WikiPage::findLatestPage($this->range_id, $this->keyword);
- $this->last_user = User::find($this->last_page['user_id']);
- $this->first_page = getWikiPage($this->keyword, 1);
- $this->first_user = User::find($this->first_page['user_id']);
- $this->backlinks = getBacklinks($this->keyword);
- $page = WikiPage::findLatestPage($this->range_id, $this->keyword);
- $this->descendants = $page->children;
-
- PageLayout::setTitle(_('Informationen zur Wikiseite'));
-
- getShowPageInfobox($this->keyword, true);
- }
-
- /**
- * This action is responsible for importing wiki pages into the wiki
- * of a course from another course.
- */
- public function import_action($course_id = null)
- {
- $edit_perms = CourseConfig::get($course_id)->WIKI_COURSE_EDIT_RESTRICTED ? 'tutor' : 'autor';
- if (!$GLOBALS['perm']->have_studip_perm($edit_perms, $course_id)) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Änderungen an Wikiseiten vorzunehmen!'));
- }
-
- $this->course = Course::find($course_id);
- if (!$this->course) {
- PageLayout::postError(
- _('Die ausgewählte Veranstaltung wurde nicht gefunden!')
- );
- }
-
- $this->course_search = new QuickSearch(
- 'selected_course_id',
- new MyCoursesSearch(
- 'Seminar_id',
- $GLOBALS['perm']->get_perm(),
- [
- 'userid' => $GLOBALS['user']->id,
- 'exclude' => [$course_id],
- 'institutes' => array_column(Institute::getMyInstitutes(), 'Institut_id')
- ],
- 's.`Seminar_id` IN (
- SELECT range_id FROM wiki
- WHERE range_id = s.`Seminar_id`
- )'
- )
- );
-
- $this->course_search->fireJSFunctionOnSelect(
- "function() {jQuery(this).closest('form').submit();}"
- );
-
- $this->show_wiki_page_form = false;
- $this->bad_course_search = false;
- $this->success = false;
-
- //The following steps are identical for the search and the import.
- if (Request::submitted('selected_course_id') || Request::submitted('import')) {
- CSRFProtection::verifyUnsafeRequest();
-
- //Search for wiki pages in the selected course:
- $this->selected_course_id = Request::option('selected_course_id');
- $this->selected_course = Course::find($this->selected_course_id);
-
- if (!$this->selected_course) {
- $this->bad_course_search = true;
- return;
- }
-
- $this->wiki_pages = WikiPage::findLatestPages(
- $this->selected_course->id
- );
- $this->show_wiki_page_form = true;
- }
-
- //The import required additional functionality:
- if (Request::submitted('import')) {
- CSRFProtection::verifyUnsafeRequest();
- $this->selected_wiki_page_ids = Request::getArray('selected_wiki_page_ids');
- if (!$this->selected_wiki_page_ids) {
- PageLayout::postInfo(_('Es wurden keine Wikiseiten ausgewählt!'));
- return;
- }
-
- $selected_wiki_pages = [];
- foreach ($this->selected_wiki_page_ids as $id) {
- $wiki_page = WikiPage::find(json_decode($id, true));
- if ($wiki_page) {
- $selected_wiki_pages[] = $wiki_page;
- }
- }
-
- if (!$selected_wiki_pages) {
- PageLayout::postError(_('Es wurden keine Wikiseiten gefunden!'));
- return;
- }
-
- $errors = [];
- foreach ($selected_wiki_pages as $selected_page) {
- $latest_version = WikiPage::findLatestPage(
- $this->course->id,
- $selected_page->keyword
- );
- $new_page = new WikiPage();
- $new_page->range_id = $this->course->id;
- $new_page->user_id = $selected_page->user_id;
- $new_page->keyword = $selected_page->keyword;
- $new_page->body = $selected_page->body;
- $new_page->chdate = $selected_page->chdate;
- $new_page->version = $latest_version ? $latest_version->version + 1 : 1;
-
- if (!$new_page->store()) {
- $errors[] = sprintf(
- _('Fehler beim Import der Wikiseite %s!'),
- $new_page->keyword
- );
- }
- }
- if ($errors) {
- PageLayout::postError(
- _('Die folgenden Fehler traten beim Import auf:'),
- $errors
- );
- } else {
- $this->show_wiki_page_form = false;
- $this->success = true;
- PageLayout::postSuccess(
- ngettext(
- 'Die Wikiseite wurde importiert! Sie ist unter dem Navigationspunkt "Alle Seiten" erreichbar.',
- 'Die Wikiseiten wurden importiert! Sie sind unter dem Navigationspunkt "Alle Seiten" erreichbar.',
- count($selected_wiki_pages)
- )
- );
- }
- }
- }
-}
diff --git a/app/routes/Wiki.php b/app/routes/Wiki.php
index d70a37b61550dfe1f0ecf23f498690e2a1d3e365..7f54628ad19b8deaf6bea6e3bffabf015f5affff 100644
--- a/app/routes/Wiki.php
+++ b/app/routes/Wiki.php
@@ -6,29 +6,25 @@ namespace RESTAPI\Routes;
* @license GPL 2 or later
* @deprecated Since Stud.IP 5.0. Will be removed in Stud.IP 6.0.
*
- * @condition course_id ^[0-9a-f]{1,32}$
+ * @condition range_id ^[0-9a-f]{1,32}$
*/
class Wiki extends \RESTAPI\RouteMap
{
public function before()
{
require_once 'User.php';
- require_once 'lib/wiki.inc.php';
}
/**
* Wikiseitenindex einer Veranstaltung
*
- * @get /course/:course_id/wiki
+ * @get /course/:range_id/wiki
*/
- public function getCourseWiki($course_id)
+ public function getCourseWiki($range_id)
{
- $pages = \WikiPage::findLatestPages($course_id);
- if (!sizeof($pages->findBy('keyword', 'WikiWikWeb'))) {
- $pages[] = \WikiPage::getStartPage($course_id);
- }
+ $pages = \WikiPage::findBySQL("`range_id` = ? ORDER BY `name` ASC", [$range_id]);
- if (!$pages->first()->isVisibleTo($GLOBALS['user']->id)) {
+ if (!$pages[0]->isReadable()) {
$this->error(401);
}
@@ -37,24 +33,24 @@ class Wiki extends \RESTAPI\RouteMap
$linked_pages = [];
foreach ($pages as $page) {
- $url = $this->urlf('/course/%s/wiki/%s', [$course_id, htmlReady($page['keyword'])]);
+ $url = $this->urlf('/course/%s/wiki/%s', [$range_id, htmlReady($page['keyword'])]);
$linked_pages[$url] = $this->wikiPageToJson($page, ["content"]);
}
$this->etag(md5(serialize($linked_pages)));
- return $this->paginated($linked_pages, $total, compact('course_id'));
+ return $this->paginated($linked_pages, $total, compact('range_id'));
}
/**
* Wikiseite auslesen
*
- * @get /course/:course_id/wiki/:keyword
- * @get /course/:course_id/wiki/:keyword/:version
+ * @get /course/:range_id/wiki/:keyword
+ * @get /course/:range_id/wiki/:keyword/:version
*/
- public function getCourseWikiKeyword($course_id, $keyword, $version = null)
+ public function getCourseWikiKeyword($range_id, $keyword, $version = null)
{
- $page = $this->requirePage($course_id, $keyword, $version);
+ $page = $this->requirePage($range_id, $keyword, $version);
$wiki_json = $this->wikiPageToJson($page);
$this->etag(md5(serialize($wiki_json)));
$this->lastmodified($page->chdate);
@@ -64,33 +60,29 @@ class Wiki extends \RESTAPI\RouteMap
/**
* Wikiseite ändern/hinzufügen
*
- * @put /course/:course_id/wiki/:keyword
+ * @put /course/:range_id/wiki/:keyword
*/
- public function putCourseWikiKeyword($course_id, $keyword)
+ public function putCourseWikiKeyword($range_id, $keyword)
{
if (!isset($this->data['content'])) {
$this->error(400, 'No content provided');
}
- $last_version = \WikiPage::findLatestPage($course_id, $keyword);
- if (!$last_version) {
- $last_version = new \WikiPage([$course_id, $keyword, 0]);
+ $page =\WikiPage::findOneBySQL("`range_id` = ? AND `name` = ?", [$range_id, $keyword]);
+ if (!$page) {
+ $page = new \WikiPage();
+ $page->range_id = $range_id;
+ $page->name = $keyword;
}
- if (!$last_version->isEditableBy($user_id = $GLOBALS['user']->id)) {
+ if (!$page->isEditable()) {
$this->error(401);
}
- // TODO: rewrite this code and put #submitWikiPage into
- // class \WikiPage
- if (!\Context::get()) {
- \Context::set($course_id);
- }
- submitWikiPage($keyword, $last_version->version, $this->data['content'], $user_id, $course_id, $last_version->ancestor);
+ $page->content = $this->data['content'];
+ $page->store();
- $new_version = \WikiPage::findLatestPage($course_id, $keyword);
-
- $url = sprintf('course/%s/wiki/%s/%d', htmlReady($course_id), htmlReady($keyword), $new_version->version);
+ $url = sprintf('course/%s/wiki/%s/%d', htmlReady($range_id), htmlReady($keyword), count($page->versions) + 1);
$this->redirect($url, 201, 'ok');
}
@@ -98,37 +90,41 @@ class Wiki extends \RESTAPI\RouteMap
/* PRIVATE HELPER METHODS */
/**************************************************/
- private function requirePage($course_id, $keyword, $version)
+ private function requirePage($range_id, $keyword, $version = null)
{
- if ($version) {
- $page = \WikiPage::find([$course_id, $keyword, $version]);
- } else {
- $page = \WikiPage::findLatestPage($course_id, $keyword);
- }
+ $page = \WikiPage::findOneBySQL("`range_id` = ? AND `name` = ?", [$range_id, $keyword]);
if (!$page) {
$this->notFound();
}
- if (!$page->isVisibleTo($GLOBALS['user']->id)) {
+ if (!$page->isReadable($GLOBALS['user']->id)) {
$this->error(401);
}
-
- return $page;
+ if ($version !== null && $version !== count($page->versions) + 1) {
+ return $page->versions[count($page->versions) - 1 - $version];
+ } else {
+ return $page;
+ }
}
private function wikiPageToJson($page, $without = [])
{
- $json = $page->toArray(words("range_id keyword chdate version"));
+ $json = [
+ 'range_id' => $page->range_id,
+ 'keyword' => $page->name,
+ 'chdate' => $page->chdate,
+ 'version' => 1
+ ];
// (pre-rendered) content
if (!in_array('content', $without)) {
- $json['content'] = $page->body;
- $json['content_html'] = wikiReady($page->body);
+ $json['content'] = $page->content;
+ $json['content_html'] = wikiReady($page->content, true, $page->range_id, $page->id);
}
if (!in_array('user', $without)) {
if ($page->author) {
- $json['user'] = User::getMiniUser($this, $page->author);
+ $json['user'] = User::getMiniUser($this, $page->user_id);
}
}
diff --git a/app/views/course/wiki/admin.php b/app/views/course/wiki/admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..22f3c356c44753b42d060dd61056bae297bac482
--- /dev/null
+++ b/app/views/course/wiki/admin.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @var WikiPage[] $pages
+ * @var Course_WikiController $controller
+ * @var CourseConfig $config
+ * @var Course|Institute $range
+ */
+?>
+<form class="default" method="post" action="<?= $controller->store_course_config() ?>">
+ <?= CSRFProtection::tokenTag() ?>
+ <? if (count($pages) > 0) : ?>
+ <label>
+ <?= _('Startseite des Wikis') ?>
+ <select name="wiki_startpage_id">
+ <? foreach ($pages as $page) : ?>
+ <option value="<?= htmlReady($page->id) ?>"
+ <? if ($config->WIKI_STARTPAGE_ID == $page->id) echo 'selected'; ?>
+ ><?= htmlReady($page->name) ?></option>
+ <? endforeach ?>
+ </select>
+ </label>
+ <? endif ?>
+
+ <? if ($config->WIKI_CREATE_PERMISSION === 'all' || $GLOBALS['perm']->have_studip_perm($config->WIKI_CREATE_PERMISSION, $range->id)) : ?>
+ <label>
+ <?= _('Wer darf neue Wiki-Seiten anlegen?') ?>
+ <select name="wiki_create_permission">
+ <option value="all"
+ <? if ($config->WIKI_CREATE_PERMISSION === 'all') echo 'selected'; ?>
+ ><?= _('Alle') ?></option>
+ <option value="tutor"
+ <? if ($config->WIKI_CREATE_PERMISSION === 'tutor') echo 'selected'; ?>
+ ><?= _('Tutor/-innen und Lehrende') ?></option>
+ <option value="dozent"
+ <?= $GLOBALS['perm']->have_studip_perm('dozent', $range->id) ? '' : 'disabled'?>
+ <? if ($config->WIKI_CREATE_PERMISSION === 'dozent') echo 'selected'; ?>
+ ><?= _('Nur Lehrende') ?></option>
+ </select>
+ </label>
+ <? else : ?>
+ <div>
+ <?= _('Wer darf neue Wiki-Seiten anlegen?') ?>
+ <div>
+ <? switch ($config->WIKI_CREATE_PERMISSION) {
+ case 'all':
+ echo _('Alle');
+ break;
+ case 'tutor':
+ echo _('Tutor/-innen und Lehrende');
+ break;
+ case 'dozent':
+ echo _('Nur Lehrende');
+ break;
+ } ?>
+ </div>
+ </div>
+ <? endif ?>
+
+ <? if ($config->WIKI_RENAME_PERMISSION === 'all' || $GLOBALS['perm']->have_studip_perm($config->WIKI_RENAME_PERMISSION, $range->id)) : ?>
+ <label>
+ <?= _('Wer darf Wiki-Seiten umbenennen?') ?>
+ <select name="wiki_rename_permission">
+ <option value="all"
+ <? if ($config->WIKI_RENAME_PERMISSION === 'all') echo 'selected'; ?>
+ ><?= _('Alle') ?></option>
+ <option value="tutor"
+ <? if ($config->WIKI_RENAME_PERMISSION === 'tutor') echo 'selected'; ?>
+ ><?= _('Tutor/-innen und Lehrende') ?></option>
+ <option value="dozent"
+ <?= $GLOBALS['perm']->have_studip_perm('dozent', $range->id) ? '' : 'disabled'?>
+ <? if ($config->WIKI_RENAME_PERMISSION === 'dozent') echo 'selected'; ?>
+ ><?= _('Nur Lehrende') ?></option>
+ </select>
+ </label>
+ <? else : ?>
+ <div>
+ <?= _('Wer darf Wiki-Seiten umbenennen?') ?>
+ <div>
+ <? switch ($config->WIKI_RENAME_PERMISSION) {
+ case 'all':
+ echo _('Alle');
+ break;
+ case 'tutor':
+ echo _('Tutor/-innen und Lehrende');
+ break;
+ case 'dozent':
+ echo _('Nur Lehrende');
+ break;
+ } ?>
+ </div>
+ </div>
+ <? endif ?>
+
+ <div data-dialog-button>
+ <?= \Studip\Button::create(_('Ãœbernehmen')) ?>
+ </div>
+</form>
diff --git a/app/views/course/wiki/allpages.php b/app/views/course/wiki/allpages.php
new file mode 100644
index 0000000000000000000000000000000000000000..0bfe4ce4b04d9c34f46c4f3f29da8cd024e70418
--- /dev/null
+++ b/app/views/course/wiki/allpages.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @var WikiPage[] $pages
+ * @var Course_WikiController $controller
+ */
+?>
+
+<table class="default sortable-table" data-sortlist="[[0, 0]]">
+ <caption>
+ <?= _('Alle Seiten des Wikis') ?>
+ </caption>
+ <thead>
+ <tr>
+ <th data-sort="text"><?= _('Seitenname') ?></th>
+ <th data-sort="text"><?= _('Änderungen') ?></th>
+ <th data-sort="text"><?= _('Letzte Änderung') ?></th>
+ <th data-sort="text"><?= _('Zuletzt bearbeitet von') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <? foreach ($pages as $page) : ?>
+ <tr>
+ <td data-sort-value="<?= htmlReady($page->name) ?>">
+ <a href="<?= $controller->page($page) ?>">
+ <?= htmlReady($page->name) ?>
+ </a>
+ </td>
+ <td data-sort-value="<?= count($page->versions) + 1 ?>">
+ <?= count($page->versions) + 1 ?>
+ </td>
+ <td data-sort-value="<?= htmlReady($page->chdate) ?>">
+ <?= $page->chdate > 0 ? date('d.m.Y H:i:s', $page->chdate) : _('unbekannt') ?>
+ </td>
+ <td data-sort-value="<?= htmlReady($page->user ? $page->user->getFullName() : _('unbekannt')) ?>">
+ <?= Avatar::getAvatar($page->user_id)->getImageTag(Avatar::SMALL) ?>
+ <?= htmlReady($page->user ? $page->user->getFullName() : _('unbekannt')) ?>
+ </td>
+ </tr>
+ <? endforeach ?>
+ </tbody>
+</table>
diff --git a/app/views/course/wiki/blame.php b/app/views/course/wiki/blame.php
new file mode 100644
index 0000000000000000000000000000000000000000..c1f0d9503e6857b16d38367f2197df2574ccd575
--- /dev/null
+++ b/app/views/course/wiki/blame.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @var WikiPage $page
+ * @var array $diffarray
+ * @var array $line_versions
+ */
+?>
+<h1><?= htmlReady($page->name) . ' - ' . _('Text mit Autor/-innenzuordnung') ?></h1>
+
+<div class="blame_diff">
+ <?
+ $last_author = 'None';
+ $collect = "";
+ $version = $line_versions[0];
+ foreach ($diffarray as $number => $line) {
+ if (!$line || $last_author !== $line->who) {
+ if (trim($collect) !== '') : ?>
+ <div class="wiki_line">
+ <div class="author">
+ <a href="<?= URLhelper::getLink('dispatch.php/profile', ['username' => get_username($last_author)]) ?>" title="<?= htmlReady(get_fullname($last_author)) ?>">
+ <?= Avatar::getAvatar($last_author)->getImageTag(Avatar::SMALL) ?>
+ <div class="author_name"><?= htmlReady(get_fullname($last_author)) ?></div>
+ </a>
+ </div>
+ <a class="difflink"
+ href="<?= $controller->versiondiff(!$version || is_a($version, WikiPage::class) ? $version : $version->page, is_a($version, WikiVersion::class) ? $version->id : null) ?>"
+ data-dialog
+ title="<?= _('Änderungen anzeigen') ?>">
+ <?= Icon::create('log')->asImg(20, ['class' => 'text-bottom']) ?>
+ </a>
+ <div class="content">
+ <?= wikiReady($collect) ?>
+ </div>
+ </div>
+ <? endif;
+ $collect = "";
+ }
+ if ($line) {
+ $last_author = $line->who;
+ $collect .= $line->text;
+ $version = $line_versions[$number] ?? null;
+ }
+ }
+ ?>
+</div>
diff --git a/app/views/course/wiki/diff.php b/app/views/course/wiki/diff.php
new file mode 100644
index 0000000000000000000000000000000000000000..60dd1fa727635f7eb067b71f124ac482cd808ae5
--- /dev/null
+++ b/app/views/course/wiki/diff.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @var WikiPage $page
+ * @var array $diffs
+ */
+?>
+<h1><?= htmlReady($page->name) . ' - ' . _('Änderungsliste') ?></h1>
+
+<div>
+ <? foreach (array_reverse($diffs) as $diff) : ?>
+ <?= $this->render_partial('course/wiki/versiondiff', $diff) ?>
+ <? endforeach ?>
+</div>
diff --git a/app/views/course/wiki/edit.php b/app/views/course/wiki/edit.php
new file mode 100644
index 0000000000000000000000000000000000000000..7a349bbf928a61be69e5ce9d2e9d0a85feb38f64
--- /dev/null
+++ b/app/views/course/wiki/edit.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @var WikiPage $page
+ * @var Course_WikiController $controller
+ * @var WikiOnlineEditingUser $me_online
+ */
+?>
+
+<div class="wiki-editor-container"
+ data-page_id="<?= htmlReady($page->id) ?>"
+ data-editing="<?= htmlReady($me_online->editing) ?>"
+ data-content="<?= htmlReady(wikiReady($page->content, true, $page->range_id, $page->id)) ?>"
+ data-chdate="<?= htmlReady($page->chdate) ?>"
+ data-users="<?= htmlReady(json_encode($page->getOnlineUsers())) ?>">
+
+ <?= $contentbar ?>
+
+ <form action="<?= $controller->save($page) ?>" method="post" class="default" v-show="editing">
+ <?= CSRFProtection::tokenTag() ?>
+ <textarea class="wiki-editor size-l"
+ ref="wiki_editor"
+ data-editor="extraPlugins=WikiLink"
+ name="content"><?= wysiwygReady($page->content) ?></textarea>
+
+ <div></div>
+ <label>
+ <input type="checkbox" v-model="autosave">
+ <?= _('Autosave aktiv') ?>
+ </label>
+
+ <div data-dialog-button="">
+ <button class="button" :disabled="!isChanged" :title="isChanged ? '<?= _('Speichern Sie den aktuellen Stand.') ?>' : '<?= _('Der aktuelle Stand ist schon gespeichert.') ?>'">
+ <?= _('Speichern') ?>
+ </button>
+ <?= \Studip\LinkButton::create(_('Verlassen'), $controller->leave_editing($page))?>
+ <button v-for="user in requestingUsers"
+ :key="user.user_id"
+ @click.prevent="delegateEditMode(user.user_id)"
+ class="button">
+ {{ $gettextInterpolate($gettext('Schreibmodus an %{name} übergeben'), { name: user.fullname }) }}
+ </button>
+ </div>
+ </form>
+
+ <div v-if="!editing" class="">
+ <div v-html="content"></div>
+ <div data-dialog-button="">
+ <button class="button"
+ title="<?= _('Beantragen Sie, dass Sie den Text jetzt bearbeiten wollen.') ?>"
+ @click.prevent="applyEditing">
+ <?= _('Bearbeiten beantragen') ?>
+ </button>
+ <?= \Studip\LinkButton::create(_('Verlassen'), $controller->leave_editing($page))?>
+ </div>
+ </div>
+
+ <wiki-editor-online-users :users="users"></wiki-editor-online-users>
+
+</div>
diff --git a/app/views/course/wiki/history.php b/app/views/course/wiki/history.php
new file mode 100644
index 0000000000000000000000000000000000000000..81fde594c85fa335d9faba747400dcc1333f250a
--- /dev/null
+++ b/app/views/course/wiki/history.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @var WikiPage $page
+ * @var Course_WikiController $controller
+ */
+?>
+
+<table class="default sortable-table" data-sortlist="[[0, 1]]">
+ <caption>
+ <?= sprintf(_('%s - Versionshistorie'), htmlReady($page->name)) ?>
+ </caption>
+ <colgroup>
+ <col style="width: 60px;">
+ <col>
+ <col>
+ <col>
+ </colgroup>
+ <thead>
+ <tr>
+ <th data-sort="text"><?= _('Version') ?></th>
+ <th data-sort="text"><?= _('Autor/in') ?></th>
+ <th data-sort="text"><?= _('Erstellt am') ?></th>
+ <th data-sort="false" class="actions"><?= _('Aktion') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td data-sort-value="<?= count($page->versions) + 1 ?>">
+ <a href="<?= $controller->page($page) ?>">
+ <?= count($page->versions) + 1 ?>
+ </a>
+ </td>
+ <td data-sort-value="<?= htmlReady($page->user ? $page->user->getFullName() : _('unbekannt')) ?>">
+ <? if ($page->user) : ?>
+ <a href="<?= URLhelper::getLink('dispatch.php/profile', ['username' => $page->user->username]) ?>">
+ <? endif ?>
+ <?= Avatar::getAvatar($page['user_id'])->getImageTag(Avatar::SMALL) ?>
+ <?= htmlReady($page->user ? $page->user->getFullName() : _('unbekannt')) ?>
+ <? if ($page->user) : ?>
+ </a>
+ <? endif ?>
+ </td>
+ <td data-sort-value="<?= $page->chdate ?>"><?= $page->chdate > 0 ? date('d.m.Y H:i:s', $page->chdate) : _('unbekannt') ?></td>
+ <td class="actions">
+ <a href="<?= $controller->versiondiff($page) ?>" data-dialog>
+ <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?>
+ </a>
+ </td>
+ </tr>
+ <? foreach ($page->versions as $i => $version) : ?>
+ <tr>
+ <td>
+ <a href="<?= $controller->version($version) ?>">
+ <?= count($page->versions) - $i ?>
+ </a>
+ </td>
+ <td>
+ <? if ($version->user) : ?>
+ <a href="<?= URLhelper::getLink('dispatch.php/profile', ['username' => $version->user->username]) ?>">
+ <? endif ?>
+ <?= Avatar::getAvatar($version['user_id'])->getImageTag(Avatar::SMALL) ?>
+ <?= htmlReady($version->user ? $version->user->getFullName() : _('unbekannt')) ?>
+ <? if ($version->user) : ?>
+ </a>
+ <? endif ?>
+ </td>
+ <td><?= $version->mkdate > 0 ? date('d.m.Y H:i:s', $version->mkdate) : _('unbekannt') ?></td>
+ <td class="actions">
+ <a href="<?= $controller->versiondiff($page, $version->id) ?>" data-dialog>
+ <?= Icon::create('log')->asImg(['class' => 'text-bottom']) ?>
+ </a>
+ </td>
+ </tr>
+ <? endforeach ?>
+ </tbody>
+</table>
diff --git a/app/views/course/wiki/import.php b/app/views/course/wiki/import.php
new file mode 100644
index 0000000000000000000000000000000000000000..7c602ef16698f835cbe6317928c03bd8fa8bf72a
--- /dev/null
+++ b/app/views/course/wiki/import.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @var bool $show_wiki_page_form
+ * @var Course_WikiController $controller
+ * @var Range $range
+ * @var bool $success
+ * @var bool $bad_course_search
+ * @var QuickSearch $course_search
+ * @var Course $selected_course
+ * @var array $wiki_pages
+ */
+?>
+<form class="default" method="post"
+ name="wiki_import_form"
+ data-dialog="size=auto;<?= $show_wiki_page_form ? 'reload-on-close' : '' ?>"
+ action="<?= $controller->import() ?>">
+ <?= CSRFProtection::tokenTag() ?>
+
+ <? if (!$show_wiki_page_form && !$success): ?>
+ <fieldset>
+ <legend><?= _('Suche nach Veranstaltungen') ?></legend>
+ <label class="with-action">
+ <? if ($bad_course_search): ?>
+ <?= _('Meinten Sie eine der folgenden Veranstaltungen?') ?>
+ <? else: ?>
+ <?= _('Sie können hier eine Veranstaltung mit zu importierenden Wiki-Seiten suchen.') ?>
+ <? endif ?>
+ <?= $course_search->render() ?>
+ <? if ($bad_course_search): ?>
+ <a href="<?= $controller->import() ?>"
+ data-dialog="1">
+ <?= Icon::create('decline')->asImg([
+ 'class' => 'text-bottom',
+ 'title' => _('Suche zurücksetzen'),
+ 'onclick' => "STUDIP.QuickSearch.reset('wiki_import_form', 'selected_range_id');"
+ ]) ?>
+ </a>
+ <? else : ?>
+ <?= Icon::create('search')->asImg([
+ 'class' => 'text-bottom',
+ 'title' => _('Suche starten'),
+ 'onclick' => "jQuery(this).closest('form').submit();"
+ ]) ?>
+ <? endif ?>
+ </label>
+ <div data-dialog-button>
+ <? if ($bad_course_search): ?>
+ <?= Studip\LinkButton::create(
+ _('Neue Suche'),
+ $controller->importURL(),
+ ['data-dialog' => 'size=auto']
+ ) ?>
+ <? endif ?>
+ <?= Studip\LinkButton::createCancel(
+ _('Abbrechen'),
+ $controller->pageURL()
+ ) ?>
+ </div>
+ </fieldset>
+ <? endif ?>
+
+ <? if ($show_wiki_page_form): ?>
+ <input type="hidden" name="selected_range_id"
+ value="<?= htmlReady($selected_course->id) ?>">
+ <? if ($wiki_pages): ?>
+ <table class="default">
+ <colgroup>
+ <col style="width: 20px">
+ <col>
+ </colgroup>
+ <caption>
+ <?= sprintf(
+ _('%s: Importierbare Wiki-Seiten'),
+ htmlReady($selected_course->getFullName())
+ ) ?>
+ </caption>
+ <thead>
+ <tr>
+ <th>
+ <input type="checkbox"
+ data-proxyfor=":checkbox[name='selected_wiki_page_ids[]']">
+ </th>
+ <th><?= _('Seitenname') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <? foreach ($wiki_pages as $wiki_page): ?>
+ <? if ($wiki_page->isReadable()) : ?>
+ <tr>
+ <td>
+ <input type="checkbox"
+ name="selected_wiki_page_ids[]"
+ value="<?= htmlReady($wiki_page->getId()) ?>">
+ </td>
+ <td><?= htmlReady($wiki_page->name) ?></td>
+ </tr>
+ <? endif ?>
+ <? endforeach ?>
+ </tbody>
+ </table>
+ <div data-dialog-button>
+ <?= Studip\Button::create(_('Importieren'), 'import') ?>
+ <?= Studip\LinkButton::create(
+ _('Neue Suche'),
+ $controller->importURL(),
+ ['data-dialog' => 'size=auto']
+ ) ?>
+ <?= Studip\LinkButton::createCancel(
+ _('Abbrechen'),
+ $controller->pageURL()
+ ) ?>
+ </div>
+ <? else: ?>
+ <?= MessageBox::info(
+ _('Die gewählte Veranstaltung besitzt keine Wiki-Seiten!')
+ ) ?>
+ <? endif ?>
+ <? endif ?>
+ <? if ($success): ?>
+ <div data-dialog-button>
+ <?= Studip\LinkButton::create(
+ _('Import neu starten'),
+ $controller->importURL(),
+ ['data-dialog' => 'size=auto']
+ ) ?>
+ <?= Studip\LinkButton::createCancel(
+ _('Zurück zum Wiki'),
+ $controller->pageURL()
+ ) ?>
+ </div>
+ <? endif ?>
+</form>
diff --git a/app/views/course/wiki/newpages.php b/app/views/course/wiki/newpages.php
new file mode 100644
index 0000000000000000000000000000000000000000..da7b560da2aaf8543853a52fb70cb2afd7eed48c
--- /dev/null
+++ b/app/views/course/wiki/newpages.php
@@ -0,0 +1,18 @@
+<table class="default sortable-table" data-sortlist="[[3, 0]]">
+ <caption>
+ <?= _('Letzte Änderungen') ?>
+ </caption>
+ <thead>
+ <tr>
+ <th data-sort="text"><?= _('Seitenname') ?></th>
+ <th data-sort="false"><?= _('Text') ?></th>
+ <th data-sort="text"><?= _('Autor/-in') ?></th>
+ <th data-sort="text"><?= _('Datum') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <? foreach (array_reverse($versions) as $version) : ?>
+ <?= $this->render_partial('course/wiki/versioncompare', ['version' => $version]) ?>
+ <? endforeach ?>
+ </tbody>
+</table>
diff --git a/app/views/course/wiki/page.php b/app/views/course/wiki/page.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3c67cfbf3474e6d08f6cbc5e10ef66f7a1c36cd
--- /dev/null
+++ b/app/views/course/wiki/page.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @var WikiPage $page
+ * @var string $edit_perms
+ * @var Context $range
+ * @var Course_WikiController $controller
+ */
+
+echo $contentbar;
+?>
+
+<? if ($page->isEditable()) : ?>
+<form action="<?= $controller->delete($page->id) ?>" method="post" id="delete_page">
+ <?= CSRFProtection::tokenTag() ?>
+</form>
+<? endif ?>
+
+<? if ($page->isNew()) : ?>
+ <section>
+ <? if ($edit_perms !== 'all' && !$GLOBALS['perm']->have_studip_perm($edit_perms, $range->id)) : ?>
+ <div class="wiki-empty-background"></div>
+ <? else : ?>
+ <a href="<?= $controller->new_page() ?>"
+ data-dialog
+ class="wiki-empty-background"
+ title="<?= _('Dieses Wiki ist noch leer. Erstellen Sie die erste Wiki-Seite.') ?>"></a>
+ <? endif ?>
+ <div class="flex">
+ <? if ($edit_perms !== 'all' && !$GLOBALS['perm']->have_studip_perm($edit_perms, $range->id)) : ?>
+ <div class="wiki-teaser">
+ <? else : ?>
+ <a href="<?= $controller->new_page() ?>"
+ data-dialog
+ class="wiki-teaser">
+ <? endif ?>
+ <?= _('Mach die Welt ein Stückchen schlauer.') ?>
+ <? if ($edit_perms !== 'all' && !$GLOBALS['perm']->have_studip_perm($edit_perms, $range->id)) : ?>
+ </div>
+ <? else : ?>
+ </a>
+ <? endif ?>
+ </div>
+ </section>
+<? else : ?>
+ <article class="studip wiki">
+ <section>
+ <div class="wiki_page_content wiki_page_content_<?= htmlReady($page->id) ?>"
+ data-page_id="<?= htmlReady($page->id) ?>">
+ <?= wikiReady($page->content, true, $range->id, $page->id) ?>
+ </div>
+ </section>
+ <? if ($page->isEditable()) : ?>
+ <footer id="wikifooter">
+ <div class="button-group">
+ <?= \Studip\LinkButton::create(_('Bearbeiten'), $controller->editURL($page)) ?>
+ </div>
+ </footer>
+ <? endif ?>
+ </article>
+<? endif ?>
diff --git a/app/views/course/wiki/search.php b/app/views/course/wiki/search.php
new file mode 100644
index 0000000000000000000000000000000000000000..5c73c6f1beeff556187f55803e5e3264dcd98eba
--- /dev/null
+++ b/app/views/course/wiki/search.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @var WikiPage[] $pages
+ * @var string $edit_perms
+ * @var Course_WikiController $controller
+ */
+?>
+
+<? if (count($pages)) : ?>
+
+ <table class="default">
+ <caption>
+ <?= sprintf(_('Treffer für Suche nach <em>%s</em> in allen Versionen'), htmlReady(Request::get('search'))) ?>
+ </caption>
+ <thead>
+ <tr>
+ <th><?= _('Seite') ?></th>
+ <th><?= _('Treffer') ?></th>
+ <th><?= _('Datum') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <? foreach ($pages as $page_id => $pagedata) : ?>
+ <tr>
+ <td>
+ <?
+ sort($pagedata['versions'], SORT_NUMERIC);
+ $pagedata['versions'] = array_reverse($pagedata['versions']);
+ if ($pagedata['is_in_content']) {
+ $content = $pagedata['page']->content;
+ } else if ($pagedata['is_in_history']) {
+ $version = WikiVersion::find($pagedata['versions'][0]);
+ $content = $version->content;
+ }
+ ?>
+ <a href="<?= $pagedata['is_in_content'] || $pagedata['is_in_name']
+ ? $controller->page($page_id)
+ : $controller->version($version) ?>">
+ <?= htmlReady($pagedata['page']->name) ?>
+ <? if (!$pagedata['is_in_content'] && !$pagedata['is_in_name']) : ?>
+ <span><?= _('Nur in alter Version der Seite enthalten.') ?></span>
+ <? endif ?>
+ </a>
+ </td>
+ <td>
+ <?
+ $content = Studip\Markup::removeHtml($content);
+ $offset = 0;
+ $output = [];
+
+ // find all occurences
+ while ($offset < mb_strlen($content)) {
+ $pos = mb_stripos($content, Request::get('search'), $offset);
+ if ($pos === false) {
+ break;
+ }
+ $offset = $pos + 1;
+ if (($ignore_next_hits--) > 0) {
+ // if more than one occurence is found
+ // in a fragment to be displayed,
+ // the fragment is only shown once
+ continue;
+ }
+ // show max 80 chars
+ $fragment = '';
+ $split_fragment = preg_split('/(' . preg_quote(Request::get('search'), '/') . ')/i', mb_substr($content, max(0, $pos - 40), 80), -1, PREG_SPLIT_DELIM_CAPTURE);
+ for ($i = 0; $i < count($split_fragment); ++$i) {
+ if ($i % 2) {
+ $fragment .= '<span class="wiki_highlight">';
+ $fragment .= htmlready($split_fragment[$i], false);
+ $fragment .= '</span>';
+ } else {
+ $fragment .= htmlready($split_fragment[$i], false);
+ }
+ }
+ $found_in_fragment = (count($split_fragment) - 1) / 2; // number of hits in fragment
+ $ignore_next_hits = ($found_in_fragment > 1) ? $found_in_fragment - 1 : 0;
+ $output[] = "..." . $fragment . "...";
+ }
+ if ($pagedata['is_in_name']) {
+ $name = str_ireplace(Request::get('search'), '<span class="wiki_highlight">' . htmlReady(Request::get('search')) . '</span>', htmlReady($pagedata['page']->name));
+ array_unshift($output, sprintf(_('Treffer im Namen: %s'), $name));
+ } else if ($pagedata['is_in_old_name']) {
+ $name = str_ireplace(Request::get('search'), '<span class="wiki_highlight">' . htmlReady(Request::get('search')) . '</span>', htmlReady($version->name));
+ array_unshift($output, sprintf(_('Treffer in alten Namen: %s'), $name));
+ }
+ echo implode('<br>', $output);
+ ?>
+ </td>
+ <td>
+ <? if ($pagedata['is_in_content'] || $pagedata['is_in_name']) : ?>
+ <?= _('Aktuelle Version') . ': ' . ($pagedata['page']->chdate ? date('d.m.Y H:i:s', $pagedata['page']->chdate) : _('unbekannt')) ?>
+ <? else : ?>
+ <?= $version->chdate > 0 ? date('d.m.Y H:i:s', $version->chdate) : _('unbekannt') ?>
+ <? endif ?>
+ </td>
+ </tr>
+ <? endforeach ?>
+ </tbody>
+ </table>
+<? else : ?>
+ <?= MessageBox::info(sprintf(_('Ihre Suche nach <em>%s</em> ergab keine Treffer.'), htmlReady(Request::get('search')))) ?>
+<? endif ?>
diff --git a/app/views/course/wiki/version.php b/app/views/course/wiki/version.php
new file mode 100644
index 0000000000000000000000000000000000000000..26094ae6161e598e08bf6b8adbf3db70d1500778
--- /dev/null
+++ b/app/views/course/wiki/version.php
@@ -0,0 +1,5 @@
+<?= $contentbar ?>
+
+<div class="wiki_page_content">
+ <?= wikiReady($version['content']) ?>
+</div>
diff --git a/app/views/course/wiki/versioncompare.php b/app/views/course/wiki/versioncompare.php
new file mode 100644
index 0000000000000000000000000000000000000000..490d1e28cd6b0910b9b1f642a0202cc0234934ae
--- /dev/null
+++ b/app/views/course/wiki/versioncompare.php
@@ -0,0 +1,44 @@
+<tr>
+ <td data-sort-value="<?= htmlReady(is_a($version, WikiPage::class) ? $version->name : $version->page->name) ?>">
+ <a href="<?= is_a($version, WikiPage::class) ? $controller->page($version) : $controller->version($version) ?>">
+ <?= htmlReady(is_a($version, WikiPage::class) ? $version->name : $version->page->name) ?>
+ </a>
+ </td>
+ <td>
+ <?
+ $oldversion = $version->predecessor ? $version->predecessor->content : '';
+ $oldcontent = strip_tags(wikiReady($oldversion));
+ $content = strip_tags(wikiReady($version->content));
+ while ($content && $oldcontent && $content[0] == $oldcontent[0]) {
+ $content = substr($content, 1);
+ $oldcontent = substr($oldcontent, 1);
+ }
+ while ($content && $oldcontent && $content[strlen($content) - 1] == $oldcontent[strlen($oldcontent) - 1]) {
+ $content = substr($content, 0, -1);
+ $oldcontent = substr($oldcontent, 0, -1);
+ }
+ if ($content) {
+ echo nl2br(htmlReady($content));
+ } elseif ($oldcontent) {
+ echo _('Gelöscht') . ': ' . nl2br(htmlReady($oldcontent));
+ } else {
+ echo nl2br(strip_tags(wikiReady($version->content)));
+ }
+
+ ?></td>
+ <? $user = User::find($version->user_id) ?>
+ <td data-sort-value="<?= htmlReady($user ? $user->getFullName() : _('unbekannt')) ?>">
+ <?
+ if ($user) {
+ echo Avatar::getAvatar($user->id)->getImageTag(Avatar::SMALL);
+ echo ' ';
+ echo htmlReady($user->getFullName());
+ } else {
+ echo _('unbekannt');
+ }
+ ?></td>
+ <td data-sort-value="<?= htmlReady(is_a($version, WikiPage::class) ? $version->chdate : $version->mkdate) ?>">
+ <? $chdate = is_a($version, WikiPage::class) ? $version->chdate : $version->mkdate ?>
+ <?= $chdate > 0 ? date('d.m.Y H:i:s', $chdate) : _('unbekannt') ?>
+ </td>
+</tr>
diff --git a/app/views/course/wiki/versiondiff.php b/app/views/course/wiki/versiondiff.php
new file mode 100644
index 0000000000000000000000000000000000000000..49ac6f4827c412b46234aceb0387a1b94e19fe64
--- /dev/null
+++ b/app/views/course/wiki/versiondiff.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @var WikiPage|WikiVersion $version
+ * @var Course_WikiController $controller
+ */
+?>
+<h3>
+ <a href="<?= is_a($version, WikiPage::class) ? $controller->page($version) : $controller->version($version) ?>">
+ <? $chdate = is_a($version, WikiPage::class) ? $version->chdate : $version->mkdate ?>
+ <?= sprintf(
+ _('Version %1$s, geändert von %2$s am %3$s.'),
+ htmlReady($version->versionnumber),
+ htmlReady($version->user ? $version->user->getFullName() : _('unbekannt')),
+ $chdate > 0 ? date('d.m.Y H:i:s', $chdate) : _('unbekannt')) ?>
+ </a>
+</h3>
+<div class="wiki_diffs">
+ <?= $diff ?>
+</div>
diff --git a/app/views/wiki/change_courseperms.php b/app/views/wiki/change_courseperms.php
deleted file mode 100644
index b0d274287cdac78f7bafa5de92a28913b2f5ef5b..0000000000000000000000000000000000000000
--- a/app/views/wiki/change_courseperms.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @var WikiController $controller
- * @var bool $restricted
- * @var string $keyword
- */
-?>
-<form action="<?= $controller->link_for('wiki/store_courseperms', compact('keyword')) ?>" method="post" class="default">
- <?= CSRFProtection::tokenTag() ?>
-
- <fieldset>
- <label><?= _('Editierberechtigung') ?></label>
-
- <label>
- <input type="radio" name="courseperms" value="0"
- <? if (!$restricted) echo 'checked'; ?>>
- <?= _('Alle in der Veranstaltung') ?>
- </label>
- <label>
- <input type="radio" name="courseperms" value="1"
- <? if ($restricted) echo 'checked'; ?>>
- <?= _('Lehrende und Tutor/innen') ?>
- </label>
- </fieldset>
-
- <footer data-dialog-button>
- <?= Studip\Button::createAccept(_('Speichern')) ?>
- <?= Studip\LinkButton::createCancel(
- _('Abbrechen'),
- URLHelper::getURL('wiki.php', compact('keyword'))
- ) ?>
- </footer>
-</form>
diff --git a/app/views/wiki/change_page_config.php b/app/views/wiki/change_page_config.php
deleted file mode 100644
index e121c207549424d9626b35cd4fc2d6b4626fe57b..0000000000000000000000000000000000000000
--- a/app/views/wiki/change_page_config.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * @var WikiController $controller
- * @var WikiPageConfig $config
- * @var array $validKeywords
- * @var string $keyword
- */
-?>
-<form action="<?= $controller->link_for('wiki/store_page_config', compact('keyword')) ?>" method="post" class="default" id="wiki-config">
- <?= CSRFProtection::tokenTag() ?>
-
- <fieldset class="global-permissions">
- <label>
- <input type="checkbox" name="page_global_perms" value="1"
- data-deactivates=".read-permissions :radio, .edit-permissions :radio"
- <? if ($config->isDefault()) echo 'checked'; ?>>
- <?= _('Standard Wiki-Einstellungen verwenden') ?>
- </label>
- </fieldset>
-
- <fieldset class="read-permissions">
- <legend><?= _('Leseberechtigung') ?></legend>
-
- <label>
- <input type="radio" name="page_read_perms" id="autor_read" value="0"
- <? if (!$config->read_restricted) echo 'checked'; ?>
- title="<?= _('Wiki-Seite für alle Teilnehmenden lesbar') ?>"
- data-activates=".edit-permissions :radio">
- <?= _('Alle in der Veranstaltung') ?>
- </label>
- <label>
- <input type="radio" name="page_read_perms" id="tutor_read" value="1"
- <? if ($config->read_restricted) echo 'checked'; ?>
- title="<?= _('Wiki-Seite nur eingeschränkt lesbar') ?>"
- data-deactivates="#autor_edit" data-activates="#tutor_edit">
- <?= _('Lehrende und Tutor/innen') ?>
- </label>
- </fieldset>
-
- <fieldset class="edit-permissions">
- <legend><?= _('Editierberechtigung') ?></legend>
-
- <label>
- <input type="radio" name="page_edit_perms" id="autor_edit" value="0"
- <? if (!$config->edit_restricted) echo 'checked'; ?>
- title="<?= _('Nur editierbar, wenn für alle Teilnehmenden lesbar') ?>">
- <?= _('Alle in der Veranstaltung') ?>
- </label>
- <label>
- <input type="radio" name="page_edit_perms" id="tutor_edit" value="1"
- <? if ($config->edit_restricted) echo 'checked'; ?>
- title="<?= _('Nur editierbar, wenn für diesen Personenkreis lesbar') ?>">
- <?= _('Lehrende und Tutor/innen') ?>
- </label>
- </fieldset>
-
- <fieldset>
- <legend><?= _('Vorgängerseite') ?></legend>
- <label>
- <? if ($keyword === "WikiWikiWeb") : ?>
- <p><?= _("Diese Wikiseite darf keine Vorgängerseite haben.") ?></p>
- <? else : ?>
- <select name="ancestor_select" id="ancestor_select">
- <option value=""> <?= _('keine Vorgängerseite') ?> </option>
- <? foreach ($validKeywords as $validKeyword) : ?>
- <option value="<?= htmlReady($validKeyword) ?>" <?= $page->ancestor === $validKeyword ? 'selected="selected"' : '' ?> >
- <?= $validKeyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : htmlReady($validKeyword) ?>
- </option>
- <? endforeach ?>
- </select>
- <? endif ?>
- </label>
- </fieldset>
-
- <footer data-dialog-button>
- <?= Studip\Button::createAccept(_('Speichern')) ?>
- <?= Studip\LinkButton::createCancel(
- _('Abbrechen'),
- URLHelper::getURL('wiki.php', compact('keyword'))
- ) ?>
- </footer>
-</form>
diff --git a/app/views/wiki/create.php b/app/views/wiki/create.php
deleted file mode 100644
index 09df6ee9db1361b08814df56bd0a330c705142aa..0000000000000000000000000000000000000000
--- a/app/views/wiki/create.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @var string $keyword
- * @var string[] $wiki_page_names
- */
-?>
-<p>
- <?= _('Hier können Sie eine neue Wiki-Seite erstellen.') ?>
- <br />
- <?= _('Bitte beachten Sie:') ?>
- <?= _('Eckige Klammern und das Zeichen | sind im Titel nicht erlaubt.') ?>
-</p>
-
-<form action="<?= URLHelper::getLink('wiki.php', ['view' => 'editnew', 'lastpage' => $keyword]) ?>" method="post" class="default">
- <label>
- <span class="required"><?= _('Titel') ?></span>
- <input required type="text" name="keyword" pattern="[^\][|]+"
- placeholder="<?= _('Name der Wiki-Seite') ?>">
- </label>
-
- <label>
- <span class="required"><?= _('Vorgängerseite') ?></span>
- <select name="ancestor_select" id="ancestor_select">
- <option value=""> <?= _('keine Vorgängerseite') ?> </option>
- <?php foreach ($wiki_page_names as $keyword) : ?>
- <option value="<?= htmlReady($keyword) ?>" <?= $this->keyword == $keyword ? 'selected="selected"' : '' ?> >
- <?= $keyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : htmlReady($keyword) ?>
- <? endforeach ?>
- </select>
- </label>
-
- <footer data-dialog-button>
- <?= Studip\Button::createAccept(_('Anlegen'), 'submit') ?>
- <?= Studip\LinkButton::createCancel(_('Abbrechen'), URLHelper::getURL('wiki.php', compact('keyword'))) ?>
- </footer>
-</form>
diff --git a/app/views/wiki/import.php b/app/views/wiki/import.php
deleted file mode 100644
index 1fd39c9076dd588b0d0f20310d586bab35f27cf3..0000000000000000000000000000000000000000
--- a/app/views/wiki/import.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * @var bool $show_wiki_page_form
- * @var WikiController $controller
- * @var Course $course
- * @var bool $success
- * @var bool $bad_course_search
- * @var QuickSearch $course_search
- * @var Course $selected_course
- * @var array $wiki_pages
- */
-?>
-<form class="default" method="post"
- name="wiki_import_form"
- data-dialog="size=auto;<?= $show_wiki_page_form ? 'reload-on-close' : '' ?>"
- action="<?= $controller->link_for("wiki/import/{$course->id}") ?>">
- <?= CSRFProtection::tokenTag() ?>
-
-<? if (!$show_wiki_page_form && !$success): ?>
- <fieldset>
- <legend><?= _('Suche nach Veranstaltungen') ?></legend>
- <label class="with-action">
- <? if ($bad_course_search): ?>
- <?= _('Meinten Sie eine der folgenden Veranstaltungen?') ?>
- <? else: ?>
- <?= _('Sie können hier eine Veranstaltung mit zu importierenden Wikiseiten suchen.') ?>
- <? endif ?>
- <?= $course_search->render() ?>
- <?= Icon::create('search')->asImg([
- 'class' => 'text-bottom',
- 'title' => _('Suche starten'),
- 'onclick' => "jQuery(this).closest('form').submit();"
- ]) ?>
- <? if ($bad_course_search): ?>
- <a href="<?= $controller->link_for("wiki/import/{$course->id}") ?>"
- data-dialog="1">
- <?= Icon::create('decline')->asImg([
- 'class' => 'text-bottom',
- 'title' => _('Suche zurücksetzen'),
- 'onclick' => "STUDIP.QuickSearch.reset('wiki_import_form', 'selected_course_id');"
- ]) ?>
- </a>
- <? else: ?>
- <?= Icon::create('decline')->asImg([
- 'class' => 'text-bottom',
- 'title' => _('Suche zurücksetzen'),
- 'onclick' => "STUDIP.QuickSearch.reset('wiki_import_form', 'selected_course_id');"
- ]) ?>
- <? endif ?>
- </label>
- <div data-dialog-button>
- <? if ($bad_course_search): ?>
- <?= Studip\LinkButton::create(
- _('Neue Suche'),
- $controller->url_for("wiki/import/{$course->id}"),
- ['data-dialog' => 'size=auto']
- ) ?>
- <? endif ?>
- <?= Studip\LinkButton::createCancel(
- _('Abbrechen'),
- URLHelper::getURL(
- 'wiki.php',
- [
- 'cid' => Context::getId(),
- 'view' => 'show'
- ]
- )
- ) ?>
- </div>
- </fieldset>
-<? endif ?>
-
-<? if ($show_wiki_page_form): ?>
- <input type="hidden" name="selected_course_id"
- value="<?= htmlReady($selected_course->id) ?>">
- <? if ($wiki_pages): ?>
- <table class="default">
- <colgroup>
- <col width="20px">
- <col>
- </colgroup>
- <caption>
- <?= sprintf(
- _('%s: Importierbare Wikiseiten'),
- htmlReady($selected_course->getFullName())
- ) ?>
- </caption>
- <thead>
- <tr>
- <th>
- <input type="checkbox"
- data-proxyfor=":checkbox[name='selected_wiki_page_ids[]']">
- </th>
- <th><?= _('Seitenname') ?></th>
- </tr>
- </thead>
- <tbody>
- <? foreach ($wiki_pages as $wiki_page): ?>
- <tr>
- <td>
- <input type="checkbox"
- name="selected_wiki_page_ids[]"
- value="<?= htmlReady(json_encode($wiki_page->getId())) ?>">
- </td>
- <td><?= htmlReady($wiki_page->keyword) ?></td>
- </tr>
- <? endforeach ?>
- </tbody>
- </table>
- <div data-dialog-button>
- <?= Studip\Button::create(_('Importieren'), 'import') ?>
- <?= Studip\LinkButton::create(
- _('Neue Suche'),
- $controller->url_for("wiki/import/{$course->id}"),
- ['data-dialog' => 'size=auto']
- ) ?>
- <?= Studip\LinkButton::createCancel(
- _('Abbrechen'),
- URLHelper::getURL(
- 'wiki.php',
- [
- 'cid' => Context::getId(),
- 'view' => 'show'
- ]
- )
- ) ?>
- </div>
- <? else: ?>
- <?= MessageBox::info(
- _('Die gewählte Veranstaltung besitzt keine Wikiseiten!')
- ) ?>
- <? endif ?>
-<? endif ?>
-<? if ($success): ?>
- <div data-dialog-button>
- <?= Studip\LinkButton::create(
- _('Import neu starten'),
- $controller->url_for("wiki/import/{$course->id}"),
- ['data-dialog' => 'size=auto']
- ) ?>
- <?= Studip\LinkButton::createCancel(
- _('Zurück zum Wiki'),
- URLHelper::getURL(
- 'wiki.php',
- [
- 'cid' => Context::getId(),
- 'view' => 'show'
- ]
- )
- ) ?>
- </div>
-<? endif ?>
-</form>
diff --git a/app/views/wiki/info.php b/app/views/wiki/info.php
deleted file mode 100644
index 356ccdc19f531318f141e4d96fa2ebe701908cc5..0000000000000000000000000000000000000000
--- a/app/views/wiki/info.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * @var string $keyword
- * @var WikiPage $last_page
- * @var WikiPage $first_page
- * @var User $first_user
- * @var User $last_user
- * @var array $backlinks
- * @var WikiPage[] $descendants
- */
-?>
-<h1>
- <?= $keyword === 'WikiWikiWeb' ? _("Wiki-Startseite") : htmlReady($keyword) ?>
-</h1>
-
-<aside class="wiki-info-aside">
- <table class="default nohover">
- <caption>
- <?= _('Details') ?>
- </caption>
-
- <tbody>
- <tr>
- <td><?= _('Version') ?></td>
- <td><?= $last_page['version'] ?></td>
- </tr>
- <tr>
- <td><?= _('Erstellt') ?></td>
- <td><?= date('d.m.Y, H:i', $first_page['chdate']) ?></td>
- </tr>
- <tr>
- <td><?= _('Erstellt von') ?></td>
- <td><?= htmlReady($first_user->username) ?></td>
- </tr>
- <tr>
- <td><?= _('Zuletzt geändert') ?></td>
- <td><?= date('d.m.Y, H:i', $last_page['chdate']) ?></td>
- </tr>
- <tr>
- <td><?= _('Geändert von') ?></td>
- <td><?= htmlReady($last_user->username) ?></td>
- </tr>
- </tbody>
- </table>
-</aside>
-
-<table class="default nohover wiki-backlinks">
- <caption>
- <?=_('Verweise auf diese Seite') ?>
- </caption>
-
- <tbody>
- <? if ($backlinks): ?>
- <? foreach (getBacklinks($keyword) as $backlink) : ?>
- <tr>
- <td>
- <a href="<?= URLHelper::getLink('wiki.php', ['keyword' => $backlink]) ?>">
- <?= Icon::create('link-extern') ?>
- <?= $backlink === 'WikiWikiWeb' ? _('Wiki-Startseite') : htmlReady($backlink) ?>
- </a>
- </td>
- </tr>
- <? endforeach ?>
- <? else: ?>
- <tr>
- <td><?= _('keine') ?></td>
- </tr>
- <? endif ?>
- </tbody>
-</table>
-
-<table class="default nohover wiki-backlinks">
- <caption>
- <?=_('Untergeordnete Seiten') ?>
- </caption>
-
- <tbody>
- <? if ($descendants): ?>
- <? foreach ($descendants as $descendant) : ?>
- <tr>
- <td>
- <a href="<?= URLHelper::getLink('wiki.php', ['keyword' => $descendant->keyword]) ?>">
- <?= Icon::create('wiki') ?>
- <?= htmlReady($descendant->keyword) ?>
- </a>
- </td>
- </tr>
- <? endforeach ?>
- <? else: ?>
- <tr>
- <td><?= _('keine') ?></td>
- </tr>
- <? endif ?>
- </tbody>
-</table>
diff --git a/db/migrations/5.5.23_modernize_wiki.php b/db/migrations/5.5.23_modernize_wiki.php
new file mode 100644
index 0000000000000000000000000000000000000000..a6b975ae498c386974bd619789d15b3483196267
--- /dev/null
+++ b/db/migrations/5.5.23_modernize_wiki.php
@@ -0,0 +1,316 @@
+<?
+
+final class ModernizeWiki extends Migration
+{
+
+ public function description()
+ {
+ return 'The wiki is getting better and mightier.';
+ }
+
+ protected function up()
+ {
+ DBManager::get()->exec("
+ CREATE TABLE `wiki_pages` (
+ `page_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+ `name` varchar(255) NOT NULL,
+ `content` mediumtext DEFAULT NULL,
+ `parent_id` int(11) DEFAULT NULL,
+ `read_permission` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'all',
+ `write_permission` varchar(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'all',
+ `user_id` char(32) NOT NULL,
+ `locked_since` bigint(20) DEFAULT NULL,
+ `locked_by_user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `chdate` bigint(20) NOT NULL,
+ `mkdate` bigint(20) NOT NULL,
+ PRIMARY KEY (`page_id`),
+ KEY `read_permission` (`read_permission`),
+ KEY `write_permission` (`write_permission`),
+ KEY `range_id` (`range_id`)
+ )
+ ");
+ DBManager::get()->exec("
+ CREATE TABLE `wiki_versions` (
+ `version_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `page_id` int(11) unsigned NOT NULL,
+ `name` varchar(128) NOT NULL,
+ `content` text DEFAULT NULL,
+ `user_id` char(32) NOT NULL,
+ `mkdate` bigint(20) NOT NULL,
+ PRIMARY KEY (`version_id`),
+ KEY `page_id` (`page_id`),
+ KEY `mkdate` (`mkdate`)
+ )
+ ");
+
+ DBManager::get()->exec("
+ INSERT INTO `wiki_pages` (`range_id`, `name`, `content`, `parent_id`, `read_permission`, `write_permission`, `user_id`, `chdate`, `mkdate`)
+ SELECT `wiki`.`range_id`,
+ `wiki`.`keyword`,
+ `wiki`.`body`,
+ NULL,
+ IF(`wiki_page_config`.`read_restricted` > 0, 'tutor', 'all'),
+ IF(`wiki_page_config`.`edit_restricted` > 0, 'tutor', 'all'),
+ `wiki`.`user_id`,
+ `wiki`.`chdate`,
+ IFNULL(`wiki`.`mkdate`, UNIX_TIMESTAMP())
+ FROM `wiki`
+ INNER JOIN (
+ SELECT `wiki`.`range_id`, `wiki`.`keyword`, MAX(`version`) AS `version`
+ FROM `wiki`
+ GROUP BY `wiki`.`range_id`, `wiki`.`keyword`
+ ) AS `wiki_grouped` ON (`wiki_grouped`.`range_id` = `wiki`.`range_id` AND `wiki_grouped`.`keyword` = `wiki`.`keyword` AND `wiki_grouped`.`version` = `wiki`.`version`)
+ LEFT JOIN `wiki_page_config` ON (`wiki`.`keyword` = `wiki_page_config`.`keyword` AND `wiki_page_config`.`range_id` = `wiki_grouped`.`range_id`)
+ ");
+ DBManager::get()->exec("
+ UPDATE `wiki_pages`
+ SET `parent_id` = (
+ SELECT `wp`.`page_id`
+ FROM (SELECT * FROM `wiki_pages`) AS `wp`
+ INNER JOIN `wiki` ON (`wiki`.`range_id` = `wp`.`range_id` AND `wiki`.`keyword` = `wp`.`name`)
+ WHERE `wiki`.`ancestor` = `wiki_pages`.`name`
+ AND `wp`.`range_id` = `wiki_pages`.`range_id`
+ LIMIT 1
+ )
+ ");
+ DBManager::get()->exec("
+ INSERT INTO `wiki_versions` (`page_id`, `name`, `content`, `user_id`, `mkdate`)
+ SELECT `wiki_pages`.`page_id`,
+ `wiki`.`keyword`,
+ `wiki`.`body`,
+ `wiki`.`user_id`,
+ `wiki`.`mkdate`
+ FROM `wiki`
+ LEFT JOIN (
+ SELECT `wiki`.`range_id`, `keyword`, MAX(`version`) AS `version`
+ FROM `wiki`
+ GROUP BY `wiki`.`range_id`, `wiki`.`keyword`
+ ) AS `wiki_grouped` ON (`wiki`.`range_id` = `wiki_grouped`.`range_id` AND `wiki`.`keyword` = `wiki_grouped`.`keyword`)
+ INNER JOIN `wiki_pages` ON (`wiki_pages`.`name` = `wiki`.`keyword` AND `wiki_pages`.`range_id` = `wiki`.`range_id`)
+ WHERE `wiki`.`version` != `wiki_grouped`.`version`
+ ");
+
+ //first delete all orphaned entries:
+ DBManager::get()->exec("
+ DELETE FROM `wiki_links`
+ WHERE `from_keyword` NOT IN (SELECT `name` FROM `wiki_pages` WHERE `wiki_links`.`range_id` = `wiki_pages`.`range_id`)
+ OR `to_keyword` NOT IN (SELECT `name` FROM `wiki_pages` WHERE `wiki_links`.`range_id` = `wiki_pages`.`range_id`)
+ ");
+ DBManager::get()->exec("
+ UPDATE `wiki_links`
+ SET `from_keyword` = (SELECT `page_id` FROM `wiki_pages` WHERE `wiki_pages`.`name` = `wiki_links`.`from_keyword` AND `wiki_links`.`range_id` = `wiki_pages`.`range_id` LIMIT 1),
+ `to_keyword` = (SELECT `page_id` FROM `wiki_pages` WHERE `wiki_pages`.`name` = `wiki_links`.`to_keyword` AND `wiki_links`.`range_id` = `wiki_pages`.`range_id` LIMIT 1)
+ ");
+ DBManager::get()->exec("
+ ALTER TABLE `wiki_links`
+ CHANGE `from_keyword` `from_page_id` int(11) unsigned NOT NULL,
+ CHANGE `to_keyword` `to_page_id` int(11) unsigned NOT NULL,
+ CHANGE `range_id` `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT ''
+ ");
+
+ $statement = DBManager::get()->prepare("
+ INSERT IGNORE INTO config (field, value, type, `range`, mkdate, chdate, description)
+ VALUES (:name, :value, :type, :range, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), :description)
+ ");
+ $statement->execute([
+ 'name' => 'WIKI_STARTPAGE_ID',
+ 'description' => 'ID der Wiki-Startseite des Wikis.',
+ 'range' => 'course',
+ 'type' => 'string',
+ 'value' => ''
+ ]);
+ $statement->execute([
+ 'name' => 'WIKI_CREATE_PERMISSION',
+ 'description' => 'Status, den es braucht, um neue Wiki-Seiten anzulegen.',
+ 'range' => 'course',
+ 'type' => 'string',
+ 'value' => 'all'
+ ]);
+ $statement->execute([
+ 'name' => 'WIKI_RENAME_PERMISSION',
+ 'description' => 'Status, den es braucht, um Wiki-Seiten umzubenennen.',
+ 'range' => 'course',
+ 'type' => 'string',
+ 'value' => 'all'
+ ]);
+
+ DBManager::get()->exec("
+ INSERT INTO `config_values` (`field`, `range_id`, `value`, `mkdate`, `chdate`, `comment`)
+ SELECT 'WIKI_STARTPAGE_ID', `wiki_pages`.`range_id`, `wiki_pages`.`page_id`, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), ''
+ FROM `wiki`
+ INNER JOIN `wiki_pages` ON (`wiki_pages`.`name` = `wiki`.`keyword` AND `wiki_pages`.`range_id` = `wiki`.`range_id`)
+ WHERE `keyword` = 'WikiWikiWeb'
+ GROUP BY `wiki`.`range_id`
+ ");
+ DBManager::get()->exec("
+ CREATE TABLE `wiki_online_editing_users` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+ `page_id` int(11) NOT NULL,
+ `editing` tinyint(1) NOT NULL DEFAULT 0,
+ `editing_request` tinyint(1) NOT NULL DEFAULT 0,
+ `chdate` int(11) NOT NULL,
+ `mkdate` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `user_id_2` (`user_id`,`page_id`),
+ KEY `user_id` (`user_id`),
+ KEY `page_id` (`page_id`),
+ KEY `chdate` (`chdate`)
+ )
+ ");
+
+ //if SuperWiki installed
+ $superwiki_enabled = (bool) DBManager::get()->fetchColumn("SELECT 1 FROM `plugins` WHERE `pluginclassname` = 'SuperWiki' AND `enabled` = 'yes'");
+ if ($superwiki_enabled && !$GLOBALS['PREVENT_MIGRATE_SUPERWIKI']) {
+ DBManager::get()->exec("
+ INSERT INTO `wiki_pages` (`range_id`, `name`, `content`, `parent_id`, `read_permission`, `write_permission`, `user_id`, `chdate`, `mkdate`)
+ SELECT `superwiki_pages`.`seminar_id`,
+ `superwiki_pages`.`name`,
+ `superwiki_pages`.`content`,
+ NULL,
+ `superwiki_pages`.`read_permission`,
+ `superwiki_pages`.`write_permission`,
+ `superwiki_pages`.`last_author`,
+ `superwiki_pages`.`chdate`,
+ `superwiki_pages`.`mkdate`
+ FROM `superwiki_pages`
+ ");
+ DBManager::get()->exec("
+ INSERT INTO `wiki_versions` (`page_id`, `name`, `content`, `user_id`, `mkdate`)
+ SELECT `wiki_pages`.`page_id`,
+ `superwiki_versions`.`name`,
+ `superwiki_versions`.`content`,
+ `superwiki_versions`.`last_author`,
+ `superwiki_versions`.`chdate`
+ FROM `superwiki_versions`
+ INNER JOIN `superwiki_pages` ON (`superwiki_pages`.`page_id` = `superwiki_versions`.`page_id`)
+ INNER JOIN `wiki_pages` ON (`wiki_pages`.`range_id` = `superwiki_pages`.`seminar_id` AND `wiki_pages`.`name` = `superwiki_pages`.`name`)
+ ");
+ }
+ DBManager::get()->exec("
+ DROP TABLE `wiki`
+ ");
+ DBManager::get()->exec("
+ DROP TABLE `wiki_page_config`
+ ");
+ DBManager::get()->exec("
+ DROP TABLE `wiki_locks`
+ ");
+ }
+
+ protected function down()
+ {
+ DBManager::get()->exec("
+ DROP TABLE `wiki_online_editing_users`
+ ");
+ DBManager::get()->exec("
+ CREATE TABLE `wiki_locks` (
+ `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
+ `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
+ `keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+ `chdate` int(10) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY (`range_id`,`user_id`,`keyword`),
+ KEY `user_id` (`user_id`),
+ KEY `chdate` (`chdate`)
+ )
+ ");
+ DBManager::get()->exec("
+ ALTER TABLE `wiki_links`
+ CHANGE `from_page_id` `from_keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+ CHANGE `to_page_id` `to_keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+ CHANGE `range_id` `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT ''
+ ");
+ DBManager::get()->exec("
+ UPDATE `wiki_links`
+ SET `from_keyword` = (SELECT `name` FROM `wiki_pages` WHERE `wiki_pages`.`page_id` = `wiki_links`.`from_keyword` AND `wiki_links`.`range_id` = `wiki_pages`.`range_id` LIMIT 1),
+ `to_keyword` = (SELECT `name` FROM `wiki_pages` WHERE `wiki_pages`.`page_id` = `wiki_links`.`to_keyword` AND `wiki_links`.`range_id` = `wiki_pages`.`range_id` LIMIT 1)
+ ");
+
+ DBManager::get()->exec("
+ CREATE TABLE `wiki` (
+ `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
+ `user_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+ `body` mediumtext NOT NULL,
+ `ancestor` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
+ `chdate` int(10) unsigned DEFAULT NULL,
+ `version` int(11) NOT NULL DEFAULT 0,
+ `mkdate` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`range_id`,`keyword`,`version`),
+ KEY `user_id` (`user_id`),
+ KEY `chdate` (`chdate`)
+ )
+ ");
+
+ DBManager::get()->exec("
+ INSERT INTO `wiki` (`range_id`, `user_id`, `keyword`, `body`, `ancestor`, `chdate`, `version`, `mkdate`)
+ SELECT `wiki_pages`.`range_id`, `wiki_pages`.`last_author`, `wiki_pages`.`name`, `wiki_pages`.`content`, `wp2`.`name`, `wiki_pages`.`chdate`, COUNT(`wiki_versions`.`page_id`) + 1, `wiki_pages`.`mkdate`
+ FROM `wiki_pages`
+ LEFT JOIN `wiki_pages` AS wp2 ON (`wiki_pages`.`parent_id` = `wp2`.`page_id`)
+ LEFT JOIN `wiki_versions` ON (`wiki_versions`.`page_id` = `wiki_pages`.`page_id`)
+ GROUP BY `wiki_pages`.`page_id`
+ ");
+ DBManager::get()->exec("
+ INSERT INTO `wiki` (`range_id`, `user_id`, `keyword`, `body`, `ancestor`, `chdate`, `version`, `mkdate`)
+ SELECT `wiki_pages`.`range_id`, `wiki_versions`.`user_id`, `wiki_pages`.`name`, `wiki_versions`.`content`, `wp2`.`name`, `wiki_versions`.`chdate`, 1, `wiki_pages`.`mkdate`
+ FROM `wiki_versions`
+ LEFT JOIN `wiki_pages` ON (`wiki_pages`.`page_id` = `wiki_versions`.`page_id`)
+ LEFT JOIN `wiki_pages` AS `wp2` ON (`wp2`.`page_id` = `wiki_pages`.`parent_id`)
+ ORDER BY `wiki_versions`.`mkdate`
+ ");
+
+ DBManager::get()->exec("
+ CREATE TABLE `wiki_page_config` (
+ `range_id` char(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+ `keyword` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+ `read_restricted` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `edit_restricted` tinyint(3) unsigned NOT NULL DEFAULT 0,
+ `mkdate` int(10) unsigned DEFAULT NULL,
+ `chdate` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`range_id`,`keyword`)
+ )
+ ");
+ DBManager::get()->exec("
+ INSERT INTO `wiki_page_config` (`range_id`, `keyword`, `read_restricted`, `edit_restricted`, `chdate`, `mkdate`)
+ SELECT `wiki_pages`.`range_id`, `wiki_pages`.`name`, IF(`wiki_pages`.`read_permission` = 'all', 0, 1), IF(`wiki_pages`.`write_permission` = 'all', 0, 1), `wiki_pages`.`chdate`, `wiki_pages`.`mkdate`
+ FROM `wiki_pages`
+ ");
+
+ DBManager::get()->exec("
+ DROP TABLE `wiki_pages`
+ ");
+ DBManager::get()->exec("
+ DROP TABLE `wiki_versions`
+ ");
+ DBManager::get()->exec("
+ DROP TABLE `wiki_settings`
+ ");
+
+ DBManager::get()->exec("
+ DELETE FROM `config_values`
+ WHERE `field` = 'WIKI_STARTPAGE_ID'
+ ");
+ DBManager::get()->exec("
+ DELETE FROM `config`
+ WHERE `field` = 'WIKI_STARTPAGE_ID'
+ ");
+ DBManager::get()->exec("
+ DELETE FROM `config_values`
+ WHERE `field` = 'WIKI_CREATE_PERMISSION'
+ ");
+ DBManager::get()->exec("
+ DELETE FROM `config`
+ WHERE `field` = 'WIKI_CREATE_PERMISSION'
+ ");
+ DBManager::get()->exec("
+ DELETE FROM `config_values`
+ WHERE `field` = 'WIKI_RENAME_PERMISSION'
+ ");
+ DBManager::get()->exec("
+ DELETE FROM `config`
+ WHERE `field` = 'WIKI_RENAME_PERMISSION'
+ ");
+ }
+
+}
diff --git a/lib/activities/WikiProvider.php b/lib/activities/WikiProvider.php
index e412279ef392606034726f2deb4ad9898dea404e..90ca98154b0fd9cfce2c86b7528d632d7e0eb9b7 100644
--- a/lib/activities/WikiProvider.php
+++ b/lib/activities/WikiProvider.php
@@ -18,15 +18,15 @@ class WikiProvider implements ActivityProvider
public function getActivityDetails($activity)
{
// Check visibility of wiki page
- $page = \WikiPage::findLatestPage($activity->context_id, $activity->object_id);
- if ($page && !$page->isVisibleTo($GLOBALS['user'])) {
+ $page = \WikiPage::findOneBySQL('`range_id` = ? AND `name` = ?', [$activity->context_id, $activity->object_id]);
+ if ($page && !$page->isReadable()) {
return false;
}
$activity->content = \htmlReady($activity->content);
if ($activity->context === 'course') {
- $url = \URLHelper::getURL('wiki.php', ['cid' => $activity->context_id, 'keyword' => $activity->object_id]);
+ $url = \URLHelper::getURL('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $activity->context_id]);
$route = \URLHelper::getURL("api.php/course/{$activity->context_id}/wiki/{$activity->object_id}", null, true);
$activity->object_url = [
@@ -36,7 +36,7 @@ class WikiProvider implements ActivityProvider
$activity->object_route = $route;
} elseif ($activity->context === 'institute') {
- $url = \URLHelper::getURL('wiki.php', ['cid' => $activity->context_id, 'keyword' => $activity->object_id]);
+ $url = \URLHelper::getURL('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $activity->context_id]);
$route= null;
$activity->object_url = [
@@ -58,7 +58,8 @@ class WikiProvider implements ActivityProvider
public static function postActivity($event, $info)
{
$range_id = $info['range_id'];
- $keyword = $info['keyword'];
+ $id = $info->id;
+ $name = $info['name'];
$type = get_object_type($range_id);
if ($type === 'sem') {
@@ -70,11 +71,6 @@ class WikiProvider implements ActivityProvider
$user_id = $GLOBALS['user']->id;
$mkdate = time();
-
- if ($event === 'WikiPageDidCreate' && $info['version'] > 1) {
- $event = 'WikiPageDidUpdate';
- }
-
if ($event === 'WikiPageDidCreate') {
$verb = 'created';
if ($type === 'sem') {
@@ -98,7 +94,7 @@ class WikiProvider implements ActivityProvider
}
}
- $summary = sprintf($summary, $keyword, get_fullname($user_id), $course->name);
+ $summary = sprintf($summary, $name, get_fullname($user_id), $course->name);
$activity = Activity::create([
'provider' => __CLASS__,
@@ -108,7 +104,7 @@ class WikiProvider implements ActivityProvider
'actor_type' => 'user', // who initiated the activity?
'actor_id' => $user_id, // id of initiator
'verb' => $verb, // the activity type
- 'object_id' => $keyword, // the id of the referenced object
+ 'object_id' => $id, // the id of the referenced object
'object_type' => 'wiki', // type of activity object
'mkdate' => $mkdate,
]);
diff --git a/lib/archiv.inc.php b/lib/archiv.inc.php
index b9e18ac8e6fea11764c4d9222ae33b6cdf36b21d..8fe4bc950e7215b1a005a2d0eae90e6e1b334983 100644
--- a/lib/archiv.inc.php
+++ b/lib/archiv.inc.php
@@ -59,7 +59,9 @@ function lastActivity ($sem_id)
// Wiki
if (Config::get()->WIKI_ENABLE) {
- $queries[] = "SELECT MAX(chdate) AS chdate FROM wiki WHERE range_id = :id";
+ $queries[] = "SELECT MAX(`chdate`) AS chdate
+ FROM `wiki_pages`
+ WHERE `range_id` = :id";
}
foreach (PluginEngine::getPlugins('ForumModule') as $plugin) {
diff --git a/lib/bootstrap-autoload.php b/lib/bootstrap-autoload.php
index d45ffcdb4751958e250a19ff2d7fbea38e7da3ff..69910b24f39553b80681a48f5f432fff01728d55 100644
--- a/lib/bootstrap-autoload.php
+++ b/lib/bootstrap-autoload.php
@@ -33,6 +33,7 @@ StudipAutoloader::addAutoloadPath('lib/classes/searchtypes');
StudipAutoloader::addAutoloadPath('lib/classes/sidebar');
StudipAutoloader::addAutoloadPath('lib/classes/visibility');
StudipAutoloader::addAutoloadPath('lib/classes/coursewizardsteps');
+StudipAutoloader::addAutoloadPath('lib/classes/wiki');
StudipAutoloader::addAutoloadPath('lib/calendar');
StudipAutoloader::addAutoloadPath('lib/calendar', 'Studip\\Calendar');
diff --git a/lib/classes/JsonApi/Routes/Wiki/Authority.php b/lib/classes/JsonApi/Routes/Wiki/Authority.php
index 090dc846b80fd816a2feace70c405d7f92210da3..c9ac7bb736c4caf1413490a6f0e1981a090b5a12 100644
--- a/lib/classes/JsonApi/Routes/Wiki/Authority.php
+++ b/lib/classes/JsonApi/Routes/Wiki/Authority.php
@@ -21,7 +21,7 @@ class Authority
*/
public static function canShowWiki(\User $user, \WikiPage $wikiPage)
{
- return $wikiPage->isVisibleTo($user);
+ return $wikiPage->isReadable($user->id);
}
/**
@@ -29,7 +29,9 @@ class Authority
*/
public static function canCreateWiki(\User $user, $range)
{
- return \WikiPage::build(['range_id' => $range->id])->isCreatableBy($user);
+ $config = \CourseConfig::get($range->id);
+ return $config->WIKI_CREATE_PERMISSION === 'all'
+ || $GLOBALS['perm']->have_studip_perm($config->WIKI_CREATE_PERMISSION, $range->id);
}
/**
@@ -37,7 +39,7 @@ class Authority
*/
public static function canUpdateWiki(\User $user, \WikiPage $wikiPage)
{
- return $wikiPage->isEditableBy($user);
+ return $wikiPage->isEditable($user->id);
}
/**
@@ -45,7 +47,7 @@ class Authority
*/
public static function canDeleteWiki(\User $user, \WikiPage $wikiPage)
{
- return $GLOBALS['perm']->have_studip_perm('tutor', $wikiPage->range_id, $user->id);
+ return $wikiPage->isEditable($user->id);
}
/**
diff --git a/lib/classes/JsonApi/Routes/Wiki/HelperTrait.php b/lib/classes/JsonApi/Routes/Wiki/HelperTrait.php
index 00bd43e1ecc7d9cdd02e4de8df6cfc484befffb4..74c518bf0a195732808e34901caadf724bb2832b 100644
--- a/lib/classes/JsonApi/Routes/Wiki/HelperTrait.php
+++ b/lib/classes/JsonApi/Routes/Wiki/HelperTrait.php
@@ -9,11 +9,20 @@ trait HelperTrait
{
protected static function findWikiPage($wikiPageId)
{
+ if (is_numeric($wikiPageId)) {
+ $page = \WikiPage::find($wikiPageId);
+ if (!$page) {
+ throw new RecordNotFoundException();
+ } else {
+ return $page;
+ }
+ }
+
if (!preg_match('/^([^_]+)_(.+)$/', $wikiPageId, $matches)) {
throw new BadRequestException();
}
- if (!$wikiPage = \WikiPage::findLatestPage($matches[1], $matches[2])) {
+ if (!$wikiPage = \WikiPage::findOneBySQL('`range_id` = ? AND `name` = ?', [$matches[1], $matches[2]])) {
throw new RecordNotFoundException();
}
diff --git a/lib/classes/JsonApi/Routes/Wiki/WikiCreate.php b/lib/classes/JsonApi/Routes/Wiki/WikiCreate.php
index ffd4efcefac445e40a01f9e75b9d79824ea5cfb2..015a16545c3cf95ca6658e2c2c1285be654e7987 100644
--- a/lib/classes/JsonApi/Routes/Wiki/WikiCreate.php
+++ b/lib/classes/JsonApi/Routes/Wiki/WikiCreate.php
@@ -12,7 +12,6 @@ use JsonApi\JsonApiController;
use JsonApi\Routes\ValidationTrait;
use JsonApi\Schemas\WikiPage;
-require_once 'lib/wiki.inc.php';
/**
* Create a news where the range is the user himself.
@@ -29,17 +28,19 @@ class WikiCreate extends JsonApiController
$json = $this->validate($request);
// TODO: has to be Course or Institute
- if (!$range = \Course::find($args['id'])) {
+ $range = \RangeFactory::find($args['id']);
+ if (!$range || $range instanceof \User) {
throw new RecordNotFoundException();
}
- if (!Authority::canCreateWiki($user = $this->getUser($request), $range)) {
+ $user = $this->getUser($request);
+ if (!Authority::canCreateWiki($user, $range)) {
throw new AuthorizationFailedException();
}
- $keyword = self::arrayGet($json, 'data.attributes.keyword');
+ $name = self::arrayGet($json, 'data.attributes.name') ?? self::arrayGet($json, 'data.attributes.keyword');
- if (\WikiPage::findLatestPage($range->id, $keyword)) {
+ if (\WikiPage::findOneBySQL('`range_id` = ? AND `name` = ?', [$range->id, $name])) {
throw new ConflictException('Wiki page already exists.');
}
@@ -52,14 +53,13 @@ class WikiCreate extends JsonApiController
protected function createWikiFromJSON(\User $user, $range, $json)
{
- $keyword = self::arrayGet($json, 'data.attributes.keyword');
+ $name = self::arrayGet($json, 'data.attributes.name') ?? self::arrayGet($json, 'data.attributes.keyword');
$content = self::arrayGet($json, 'data.attributes.content');
$content = \Studip\Markup::purifyHtml($content);
$wiki = new \WikiPage();
- $wiki->keyword = $keyword;
- $wiki->body = $content;
- $wiki->version = 1;
+ $wiki->name = $name;
+ $wiki->content = $content;
$wiki->chdate = time();
$wiki->user_id = $user->id;
$wiki->range_id = $range->id;
@@ -70,12 +70,12 @@ class WikiCreate extends JsonApiController
protected function validateResourceDocument($json, $data)
{
- $keyword = self::arrayGet($json, 'data.attributes.keyword', '');
- if (empty($keyword)) {
+ $name = self::arrayGet($json, 'data.attributes.name', '');
+ if (empty($name)) {
return 'Wikis must have a title (keyword)';
}
- if (!preg_match(WikiPage::REGEXP_KEYWORD, $keyword)) {
+ if (!preg_match(WikiPage::REGEXP_KEYWORD, $name)) {
return 'Malformed wiki keyword.';
}
}
diff --git a/lib/classes/JsonApi/Routes/Wiki/WikiDelete.php b/lib/classes/JsonApi/Routes/Wiki/WikiDelete.php
index 709c468692e2315920b172b9de81e9d40e4406e4..4d88d7063e250b55ad3df36201c1e17f6501a41a 100644
--- a/lib/classes/JsonApi/Routes/Wiki/WikiDelete.php
+++ b/lib/classes/JsonApi/Routes/Wiki/WikiDelete.php
@@ -7,8 +7,6 @@ use Psr\Http\Message\ResponseInterface as Response;
use JsonApi\Errors\AuthorizationFailedException;
use JsonApi\JsonApiController;
-require_once 'lib/wiki.inc.php';
-
class WikiDelete extends JsonApiController
{
use HelperTrait;
@@ -24,10 +22,7 @@ class WikiDelete extends JsonApiController
throw new AuthorizationFailedException();
}
- \WikiPage::deleteBySQL(
- 'keyword = ? AND range_id = ?',
- [$wikiPage->keyword, $wikiPage->range_id]
- );
+ $wikiPage->delete();
return $this->getCodeResponse(204);
}
diff --git a/lib/classes/JsonApi/Routes/Wiki/WikiIndex.php b/lib/classes/JsonApi/Routes/Wiki/WikiIndex.php
index 2bc238e7ad2b662f960f2184786e672b65a39c0c..e3b93c5f5ddb0c525ec40d18e3291904d9196c1f 100644
--- a/lib/classes/JsonApi/Routes/Wiki/WikiIndex.php
+++ b/lib/classes/JsonApi/Routes/Wiki/WikiIndex.php
@@ -29,9 +29,10 @@ class WikiIndex extends JsonApiController
throw new AuthorizationFailedException();
}
- if (!$wiki = \WikiPage::findLatestPages($course->id)) {
+ if (!$wiki = \WikiPage::findBySQL('`range_id` = ? ORDER BY name ASC ', [$course->id])) {
throw new RecordNotFoundException();
}
+ $wiki = \SimpleORMapCollection::createFromArray($wiki);
list($offset, $limit) = $this->getOffsetAndLimit();
diff --git a/lib/classes/JsonApi/Routes/Wiki/WikiUpdate.php b/lib/classes/JsonApi/Routes/Wiki/WikiUpdate.php
index 15acd600cadc768f44bea9322b30dae005547205..49b562a21b3600d56d2f531bbc1fd4be21e7f04e 100644
--- a/lib/classes/JsonApi/Routes/Wiki/WikiUpdate.php
+++ b/lib/classes/JsonApi/Routes/Wiki/WikiUpdate.php
@@ -9,8 +9,6 @@ use JsonApi\Errors\InternalServerError;
use JsonApi\JsonApiController;
use JsonApi\Routes\ValidationTrait;
-require_once 'lib/wiki.inc.php';
-
/**
* Create a news where the range is the user himself.
*/
@@ -26,7 +24,8 @@ class WikiUpdate extends JsonApiController
$json = $this->validate($request);
$wikiPage = self::findWikiPage($args['id']);
- if (!Authority::canUpdateWiki($user = $this->getUser($request), $wikiPage)) {
+ $user = $this->getUser($request);
+ if (!Authority::canUpdateWiki($user, $wikiPage)) {
throw new AuthorizationFailedException();
}
@@ -42,14 +41,14 @@ class WikiUpdate extends JsonApiController
$content = self::arrayGet($json, 'data.attributes.content');
$content = \Studip\Markup::purifyHtml($content);
- if ($wikiPage->body === $content) {
+ if ($wikiPage->content === $content) {
return $wikiPage;
}
$checkTime = ceil((time() - $wikiPage->chdate) / 60);
if ($checkTime <= 30 && $wikiPage->user_id == $user->id) {
$wikiPage->chdate = time();
- $wikiPage->body = $content;
+ $wikiPage->content = $content;
$wikiPage->store();
return $wikiPage;
@@ -59,12 +58,12 @@ class WikiUpdate extends JsonApiController
// minutes ago or if the editing user differs
return \WikiPage::create(
array_merge(
- $wikiPage->toArray('keyword range_id'),
+ $wikiPage->toArray('name range_id'),
[
- 'body' => $content,
+ 'content' => $content,
'chdate' => time(),
'user_id' => $user->id,
- 'version' => $wikiPage->version + 1,
+ 'version' => count($wikiPage->versions) + 1,
]
)
);
diff --git a/lib/classes/JsonApi/Schemas/Activity.php b/lib/classes/JsonApi/Schemas/Activity.php
index 607b41d011be356875f1da0b818b98db06e08a26..fbdd6e75a4ce7c8635670db96003e1a461fa2738 100644
--- a/lib/classes/JsonApi/Schemas/Activity.php
+++ b/lib/classes/JsonApi/Schemas/Activity.php
@@ -102,7 +102,7 @@ class Activity extends SchemaProvider
$objectMapping = $mapping[$activity->object_type];
if ($activity->object_type === 'wiki') {
- $data = \WikiPage::findLatestPage($activity->context_id, $activity->object_id);
+ $data = \WikiPage::findOneBySQL('`course_id` = ? AND `name` = ?', [$activity->context_id, $activity->object_id]);
} else {
$data = $include
? call_user_func([$objectMapping, 'find'], $activity->object_id)
diff --git a/lib/classes/JsonApi/Schemas/WikiPage.php b/lib/classes/JsonApi/Schemas/WikiPage.php
index 30d3bb92bd6919c45063aa0f140bc0777d4690a7..857666e8a20978cceb3604fee2425bfd7242a68a 100644
--- a/lib/classes/JsonApi/Schemas/WikiPage.php
+++ b/lib/classes/JsonApi/Schemas/WikiPage.php
@@ -68,20 +68,16 @@ class WikiPage extends SchemaProvider
public function getId($wiki): ?string
{
- return sprintf(
- '%s_%s',
- $wiki->range_id,
- $wiki->keyword
- );
+ return $wiki->id;
}
public function getAttributes($wiki, ContextInterface $context): iterable
{
return [
- 'keyword' => $wiki->keyword,
- 'content' => $wiki->body,
+ 'name' => $wiki->name,
+ 'content' => $wiki->content,
'chdate' => date('c', $wiki->chdate),
- 'version' => (int) $wiki->version,
+ 'version' => count($wiki->versions) + 1,
];
}
@@ -156,12 +152,12 @@ class WikiPage extends SchemaProvider
*/
private function addAuthorRelationship($relationships, $wiki, $includeList)
{
- if ($wiki->author) {
+ if ($wiki->user_id) {
$relationships[self::REL_AUTHOR] = [
self::RELATIONSHIP_LINKS => [
- Link::RELATED => $this->createLinkToResource($wiki->author),
+ Link::RELATED => $this->createLinkToResource($wiki->user),
],
- self::RELATIONSHIP_DATA => $wiki->author,
+ self::RELATIONSHIP_DATA => $wiki->user,
];
}
diff --git a/lib/classes/Score.class.php b/lib/classes/Score.class.php
index 1a1b5d91622a9fd8b0329fa21e2a082cfcdc0ea3..51bd7dc0d4269bcf21e4b01df884e8d4056ea4d6 100644
--- a/lib/classes/Score.class.php
+++ b/lib/classes/Score.class.php
@@ -207,7 +207,7 @@ class Score
];
$tables[] = ['table' => 'questionnaire_anonymous_answers'];
$tables[] = [
- 'table' => 'wiki',
+ 'table' => 'wiki_pages',
'date_column' => 'chdate'
];
diff --git a/lib/classes/Seminar.class.php b/lib/classes/Seminar.class.php
index b27e2ce5f3776185b2bc6e74150539af6ff478a5..12e44249b271a6870227f31a98ddf3594442f554 100644
--- a/lib/classes/Seminar.class.php
+++ b/lib/classes/Seminar.class.php
@@ -1615,9 +1615,6 @@ class Seminar
$statement = DBManager::get()->prepare($query);
$statement->execute([$s_id]);
- // remove wiki page config
- WikiPageConfig::deleteBySQL('range_id = ?', [$s_id]);
-
// delete course config values
ConfigValue::deleteBySQL('range_id = ?', [$s_id]);
diff --git a/lib/classes/StudipKing.class.php b/lib/classes/StudipKing.class.php
index bb6964bd1f756e0d60b74a0c35b6bac09c4637cc..2d1f15ce883faada0e5e1033262ea116c2833103 100644
--- a/lib/classes/StudipKing.class.php
+++ b/lib/classes/StudipKing.class.php
@@ -107,7 +107,10 @@ class StudipKing {
private static function wiki_kings()
{
- return self::select_kings("SELECT user_id AS id, COUNT(*) AS num FROM wiki GROUP BY user_id");
+ return self::select_kings("
+ SELECT user_id AS id, COUNT(*) AS num
+ FROM (SELECT user_id FROM wiki_pages UNION SELECT user_id FROM wiki_versions) AS `all_wiki_pages`
+ GROUP BY user_id");
}
private static function forum_kings()
diff --git a/lib/classes/WikiFormat.php b/lib/classes/WikiFormat.php
index 0614010b1de093af25438d9b3d36f5165a42ddb7..5d9c5f3b099bd175c6835552af90284445b8ae1d 100644
--- a/lib/classes/WikiFormat.php
+++ b/lib/classes/WikiFormat.php
@@ -29,6 +29,9 @@ class WikiFormat extends StudipFormat
],
];
+ private $range_id = null;
+ private $page_id = null;
+
/**
* Adds a new markup rule to the wiki markup set. This can
* also be used to replace an existing markup rule. The end regular
@@ -89,10 +92,13 @@ class WikiFormat extends StudipFormat
/**
* Initializes a new WikiFormat instance.
+ * @param string|null $range_id ID of the course or institute.
*/
- public function __construct()
+ public function __construct($range_id = null, $page_id = null)
{
parent::__construct();
+ $this->range_id = $range_id;
+ $this->page_id = $page_id;
foreach (self::$wiki_rules as $name => $rule) {
$this->addMarkup(
$name,
@@ -104,6 +110,24 @@ class WikiFormat extends StudipFormat
}
}
+ /**
+ * Returns the range_id of the wiki-page for which the markup is desired.
+ * @return string|null
+ */
+ public function getRangeId()
+ {
+ return $this->range_id;
+ }
+
+ /**
+ * Returns the page_id of the wiki-page for which the markup is desired.
+ * @return string|null
+ */
+ public function getPageId()
+ {
+ return $this->page_id;
+ }
+
/**
* Stud.IP markup for wiki-comments
*
@@ -148,25 +172,25 @@ class WikiFormat extends StudipFormat
$keyword = decodeHTML($matches[1]);
$display_page = !empty($matches[2]) ? $markup->format($matches[2]) : htmlReady($keyword);
- $page = WikiPage::findLatestPage(Context::getId(), $keyword);
+ $range_id = $markup->getRangeId() ?? Context::getId();
+ $page = WikiPage::findByName($range_id, trim($keyword));
// Page does not exist
if (!$page) {
return sprintf('<a href="%s">%s(?)</a>',
- URLHelper::getLink('wiki.php', [
- 'keyword' => $keyword,
- 'origin' => Request::get('keyword') ?: 'WikiWikiWeb',
- 'view' => 'editnew'
+ URLHelper::getLink('dispatch.php/course/wiki/edit', [
+ 'keyword' => trim($keyword),
+ 'parent_id' => $markup->getPageId()
]),
$display_page
);
}
// Page is visible to current user
- if ($page->isVisibleTo($GLOBALS['user'])) {
+ if ($page->isReadable()) {
return sprintf(
'<a href="%s">%s</a>',
- URLHelper::getLink('wiki.php', compact('keyword')),
+ URLHelper::getLink('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $range_id]),
$display_page
);
}
@@ -174,7 +198,7 @@ class WikiFormat extends StudipFormat
// Page is not visible to current user and show be displayed accordingly
return sprintf(
'<a href="%s" class="wiki-restricted" title="%s">%s</a>',
- URLHelper::getLink('wiki.php', compact('keyword')),
+ URLHelper::getLink('dispatch.php/course/wiki/page/' . $page->id, ['cid' => $range_id]),
sprintf(
_('Sie haben keine Berechtigung, die Seite %s zu lesen!'),
htmlReady($keyword)
diff --git a/lib/classes/forms/Form.php b/lib/classes/forms/Form.php
index 3b295524d1b95f52a639267a8206ad41c6c81235..cc52113605966a1a337665d2d040bef388333139 100644
--- a/lib/classes/forms/Form.php
+++ b/lib/classes/forms/Form.php
@@ -11,11 +11,12 @@ class Form extends Part
//internals
protected $inputs = [];
protected $parts = [];
+ protected $buttons = [];
//appearance in html-form
protected $url = null;
protected $save_button_text = '';
- protected $save_button_name = '';
+ protected $save_button_name = 'STUDIPFORM_STORE_BUTTON';
protected $cancel_button_text = '';
protected $cancel_button_name = '';
@@ -68,6 +69,7 @@ class Form extends Part
parent::__construct(...$parts);
//Set a default for the success message:
$this->success_message = _('Daten wurden gespeichert.');
+ \NotificationCenter::addObserver($this, 'validationStep', 'ActionDidPerform');
}
/**
@@ -276,27 +278,14 @@ class Form extends Part
public function autoStore()
{
$this->autoStore = true;
- if (\Request::isPost() && \Request::isAjax() && !\Request::isDialog()) {
+ if (
+ \Request::isPost()
+ && \Request::isAjax()
+ && !\Request::isDialog()
+ && \Request::submitted($this->getSaveButtonName())
+ ) {
if (\Request::submitted('STUDIPFORM_SERVERVALIDATION')) {
- //verify the user input:
- $output = [];
- foreach ($this->getAllInputs() as $input) {
- if ($input->validate) {
- $callback = $input->getValidationCallback();
- $value = $this->getStorableValueFromRequest($input);
- $valid = $callback($value, $input);
- if ($valid !== true) {
- $output[$input->getName()] = [
- 'name' => $input->getName(),
- 'label' => $input->getTitle(),
- 'error' => $callback($value, $input)
- ];
- }
- }
- }
- echo json_encode($output);
- page_close();
- die();
+ $this->validate();
} else {
//storing the input
$this->store();
@@ -310,6 +299,32 @@ class Form extends Part
return $this;
}
+ public function validate()
+ {
+ if (\Request::isPost() && \Request::submitted('STUDIPFORM_SERVERVALIDATION')) {
+ //verify the user input:
+ $output = [];
+ foreach ($this->getAllInputs() as $input) {
+ if ($input->validate) {
+ $callback = $input->getValidationCallback();
+ $value = $this->getStorableValueFromRequest($input);
+ $valid = $callback($value, $input);
+ if ($valid !== true) {
+ $output[$input->getName()] = [
+ 'name' => $input->getName(),
+ 'label' => $input->getTitle(),
+ 'error' => $callback($value, $input)
+ ];
+ }
+ }
+ }
+ echo json_encode($output);
+ page_close();
+ die();
+ }
+ return $this;
+ }
+
public function isAutoStoring()
{
return $this->autoStore;
@@ -450,6 +465,26 @@ class Form extends Part
return $this->parts[count($this->parts) - 1];
}
+ /**
+ * Adds a Studip-Button object to the footer of the dialog.
+ * @param \Studip\Button $button
+ * @return Form
+ */
+ public function addButton(\Studip\Button $button) : Form
+ {
+ $this->buttons[] = $button;
+ return $this;
+ }
+
+ /**
+ * Returns the additional buttons (except the save-button) as an array of \Studip\Button objects
+ * @return array
+ */
+ public function getButtons() : array
+ {
+ return $this->buttons;
+ }
+
/**
* Renders the whole form as a string.
* @return string
@@ -481,6 +516,13 @@ class Form extends Part
&& ($context->isField($input->getName()) || $context->isRelation($input->getName()))
) {
return function ($value) use ($context, $input) {
+ if ($context && !$value && $value !== null) {
+ $metadata = $context->getTableMetadata();
+ if ($metadata['fields'][$input->getName()]['null'] === 'YES') {
+ //sets the value to null if this is a feasible db value for this field:
+ $value = null;
+ }
+ }
$context[$input->getName()] = $value;
};
}
diff --git a/lib/classes/wiki/WikiDiffLine.php b/lib/classes/wiki/WikiDiffLine.php
new file mode 100644
index 0000000000000000000000000000000000000000..ca0b9f793c9dea3b4c582b69b77f5d7e95a09690
--- /dev/null
+++ b/lib/classes/wiki/WikiDiffLine.php
@@ -0,0 +1,48 @@
+<?php
+
+/////////////////////////////////////////////////
+// DIFF functions adapted from:
+// PukiWiki - Yet another WikiWikiWeb clone.
+// http://www.pukiwiki.org (GPL'd)
+/*
+WikiDiffer
+
+S. Wu, <a href="http://www.cs.arizona.edu/people/gene/vita.html">
+E. Myers,</a> U. Manber, and W. Miller,
+<a href="http://www.cs.arizona.edu/people/gene/PAPERS/np_diff.ps">
+"An O(NP) Sequence Comparison Algorithm,"</a>
+Information Processing Letters 35, 6 (1990), 317-323.
+*/
+class WikiDiffLine
+{
+ var $text;
+ var $status;
+ var $who; // who originally wrote this line?
+
+ function __construct($text, $who = null)
+ {
+ $this->text = "$text\n";
+ $this->who = $who;
+ $this->status = [];
+ }
+ function compare($obj)
+ {
+ return $this->text == $obj->text;
+ }
+ function set($key,$status)
+ {
+ $this->status[$key] = $status;
+ }
+ function get($key)
+ {
+ return array_key_exists($key,$this->status) ? $this->status[$key] : '';
+ }
+ function merge($obj)
+ {
+ $this->status += $obj->status;
+ }
+ function text()
+ {
+ return $this->text;
+ }
+}
diff --git a/lib/classes/wiki/WikiDiffer.php b/lib/classes/wiki/WikiDiffer.php
new file mode 100644
index 0000000000000000000000000000000000000000..a39dcfebdd5ad3e0c9a1733bb43f2e743f044a5b
--- /dev/null
+++ b/lib/classes/wiki/WikiDiffer.php
@@ -0,0 +1,217 @@
+<?php
+
+/////////////////////////////////////////////////
+// DIFF functions adapted from:
+// PukiWiki - Yet another WikiWikiWeb clone.
+// http://www.pukiwiki.org (GPL'd)
+/*
+WikiDiffer
+
+S. Wu, <a href="http://www.cs.arizona.edu/people/gene/vita.html">
+E. Myers,</a> U. Manber, and W. Miller,
+<a href="http://www.cs.arizona.edu/people/gene/PAPERS/np_diff.ps">
+"An O(NP) Sequence Comparison Algorithm,"</a>
+Information Processing Letters 35, 6 (1990), 317-323.
+*/
+
+class WikiDiffer
+{
+ var $arr1,$arr2,$m,$n,$pos,$key,$plus,$minus,$equal,$reverse,$result,$path;
+ var $add_count;
+ var $delete_count;
+
+ static public function toDiffLineArray($lines, $who = null) {
+ $dla = [];
+ $lines = Studip\Markup::removeHtml($lines);
+ $lines = explode("\n",preg_replace("/\r/",'', $lines));
+ foreach ($lines as $l) {
+ $dla[] = new WikiDiffLine($l, $who);
+ }
+ return $dla;
+ }
+
+ static public function doDiff($strlines1, $strlines2)
+ {
+ $minus = '<div class="wiki_added" title="'._('Dieser Text wurde hinzugefügt').'"></div>';
+ $plus = '<div class="wiki_erased" title="'._('Dieser Text wurde gelöscht bzw. ersetzt.').'"></div>';
+ $equal = '<div class="wiki_equal"></div>';
+ $obj = new WikiDiffer($plus, $minus, $equal);
+ $str = $obj->str_compare($strlines1,$strlines2);
+ return $str;
+ }
+
+ function __construct($plus='+',$minus='-',$equal='=')
+ {
+ $this->plus = $plus;
+ $this->minus = $minus;
+ $this->equal = $equal;
+ }
+ function arr_compare($key,$arr1,$arr2)
+ {
+ $this->key = $key;
+ $this->arr1 = $arr1;
+ $this->arr2 = $arr2;
+ $this->compare();
+ $arr = $this->toArray();
+ return $arr;
+ }
+ function set_str($key,$str1,$str2)
+ {
+ $this->key = $key;
+ $this->arr1 = [];
+ $this->arr2 = [];
+ $str1 = preg_replace("/\r/",'',$str1);
+ $str2 = preg_replace("/\r/",'',$str2);
+ foreach (explode("\n",$str1) as $line)
+ {
+ $this->arr1[] = new WikiDiffLine($line);
+ }
+ foreach (explode("\n",$str2) as $line)
+ {
+ $this->arr2[] = new WikiDiffLine($line);
+ }
+ }
+ function str_compare($str1, $str2, $show_equal=FALSE)
+ {
+ $this->set_str('diff',$str1,$str2);
+ $this->compare();
+
+ $str = '';
+ $lastdiff = "";
+ $textaccu = "";
+ $template = "<div class='wiki_diff'>%s<div>%s</div></div>";
+ foreach ($this->toArray() as $obj)
+ {
+ if ($show_equal || $obj->get('diff') != $this->equal) {
+ if ($lastdiff && ($obj->get("diff") != $lastdiff) && trim($textaccu)) {
+ $str .= sprintf($template, $lastdiff, wikiReady($textaccu));
+ $textaccu="";
+ }
+ $textaccu .= $obj->text();
+ $lastdiff = $obj->get("diff");
+ }
+ }
+ if (trim($textaccu)) {
+ $str .= sprintf($template, $lastdiff, wikiReady($textaccu));
+ }
+ return $str;
+ }
+ function compare()
+ {
+ $this->m = count($this->arr1);
+ $this->n = count($this->arr2);
+
+ if ($this->m == 0 or $this->n == 0) // no need compare.
+ {
+ $this->result = [['x'=>0,'y'=>0]];
+ return;
+ }
+
+ // sentinel
+ array_unshift($this->arr1,new WikiDiffLine(''));
+ $this->m++;
+ array_unshift($this->arr2,new WikiDiffLine(''));
+ $this->n++;
+
+ $this->reverse = ($this->n < $this->m);
+ if ($this->reverse) // swap
+ {
+ $tmp = $this->m; $this->m = $this->n; $this->n = $tmp;
+ $tmp = $this->arr1; $this->arr1 = $this->arr2; $this->arr2 = $tmp;
+ unset($tmp);
+ }
+
+ $delta = $this->n - $this->m; // must be >=0;
+
+ $fp = [];
+ $this->path = [];
+
+ for ($p = -($this->m + 1); $p <= ($this->n + 1); $p++)
+ {
+ $fp[$p] = -1;
+ $this->path[$p] = [];
+ }
+
+ for ($p = 0;; $p++)
+ {
+ for ($k = -$p; $k <= $delta - 1; $k++)
+ {
+ $fp[$k] = $this->snake($k, $fp[$k - 1], $fp[$k + 1]);
+ }
+ for ($k = $delta + $p; $k >= $delta + 1; $k--)
+ {
+ $fp[$k] = $this->snake($k, $fp[$k - 1], $fp[$k + 1]);
+ }
+ $fp[$delta] = $this->snake($delta, $fp[$delta - 1], $fp[$delta + 1]);
+ if ($fp[$delta] >= $this->n)
+ {
+ $this->pos = $this->path[$delta]; //
+ return;
+ }
+ }
+ }
+ function snake($k, $y1, $y2)
+ {
+ if ($y1 >= $y2)
+ {
+ $_k = $k - 1;
+ $y = $y1 + 1;
+ }
+ else
+ {
+ $_k = $k + 1;
+ $y = $y2;
+ }
+ $this->path[$k] = $this->path[$_k];//
+ $x = $y - $k;
+ while ((($x + 1) < $this->m) and (($y + 1) < $this->n)
+ and $this->arr1[$x + 1]->compare($this->arr2[$y + 1]))
+ {
+ $x++; $y++;
+ $this->path[$k][] = ['x'=>$x,'y'=>$y]; //
+ }
+ return $y;
+ }
+ function toArray()
+ {
+ $arr = [];
+ if ($this->reverse) //
+ {
+ $_x = 'y'; $_y = 'x'; $_m = $this->n; $arr1 =& $this->arr2; $arr2 =& $this->arr1;
+ }
+ else
+ {
+ $_x = 'x'; $_y = 'y'; $_m = $this->m; $arr1 =& $this->arr1; $arr2 =& $this->arr2;
+ }
+
+ $x = $y = 1;
+ $this->add_count = $this->delete_count = 0;
+ $this->pos[] = ['x'=>$this->m,'y'=>$this->n]; // sentinel
+ foreach ($this->pos as $pos)
+ {
+ $this->delete_count += ($pos[$_x] - $x);
+ $this->add_count += ($pos[$_y] - $y);
+
+ while ($pos[$_x] > $x)
+ {
+ $arr1[$x]->set($this->key, $this->minus);
+ $arr[] = $arr1[$x++];
+ }
+
+ while ($pos[$_y] > $y)
+ {
+ $arr2[$y]->set($this->key, $this->plus);
+ $arr[] = $arr2[$y++];
+ }
+
+ if ($x < $_m)
+ {
+ $arr1[$x]->merge($arr2[$y]);
+ $arr1[$x]->set($this->key,$this->equal);
+ $arr[] = $arr1[$x];
+ }
+ $x++; $y++;
+ }
+ return $arr;
+ }
+}
diff --git a/lib/models/WikiOnlineEditingUser.php b/lib/models/WikiOnlineEditingUser.php
new file mode 100644
index 0000000000000000000000000000000000000000..5cc0df14c6bfbff72ccc47884771f688741ca98d
--- /dev/null
+++ b/lib/models/WikiOnlineEditingUser.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * WikiOnlineEditingUser.php
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * @author Rasmus Fuhse <fuhse@data-quest.de>
+ * @copyright 2023 Stud.IP Core-Group
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category Stud.IP
+ *
+ * @property string page_id database column
+ * @property string user_id database column
+ * @property string id alias column for user_id
+ * @property string last_lifesign computed column read/write
+ */
+class WikiOnlineEditingUser extends SimpleORMap
+{
+ public static $threshold = 60 * 1;
+
+ protected static function configure($config = [])
+ {
+ $config['db_table'] = 'wiki_online_editing_users';
+ $config['belongs_to']['page'] = [
+ 'class_name' => WikiPage::class,
+ 'foreign_key' => 'page_id'
+ ];
+ $config['belongs_to']['user'] = [
+ 'class_name' => User::class,
+ 'foreign_key' => 'user_id'
+ ];
+ parent::configure($config);
+ }
+}
diff --git a/lib/models/WikiPage.class.php b/lib/models/WikiPage.class.php
index b6cc4d25d911313baedbf8e8b6a9b8a8aae114fa..a5392b49dc4e6d9e926beca13b261b3b41711a32 100644
--- a/lib/models/WikiPage.class.php
+++ b/lib/models/WikiPage.class.php
@@ -12,15 +12,15 @@
* @copyright (c) Authors
*
* @property array $id alias for pk
- * @property string $range_id database column
+ * @property string $course_id database column
* @property string|null $user_id database column
- * @property string $keyword database column
- * @property string $body database column
+ * @property string $name database column
+ * @property string $content database column
* @property string|null $ancestor database column
* @property int|null $chdate database column
* @property int $version database column
* @property int|null $mkdate database column
- * @property User|null $author belongs_to User
+ * @property User|null $user belongs_to User
* @property Course $course belongs_to Course
* @property-read mixed $parent additional field
* @property-read mixed $children additional field
@@ -34,9 +34,9 @@ class WikiPage extends SimpleORMap implements PrivacyObject
*/
protected static function configure($config = [])
{
- $config['db_table'] = 'wiki';
+ $config['db_table'] = 'wiki_pages';
- $config['belongs_to']['author'] = [
+ $config['belongs_to']['user'] = [
'class_name' => User::class,
'foreign_key' => 'user_id'
];
@@ -44,176 +44,180 @@ class WikiPage extends SimpleORMap implements PrivacyObject
'class_name' => Course::class,
'foreign_key' => 'range_id',
];
+ $config['has_many']['versions'] = [
+ 'class_name' => WikiVersion::class,
+ 'foreign_key' => 'page_id',
+ 'order_by' => 'ORDER BY mkdate DESC',
+ 'on_delete' => 'delete',
+ ];
+ $config['has_many']['onlineeditingusers'] = [
+ 'class_name' => WikiOnlineEditingUser::class,
+ 'foreign_key' => 'page_id',
+ 'on_delete' => 'delete',
+ ];
$config['additional_fields']['parent'] = [
'get' => function ($page) {
- return \WikiPage::findLatestPage($page->range_id, $page->ancestor);
+ return \WikiPage::find($page->parent_id);
}
];
$config['additional_fields']['children'] = [
'get' => function ($page) {
- $query = "SELECT range_id, keyword, MAX(version) as version FROM wiki
- WHERE range_id = ? AND ancestor = ? GROUP BY keyword ORDER BY keyword ASC";
-
- $stmt = \DBManager::get()->prepare($query);
- $stmt->execute([$page->range_id, $page->keyword]);
- $pageIds = $stmt->fetchAll(\PDO::FETCH_NUM);
- return array_map(
- function ($pageId) {
- return self::find($pageId);
- },
- $pageIds
- );
+ return self::findBySQL('parent_id = ?', [
+ $page->id
+ ]);
}
];
-
- $config['additional_fields']['config']['get'] = function ($page) {
- return new WikiPageConfig([$page->range_id, $page->keyword]);
- };
-
- $config['registered_callbacks']['before_delete'][] = function ($page) {
- if ($page->version == 1 && $page->config) {
- $page->config->delete();
+ $config['additional_fields']['predecessor'] = [
+ 'get' => function ($page) {
+ return $page->versions ? $page->versions[0] : null;
+ }
+ ];
+ $config['additional_fields']['versionnumber'] = [
+ 'get' => function ($page) {
+ return count($page->versions) + 1;
}
- };
+ ];
- $config['default_values']['user_id'] = 'nobody';
+ $config['registered_callbacks']['before_store'][] = 'createVersion';
+ $config['default_values']['last_author'] = 'nobody';
parent::configure($config);
}
- /**
- * Finds all latest versions of all pages for the given course.
- * @param string $course_id Course id
- * @return SimpleCollection of all pages
- */
- public static function findLatestPages($course_id)
- {
- $query = "SELECT
- range_id,
- keyword,
- MAX(version) as version
- FROM wiki
- WHERE range_id = ?
- GROUP BY keyword
- ORDER BY keyword ASC";
-
- $st = DBManager::get()->prepare($query);
- $st->execute([$course_id]);
- $ids = $st->fetchAll(PDO::FETCH_NUM);
-
- $pages = new SimpleORMapCollection();
- $pages->setClassName(__CLASS__);
-
- foreach ($ids as $id) {
- $pages[] = self::find($id);
+ protected function createVersion()
+ {
+ $this->user_id = User::findCurrent()->id;
+ if (
+ !$this->isNew()
+ && $this->content['content'] !== $this->content_db['content']
+ && (
+ $this->content_db['user_id'] !== $this->content['user_id']
+ || $this->content_db['chdate'] < time() - 60 * 30
+ )
+ ) {
+ //Neue Version anlegen:
+ WikiVersion::create([
+ 'page_id' => $this->id,
+ 'name' => $this->content_db['name'],
+ 'content' => $this->content_db['content'],
+ 'user_id' => $this->content_db['user_id'],
+ 'mkdate' => $this->content_db['chdate'],
+ ]);
}
-
- return $pages;
+ return true;
}
- /**
- * Finds the latest version for the given course and keyword
- * @param string $course_id Course id
- * @param string $keyword Keyword
- * @return WikiPage or null
- */
- public static function findLatestPage($course_id, $keyword)
+ public static function findByName($range_id, $name)
{
- $results = self::findBySQL(
- "range_id = ? AND keyword = ? ORDER BY version DESC LIMIT 1",
- [$course_id, $keyword]
- );
-
- if (count($results) === 0) {
- return null;
- }
-
- return $results[0];
+ return self::findOneBySQL('name = :name AND range_id = :range_id', [
+ 'range_id' => $range_id,
+ 'name' => $name
+ ]);
}
+
/**
* Returns whether this page is visible to the given user.
* @param mixed $user User object or id
* @return boolean indicating whether the page is visible
*/
- public function isVisibleTo($user)
+ public function isReadable(?string $user_id = null): bool
{
+ if ($this->isNew()) {
+ return true;
+ }
// anyone can see this page if it belongs to a free course
- if (!$this->config->read_restricted
+ if (
+ $this->read_permission === 'all'
&& Config::get()->ENABLE_FREE_ACCESS
- && $this->course && $this->course->lesezugriff == 0)
- {
+ && $this->course
+ && !$this->course->lesezugriff
+ ) {
+ return true;
+ }
+ if ($user_id === null) {
+ $user_id = User::findCurrent()->id;
+ }
+
+ if (
+ $this->read_permission === 'all'
+ && $GLOBALS['perm']->have_studip_perm('user', $this->range_id, $user_id)
+ ) {
return true;
}
- return $GLOBALS['perm']->have_studip_perm(
- $this->config->read_restricted ? 'tutor' : 'user',
+ if ($GLOBALS['perm']->have_studip_perm(
+ 'dozent',
$this->range_id,
- is_object($user) ? $user->id : $user
- );
+ $user_id
+ )) {
+ return true;
+ }
+
+ if (in_array($this->read_permission, ['tutor', 'dozent'])) {
+ return $GLOBALS['perm']->have_studip_perm($this->read_permission, $this->range_id, $user_id);
+ } else {
+ return StatusgruppeUser::exists([$this->read_permission, $user_id]);
+ }
}
/**
* Returns whether this page is editable to the given user.
- * @param mixed $user User object or id
+ * @param string $user_id the ID of the user
* @return boolean indicating whether the page is editable
*/
- public function isEditableBy($user)
+ public function isEditable(?string $user_id = null): bool
{
- return $GLOBALS['perm']->have_studip_perm(
- $this->config->edit_restricted ? 'tutor' : 'autor',
+ if ($user_id === null) {
+ $user_id = User::findCurrent()->id;
+ }
+ if ($GLOBALS['perm']->have_studip_perm(
+ 'dozent',
$this->range_id,
- is_object($user) ? $user->id : $user
- );
- }
-
- /**
- * Returns whether this page is creatable to the given user.
- * @param mixed $user User object or id
- * @return boolean indicating whether the page is creatable
- * @todo this method is kinda bogus as an instance method
- */
- public function isCreatableBy($user)
- {
- return $this->isEditableBy($user);
+ $user_id
+ )) {
+ return true;
+ }
+ if ($this->write_permission === 'all') {
+ return true;
+ }
+ if (in_array($this->write_permission, ['tutor', 'dozent'])) {
+ return $GLOBALS['perm']->have_studip_perm(
+ $this->write_permission,
+ $this->range_id,
+ $user_id
+ );
+ } else {
+ return StatusgruppeUser::exists([$this->write_permission, $user_id]);
+ }
}
- /**
- * Returns whether this version of this page is the latest version availabe.
- * @return boolean
- */
- public function isLatestVersion()
- {
- return self::countBySQL(
- 'range_id = ? AND keyword = ? AND version > ?',
- [$this->range_id, $this->keyword, $this->version]
- ) === 0;
- }
/**
* Returns the start page of a wiki for a given course. The start page has
* the keyword 'WikiWikiWeb'.
*
- * @param string $course_id Course id
+ * @param string $range_id Course id
* @return WikiPage
*/
- public static function getStartPage($course_id)
+ public static function getStartPage($range_id)
{
- $start = self::findLatestPage($course_id, '');
-
- if (!$start) {
- $start = new self([$course_id, 'WikiWikiWeb', 0]);
- $start->body = _('Dieses Wiki ist noch leer.');
+ $page_id = CourseConfig::get($range_id)->WIKI_STARTPAGE_ID;
- if ($start->isEditableBy($GLOBALS['user'])) {
- $start->body .= ' ' . _("Bearbeiten Sie es!\nNeue Seiten oder Links werden einfach durch Eingeben von [nop][[Wikinamen]][/nop] in doppelten eckigen Klammern angelegt.");
- }
+ if ($page_id) {
+ return self::find($page_id);
}
- return $start;
+ $page = new WikiPage();
+ $pagename = _('Startseite');
+ $page->content = _('Dieses Wiki ist noch leer.');
+ if ($page->isEditable()) {
+ $page->content .= ' ' . _("Bearbeiten Sie es!\nNeue Seiten oder Links werden einfach durch Eingeben von [nop][[Wikinamen]][/nop] in doppelten eckigen Klammern angelegt.");
+ }
+ return $page;
}
/**
@@ -236,23 +240,6 @@ class WikiPage extends SimpleORMap implements PrivacyObject
}
}
- /**
- * Sets the parent page for all versions of a Wikipage.
- *
- * @param string ancestor Wikipage name to be set as the parent
- */
- public function setAncestorForAllVersions($ancestor) {
- $query = "UPDATE
- wiki
- SET
- ancestor = ?
- WHERE
- range_id = ? AND
- keyword = ?";
-
- $st = DBManager::get()->prepare($query);
- $st->execute([$ancestor, $this->range_id, $this->keyword]);
- }
/**
* Tests if a given Wikipage name (keyword) is a valid ancestor for this page.
@@ -263,13 +250,13 @@ class WikiPage extends SimpleORMap implements PrivacyObject
*/
public function isValidAncestor($ancestor)
{
- if ($this->keyword === 'WikiWikiWeb' || $this->keyword === $ancestor) {
+ if ($this->name === 'WikiWikiWeb' || $this->name === $ancestor) {
return false;
}
$keywords = array_map(
function ($descendant) {
- return $descendant['keyword'];
+ return $descendant->name;
},
$this->getDescendants()
);
@@ -294,23 +281,25 @@ class WikiPage extends SimpleORMap implements PrivacyObject
return $descendants;
}
- /**
- * @param string $other_keyword
- * @return bool
- */
- public function isDescendantOf(string $other_keyword): bool
+ public function getOnlineUsers(): array
{
- if ($other_keyword === $this->keyword) {
- return false;
- }
- $other_page = WikiPage::findLatestPage($this->range_id, $other_keyword);
- if ($other_page) {
- foreach ($other_page->getDescendants() as $descendant) {
- if ($descendant->keyword === $this->keyword) {
- return true;
- }
- }
- }
- return false;
+ $users = [];
+ WikiOnlineEditingUser::deleteBySQL(
+ "`page_id` = :page_id AND `chdate` < UNIX_TIMESTAMP() - :threshold",
+ [
+ 'page_id' => $this->id,
+ 'threshold' => WikiOnlineEditingUser::$threshold
+ ]
+ );
+ return $this->onlineeditingusers->map(function (WikiOnlineEditingUser $editing_user) {
+ return [
+ 'user_id' => $editing_user->user_id,
+ 'username' => $editing_user->user->username,
+ 'fullname' => $editing_user->user->getFullName(),
+ 'avatar' => Avatar::getAvatar($editing_user->user_id)->getURL(Avatar::SMALL),
+ 'editing' => (bool) $editing_user->editing,
+ 'editing_request' => (bool) $editing_user->editing_request,
+ ];
+ });
}
}
diff --git a/lib/models/WikiPageConfig.php b/lib/models/WikiPageConfig.php
deleted file mode 100644
index e82d694f41dc6a79e5f2a904668f8cb0df1431ca..0000000000000000000000000000000000000000
--- a/lib/models/WikiPageConfig.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * WikiPageConfig.php - Wiki page permissions
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * @author Elmar Ludwig
- * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
- *
- * @property array $id alias for pk
- * @property string $range_id database column
- * @property string $keyword database column
- * @property int $read_restricted database column
- * @property int $edit_restricted database column
- * @property int|null $mkdate database column
- * @property int|null $chdate database column
- * @property Course $course belongs_to Course
- * @property Institute $institute belongs_to Institute
- */
-class WikiPageConfig extends SimpleORMap
-{
- /**
- * Configure the database mapping.
- */
- protected static function configure($config = [])
- {
- $config['db_table'] = 'wiki_page_config';
-
- $config['belongs_to']['course'] = [
- 'class_name' => Course::class,
- 'foreign_key' => 'range_id',
- ];
- $config['belongs_to']['institute'] = [
- 'class_name' => Institute::class,
- 'foreign_key' => 'range_id',
- ];
-
- parent::configure($config);
- }
-
- /**
- * Specialized getValue that returns the course default for edit_restricted.
- *
- * @param string $field Field to get the value for
- * @return mixed
- */
- public function getValue($field)
- {
- if ($field !== 'edit_restricted' || !$this->isNew() || !$this->range_id) {
- return parent::getValue($field);
- }
-
- return CourseConfig::get($this->range_id)->WIKI_COURSE_EDIT_RESTRICTED;
- }
-
- /**
- * Returns whether the current settings are the default settings (db-wise
- * and from course setting).
- *
- * @return boolean
- */
- public function isDefault()
- {
- return $this->read_restricted === $this->getDefaultValue('read_restricted') &&
- $this->edit_restricted === CourseConfig::get($this->range_id)->WIKI_COURSE_EDIT_RESTRICTED;
- }
-}
diff --git a/lib/models/WikiVersion.php b/lib/models/WikiVersion.php
new file mode 100644
index 0000000000000000000000000000000000000000..487e680cb8cfd641d2cea60a235ba9cdac5536b2
--- /dev/null
+++ b/lib/models/WikiVersion.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Wikiversion.php
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * @author Rasmus Fuhse <fuhse@data-quest.de>
+ * @copyright 2023 Stud.IP Core-Group
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GPL version 2
+ * @category Stud.IP
+ *
+ * @property string page_id database column
+ * @property string id alias column for user_id
+ * @property string last_lifesign computed column read/write
+ */
+class WikiVersion extends SimpleORMap
+{
+ protected static function configure($config = [])
+ {
+ $config['db_table'] = 'wiki_versions';
+ $config['belongs_to']['page'] = [
+ 'class_name' => WikiPage::class,
+ 'foreign_key' => 'page_id'
+ ];
+ $config['belongs_to']['user'] = [
+ 'class_name' => User::class,
+ 'foreign_key' => 'user_id'
+ ];
+ $config['additional_fields']['predecessor'] = [
+ 'get' => function ($version) {
+ return static::findOneBySQL('`page_id` = :page_id AND `mkdate` < :version_time ORDER BY `mkdate` DESC LIMIT 1', [
+ 'page_id' => $version['page_id'],
+ 'version_time' => $version['mkdate']
+ ]);
+ }
+ ];
+ $config['additional_fields']['successor'] = [
+ 'get' => function ($version) {
+ $newer_version = static::findOneBySQL('`page_id` = :page_id AND `mkdate` > :version_time ORDER BY `mkdate` ASC LIMIT 1', [
+ 'page_id' => $version['page_id'],
+ 'version_time' => $version['mkdate']
+ ]);
+ return $newer_version ?? $version->page;
+ }
+ ];
+ $config['additional_fields']['versionnumber'] = [
+ 'get' => function ($version) {
+ $i = 1;
+ foreach (array_reverse($version->page->versions->getArrayCopy()) as $v) {
+ if ($v->id === $version->id) {
+ return $i;
+ }
+ $i++;
+ }
+ return null;
+ }
+ ];
+ parent::configure($config);
+ }
+}
diff --git a/lib/modules/CoreWiki.class.php b/lib/modules/CoreWiki.class.php
index 4700334d1661b0c80ed1fbd3fa4e26119f9d53ef..a52aa4d78e2107c9f9e9e82ec1b00cc2c847e78f 100644
--- a/lib/modules/CoreWiki.class.php
+++ b/lib/modules/CoreWiki.class.php
@@ -14,73 +14,88 @@ class CoreWiki extends CorePlugin implements StudipModule
/**
* {@inheritdoc}
*/
- public function getIconNavigation($course_id, $last_visit, $user_id)
+ public function getIconNavigation($range_id, $last_visit, $user_id)
{
if (!Config::get()->WIKI_ENABLE) {
return null;
}
-
- $priviledged = $GLOBALS['perm']->have_studip_perm('tutor', $course_id, $user_id);
-
- if ($priviledged) {
- $sql = "SELECT COUNT(DISTINCT keyword) AS count_d,
- COUNT(IF((wiki.chdate > IFNULL(ouv.visitdate, :threshold) AND wiki.user_id != :user_id), keyword, NULL)) AS neue
- FROM wiki
- LEFT JOIN object_user_visits AS ouv
- ON (ouv.object_id = wiki.range_id AND ouv.user_id = :user_id and ouv.plugin_id = :plugin_id)
- WHERE wiki.range_id = :course_id
- GROUP BY wiki.range_id";
- } else {
- $sql = "SELECT COUNT(DISTINCT keyword) AS count_d,
- COUNT(IF((wiki.chdate > IFNULL(ouv.visitdate, :threshold) AND wiki.user_id != :user_id), keyword, NULL)) AS neue
- FROM wiki
- LEFT JOIN wiki_page_config USING (range_id, keyword)
- LEFT JOIN object_user_visits AS ouv
- ON (ouv.object_id = wiki.range_id AND ouv.user_id = :user_id and ouv.plugin_id = :plugin_id)
- WHERE wiki.range_id = :course_id
- AND (
- wiki_page_config.range_id IS NULL
- OR wiki_page_config.read_restricted = 0
- )
- GROUP BY wiki.range_id";
+ $perm = $GLOBALS['perm']->get_perm($user_id);
+ if (in_array($perm, ['admin', 'root'])) {
+ $perm = 'dozent';
}
- $statement = DBManager::get()->prepare($sql);
- $statement->bindValue(':user_id', $user_id);
- $statement->bindValue(':course_id', $course_id);
- $statement->bindValue(':threshold', $last_visit);
- $statement->bindValue(':plugin_id', $this->getPluginId());
- $statement->execute();
- $result = $statement->fetch(PDO::FETCH_ASSOC);
-
- if (!$result || (!$result['neue'] && !$result['count_d'])) {
+
+ $statement = DBManager::get()->prepare("
+ SELECT `wiki_pages`.`page_id`
+ FROM `wiki_pages`
+ LEFT JOIN `statusgruppe_user` ON (`statusgruppe_user`.`statusgruppe_id` = `wiki_pages`.`read_permission`)
+ WHERE `wiki_pages`.`range_id` = :range_id
+ AND (
+ `wiki_pages`.`read_permission` = 'all'
+ OR `statusgruppe_user`.`user_id` = :user_id
+ OR `wiki_pages`.`read_permission` = :perm
+ OR (`wiki_pages`.`read_permission` = 'tutor' AND :perm = 'dozent')
+ )
+ ");
+
+ $statement->execute([
+ 'range_id' => $range_id,
+ 'user_id' => $user_id,
+ 'perm' => $perm
+ ]);
+ $wiki_page_ids = $statement->fetchAll(PDO::FETCH_COLUMN);
+ if (count($wiki_page_ids) === 0) {
return null;
}
+ $visit_date = object_get_visit($range_id, $this->getPluginId(), 'visitdate') ?? $last_visit;
+
+ $statement = DBManager::get()->prepare("
+ SELECT COUNT(*) AS `neue`
+ FROM `wiki_pages`
+ WHERE `wiki_pages`.`page_id` IN (:page_ids)
+ AND `wiki_pages`.`chdate` > :threshold
+ AND `wiki_pages`.`user_id` != :user_id
+ ");
+ $statement->execute([
+ 'page_ids' => $wiki_page_ids,
+ 'threshold' => $visit_date,
+ 'user_id' => $user_id,
+ ]);
+ $new_pages = $statement->fetch(PDO::FETCH_COLUMN, 0);
+
$nav = new Navigation(_('Wiki'));
- if ($result['neue']) {
- $nav->setURL('wiki.php', ['view' => 'listnew']);
+ if ($new_pages > 0) {
+ $nav->setURL('dispatch.php/course/wiki/newpages');
$nav->setImage(Icon::create('wiki', Icon::ROLE_ATTENTION, [
'title' => sprintf(
ngettext(
- '%1$d Wiki-Seite, %2$d Änderung(en)',
- '%1$d Wiki-Seiten, %2$d Änderung(en)',
- $result['count_d']
+ '%d Wiki-Seite',
+ '%d Wiki-Seiten',
+ count($wiki_page_ids)
),
- $result['count_d'],
- $result['neue']
+ count($wiki_page_ids)
)
+ . ', '
+ . sprintf(
+ ngettext(
+ '%d Änderung',
+ '%d Änderungen',
+ $new_pages
+ ),
+ $new_pages
+ )
]));
- $nav->setBadgeNumber($result['neue']);
+ $nav->setBadgeNumber($new_pages);
} else {
- $nav->setURL('wiki.php');
+ $nav->setURL('dispatch.php/course/wiki/page');
$nav->setImage(Icon::create('wiki', Icon::ROLE_CLICKABLE, [
'title' => sprintf(
ngettext(
'%d Wiki-Seite',
'%d Wiki-Seiten',
- $result['count_d']
+ count($wiki_page_ids)
),
- $result['count_d']
+ count($wiki_page_ids)
)
]));
}
@@ -90,7 +105,7 @@ class CoreWiki extends CorePlugin implements StudipModule
/**
* {@inheritdoc}
*/
- public function getTabNavigation($course_id)
+ public function getTabNavigation($range_id)
{
if (!Config::get()->WIKI_ENABLE) {
return null;
@@ -100,16 +115,11 @@ class CoreWiki extends CorePlugin implements StudipModule
$navigation->setImage(Icon::create('wiki', Icon::ROLE_INFO_ALT));
$navigation->setActiveImage(Icon::create('wiki', Icon::ROLE_INFO));
- $keyword = Request::get('keyword');
- if ($keyword !== 'WikiWikiWeb') {
- $navigation->addSubNavigation('start', new Navigation(_('Wiki-Startseite'), 'wiki.php?view=show'));
+ $navigation->addSubNavigation('start', new Navigation(_('Wiki-Startseite'), 'dispatch.php/course/wiki/page'));
+ if (WikiPage::countBySQL('`range_id` = ?', [$range_id]) > 0) {
+ $navigation->addSubNavigation('listnew', new Navigation(_('Neue Seiten'), 'dispatch.php/course/wiki/newpages'));
+ $navigation->addSubNavigation('allpages', new Navigation(_('Alle Seiten'), 'dispatch.php/course/wiki/allpages'));
}
- if ($keyword) {
- $display_name = $keyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : $keyword;
- $navigation->addSubNavigation('show', new Navigation($display_name, 'wiki.php?view=show', compact('keyword')));
- }
- $navigation->addSubNavigation('listnew', new Navigation(_('Neue Seiten'), 'wiki.php?view=listnew'));
- $navigation->addSubNavigation('listall', new Navigation(_('Alle Seiten'), 'wiki.php?view=listall'));
return ['wiki' => $navigation];
}
@@ -120,7 +130,7 @@ class CoreWiki extends CorePlugin implements StudipModule
{
return [
'summary' => _('Gemeinsames Erstellen und Bearbeiten von Texten'),
- 'description' => _('Im Wiki-Web oder kurz "Wiki" können '.
+ 'description' => _('Im Wiki können '.
'verschiedene Autor/-innen gemeinsam Texte, Konzepte und andere '.
'schriftliche Arbeiten erstellen und gestalten, dies '.
'allerdings nicht gleichzeitig. Texte können individuell '.
@@ -140,7 +150,7 @@ class CoreWiki extends CorePlugin implements StudipModule
Löschfunktion für die aktuellste Seiten-Version;
Keine gleichzeitige Bearbeitung desselben Textes möglich, nur nacheinander'),
'descriptionshort' => _('Gemeinsames asynchrones Erstellen und Bearbeiten von Texten'),
- 'descriptionlong' => _('Im Wiki-Web oder kurz "Wiki" können verschiedene Autor/-innen gemeinsam Texte, '.
+ 'descriptionlong' => _('Im Wiki können verschiedene Autor/-innen gemeinsam Texte, '.
'Konzepte und andere schriftliche Arbeiten erstellen und gestalten. Dies '.
'allerdings nicht gleichzeitig. Texte können individuell bearbeitet und '.
'gespeichert werden. Das Besondere im Wiki ist, dass Studierende und Lehrende '.
@@ -163,7 +173,6 @@ class CoreWiki extends CorePlugin implements StudipModule
public function getInfoTemplate($course_id)
{
- // TODO: Implement getInfoTemplate() method.
return null;
}
@@ -172,19 +181,21 @@ class CoreWiki extends CorePlugin implements StudipModule
* Generates a page hierarchy for table of contents/breadcrumbs.
* @return TOCItem
*/
- public static function getTOC($startPage): TOCItem
+ public static function getTOC($startPage, $active_title = null): TOCItem
{
- $root = new TOCItem($startPage->keyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : $startPage->keyword);
- $root->setURL(URLHelper::getURL('wiki.php', ['keyword' => $startPage->keyword]))
- ->setActive($startPage->keyword == Request::get('keyword') ||
- $startPage->keyword == 'WikiWikiWeb' && !Request::get('keyword'));
- if ($startPage->keyword == 'WikiWikiWeb') {
+ $root = new TOCItem($startPage->isNew() || $startPage->name === 'WikiWikiWeb'
+ ? _('Wiki-Startseite')
+ : $startPage->name
+ );
+ $root->setURL(URLHelper::getURL('dispatch.php/course/wiki/page/'.$startPage->id));
+ if ($startPage->name == 'WikiWikiWeb' || $startPage->id == CourseConfig::get($startPage->range_id)->WIKI_STARTPAGE_ID) {
$root->setIcon(Icon::create('wiki'));
}
-
+ $root->setActive($root->getTitle() === $active_title);
foreach ($startPage->children as $child) {
- $item = self::getTOC($child);
+ $item = self::getTOC($child, $active_title);
+ $item->setActive($item->getTitle() === $active_title);
$root->addChild($item);
}
diff --git a/lib/visual.inc.php b/lib/visual.inc.php
index 5cef921b16dbf8e147bbfdc13cbca3d4e61e2566..b9388ac42cf4a2dddca1378b7493c8008520b027 100644
--- a/lib/visual.inc.php
+++ b/lib/visual.inc.php
@@ -5,8 +5,6 @@
# Lifter010: TODO
-require_once 'lib/wiki.inc.php';
-
// Wrapper for formatted content (defined as a constant since it is used
// in the unit test defined in tests/unit/lib/VisualTest.php as well).
define('FORMATTED_CONTENT_WRAPPER', '<div class="formatted-content ck-content">%s</div>');
@@ -133,10 +131,12 @@ function formatLinks($text, $nl2br = true) {
* @access public
* @param string $what Marked-up text.
* @param string $trim Trim leading and trailing whitespace, if TRUE.
+ * @param string $range_id the id of the course or institute
+ * @param string $page_id the id of the page
* @return string HTML code computed by applying markup-rules.
*/
-function wikiReady($text, $trim=TRUE) {
- $formatted = Markup::apply(new WikiFormat(), $text, $trim);
+function wikiReady($text, $trim=TRUE, $range_id = null, $page_id = null) {
+ $formatted = Markup::apply(new WikiFormat($range_id, $page_id), $text, $trim);
return $formatted !== '' ? sprintf(FORMATTED_CONTENT_WRAPPER, $formatted) : '';
}
diff --git a/lib/wiki.inc.php b/lib/wiki.inc.php
deleted file mode 100644
index 30f68fead637fdd901b66acfbccb170411b657b0..0000000000000000000000000000000000000000
--- a/lib/wiki.inc.php
+++ /dev/null
@@ -1,2051 +0,0 @@
-<?php
-# Lifter002: TODO
-# Lifter007: TODO
-use Studip\Button, Studip\LinkButton;
-
-/**
-* Retrieve a WikiPage version from current seminar's WikiWikiWeb.
-*
-* Returns raw text data from database if requested version is
-* available. If not, an
-*
-* @param string WikiWiki keyword to be retrieved
-* @param int Version number. If empty, latest version is returned.
-*
-**/
-function getWikiPage($keyword, $version = null)
-{
- $page = null;
- if ($version) {
- $page = WikiPage::find([Context::getId(), $keyword, $version]);
- }
- if ($page === null) {
- $page = WikiPage::findLatestPage(Context::getId(), $keyword);
- }
-
- if ($page) {
- return $page;
- }
-
- if ($keyword === 'WikiWikiWeb') {
- return WikiPage::getStartPage(Context::getId());
- }
-
- $page = new WikiPage();
- $page->range_id = Context::getId();
- $page->keyword = $keyword;
- return $page;
-}
-
-/**
-* Write a new/edited wiki page to database
-*
-* @param string keyword WikiPage name
-* @param string version WikiPage version
-* @param string body WikiPage text
-* @param string user_id Internal user id of editor
-* @param string range_id Internal id of seminar/einrichtung
-*
-**/
-function submitWikiPage($keyword, $version, $body, $user_id, $range_id, $ancestor) {
-
- global $perm;
- releasePageLocks($keyword, $user_id); // kill lock that was set when starting to edit
- // write changes to db, show new page
- $latestVersion = getWikiPage($keyword, false);
- if ($latestVersion) {
- $date = time();
- $lastchange = $date - $latestVersion['chdate'];
- }
-
- StudipTransformFormat::addStudipMarkup('wiki-comments', '(\[comment\])', null, function(){return sprintf('[comment=%s]', get_fullname());});
-
- //TODO: Die $message Texte klingen fürchterlich. Halbsätze, Denglisch usw...
- if ($latestVersion && ($latestVersion['body'] == $body)) {
- $message = MessageBox::info(_('Keine Änderung vorgenommen.'));
- PageLayout::postMessage($message);
- } else if ($latestVersion && ($version !== null) && ($lastchange < 30*60) && ($user_id == $latestVersion['user_id'])) {
- // if same author changes again within 30 minutes, no new verison is created
- $wp = WikiPage::find([$range_id, $keyword, $version]);
- if ($wp) {
- if ($wp->isEditableBy($GLOBALS['user'])) {
- $wp->body = $body;
- if ($wp->isValidAncestor($ancestor)) {
- $wp->setAncestorForAllVersions($ancestor);
- } else {
- PageLayout::postInfo(_('Die Vorgängerseite konnte nicht gespeichert werden.'));
- }
- $wp->store();
- } else {
- PageLayout::postInfo(_('Keine Änderung vorgenommen, da zwischenzeitlich die Editier-Berechtigung entzogen wurde.'));
- }
- }
- } else {
- if ($version === null) {
- $version = 0;
- } else {
- $version = $latestVersion['version'] + 1;
- }
-
- WikiPage::create(compact('range_id', 'user_id', 'keyword', 'body', 'ancestor', 'version'));
- }
- StudipTransformFormat::removeStudipMarkup('wiki-comments');
- refreshBacklinks($keyword, $body);
-}
-
-/**
- * Retrieve latest version for a given keyword
- *
- * @param string keyword WikiPage name
- * @return array
- */
-function getLatestVersion($keyword, $range_id) {
- $query = "SELECT *
- FROM wiki
- WHERE keyword = ? AND range_id = ?
- ORDER BY version DESC
- LIMIT 1";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$keyword, $range_id]);
- return $statement->fetch(PDO::FETCH_ASSOC);
-}
-
-/**
- * Retrieve oldest version for a given keyword
- *
- * @param string WikiPage name
- * @return array
- */
-function getFirstVersion($keyword, $range_id) {
- $query = "SELECT *
- FROM wiki
- WHERE keyword = ? AND range_id = ?
- ORDER BY version ASC
- LIMIT 1";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$keyword, $range_id]);
- return $statement->fetch(PDO::FETCH_ASSOC);
-}
-
-/**
- * Return array containing version numbes and chdates
- *
- * @param string $keyword Wiki keyword for currently selected seminar
- * @param int $limit Number of links to be retrieved (default:10)
- * @param bool $getfirst Should first (=most recent) version be retrieved too?
- * @return array
- */
-function getWikiPageVersions($keyword, $limit = 10, $getfirst = false)
-{
- $query = "SELECT version, chdate
- FROM wiki
- WHERE keyword = ? AND range_id = ?
- ORDER BY version DESC
- LIMIT " . (int) $limit;
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$keyword, Context::getId()]);
- $versions = $statement->fetchAll(PDO::FETCH_ASSOC);
-
- if (!$getfirst) {
- // skip first
- $versions = array_slice($versions, 1);
- }
-
- return $versions;
-}
-
-
-/**
- * Check if given keyword exists in current WikiWikiWeb.
- *
- * @param string WikiPage keyword
- */
-function keywordExists($str, $sem_id = null) {
- static $keywords;
-
- if (is_null($keywords)) {
- $query = "SELECT DISTINCT keyword, 1 FROM wiki WHERE range_id = ?";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$sem_id ?: Context::getId()]);
- $keywords = $statement->fetchGrouped(PDO::FETCH_COLUMN);
- }
- // retranscode html entities to ascii values (as stored in db)
- // (nessecary for umlauts)
- // BUG: other special chars like accented vowels don't work yet!
- //
- $trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES));
- $nonhtmlstr = strtr($str, $trans_tbl);
-
- return $keywords[$nonhtmlstr] ?? false;
-}
-
-
-/**
- * Check if keyword already exists or links to new page.
- * Returns HTML-Link-Representation.
- *
- * @param string WikiPage keyword
- * @param string current Page (for edit abort backlink)
- * @param string out format: "wiki"=link to wiki.php, "inline"=link on same page
- */
-function isKeyword($str, $page, $format = 'wiki', $sem_id = null, $alt_str = null) {
- if (!$alt_str) {
- $alt_str = $str;
- }
- $trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES));
- $nonhtmlstr = strtr($str, $trans_tbl);
- if (!keywordExists($str, $sem_id)) {
- if ($format === 'wiki') {
- return " <a href=\"".URLHelper::getLink("?keyword=" . urlencode($nonhtmlstr) . "&view=editnew&lastpage=".urlencode($page))."\">" . $alt_str . "(?)</a>";
- } else if ($format === 'inline') {
- return $str;
- }
- } else {
- if ($format == 'wiki') {
- return " <a href=\"".URLHelper::getLink("?keyword=".urlencode($nonhtmlstr))."\">".$alt_str."</a>";
- } else if ($format == 'inline') {
- return " <a href=\"#".urlencode($nonhtmlstr)."\">".$alt_str."</a>";
- }
- }
-}
-
-
-/**
- * Get lock information about page
- * Returns displayable string containing lock information
- * (Template: Username1 (seit x Minuten), Username2 (seit y Minuten), ...)
- * or NULL if no locks set.
- *
- * @param string WikiPage keyword
- * @param string user_id Internal user id
- */
-function getLock($keyword, $user_id)
-{
- $query = "SELECT user_id, chdate
- FROM wiki_locks
- WHERE range_id = ? AND keyword = ? AND user_id != ?
- ORDER BY chdate DESC";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([Context::getId(), $keyword, $user_id]);
- $locks = $statement->fetchAll(PDO::FETCH_ASSOC);
-
- $lockstring = '';
- foreach ($locks as $index => $lock) {
- if ($index) {
- if ($index == count($locks) - 1) {
- $lockstring .= _(' und ');
- } else {
- $lockstring .= ', ';
- }
- }
- $duration = ceil((time() - $lock['chdate']) / 60);
-
- $lockstring .= get_fullname($lock['user_id'], 'full', true);
- $lockstring .= sprintf(_(' (seit %d Minuten)'), $duration);
- }
-
- return $lockstring;
-}
-
-/**
- * Set lock for current user and current page
- *
- * @param DB_Seminar db DB_Seminar instance (no longer neccessary)
- * @param string user_id Internal user id
- * @param string range_if Internal seminar id
- * @param string keyword WikiPage name
- */
-function setWikiLock($db, $user_id, $range_id, $keyword) {
- $query = "REPLACE INTO wiki_locks (user_id, range_id, keyword, chdate)
- VALUES (?, ?, ?, UNIX_TIMESTAMP())";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$user_id, $range_id, $keyword]);
-}
-
-
-/**
- * Release all locks for wiki page that are older than 30 minutes.
- *
- * @param string WikiPage keyword
- */
-function releaseLocks($keyword)
-{
- // Prepare statement that actually releases (removes) the lock
- $query = "DELETE FROM wiki_locks WHERE range_id = ? AND keyword = ? AND chdate = ?";
- $release_statement = DBManager::get()->prepare($query);
-
- // Prepare and execute statement that reads all locks
- $query = "SELECT range_id, keyword, chdate
- FROM wiki_locks
- WHERE range_id = ? AND keyword = ? AND chdate < UNIX_TIMESTAMP(NOW() - INTERVAL 30 MINUTE)";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([Context::getId(), $keyword]);
-
- while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
- $release_statement->execute([
- $row['range_id'],
- $row['keyword'],
- $row['chdate'],
- ]);
- }
-}
-
-/**
- * Release locks for current wiki page and current user
- *
- * @param string keyword WikiPage name
- * @param string user_id Internal user id
- *
- */
-function releasePageLocks($keyword, $user_id)
-{
- $query = "DELETE FROM wiki_locks
- WHERE range_id = ? AND keyword = ? AND user_id = ?";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([Context::getId(), $keyword, $user_id]);
-}
-
-
-/**
-* Return list of WikiWord in given page body ($str)
-*
-* @param string str
-*
-**/
-function getWikiLinks($str) {
- $str = preg_replace('/\[nop\].*\[\/nop\]/', '', $str);
- $str = preg_replace('/\[code\].*\[\/code\]/', '', $str);
- preg_match_all(
- '/' . WikiFormat::getWikiMarkup('wiki-links')['start'] . '/',
- $str,
- $out_wikiwords,
- PREG_PATTERN_ORDER
- );
- return array_unique($out_wikiwords[1]);
-}
-
-/**
-* Return list of WikiPages containing links to given page
-*
-* @param string Wiki keyword
-*
-**/
-function getBacklinks($keyword)
-{
- // don't show references from Table of contents (='toc')
- $query = "SELECT DISTINCT from_keyword
- FROM wiki_links
- WHERE range_id = ? AND to_keyword = ? AND from_keyword != 'toc'";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([Context::getId(), $keyword]);
- return $statement->fetchAll(PDO::FETCH_COLUMN);
-}
-
-/**
-* Refresh wiki_links table for backlinks from given page to
-* other pages
-*
-* @param string keyword WikiPage-name for $str content
-* @param string str Page content containing links
-*
-**/
-function refreshBacklinks($keyword, $str)
-{
- // insert links from page to db
- // logic: all links are added, also links to nonexistant pages
- // (these will change when submitting other pages)
-
- // first delete all links
- $query = "DELETE FROM wiki_links WHERE range_id = ? AND from_keyword = ?";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([Context::getId(), $keyword]);
-
- // then reinsert those (still) existing
- $wikiLinkList = getWikiLinks($str);
- if (!empty($wikiLinkList)) {
- $query = "INSERT INTO wiki_links (range_id, from_keyword, to_keyword)
- VALUES (?, ?, ?)";
- $statement = DBManager::get()->prepare($query);
-
- foreach ($wikiLinkList as $key => $value) {
- $statement->execute([Context::getId(), $keyword, $value]);
- }
- }
-}
-
-/**
- * When a page gets deleted, set the ancestor to NULL for
- * every descendant page.
- *
- * @param string keyword WikiPage name that was deleted.
- *
- */
-function deleteAncestorRelation($keyword) {
- $query = "UPDATE wiki SET ancestor = null WHERE ancestor = ?";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$keyword]);
-}
-
-/**
-* Generate Meta-Information on Wiki-Page to display in top line
-*
-* @param db-query result all information about a wikiPage
-* @return string Displayable HTML
-*
-**/
-function getZusatz($wikiData)
-{
- if (!$wikiData || $wikiData["version"] <= 0) {
- return "";
- }
-
- $user = User::find($wikiData['user_id']);
-
- $s = '<a href="' . URLHelper::getLink('?keyword=' . urlencode($wikiData['keyword'])
- . '&version='
- . $wikiData['version']). '">'
- . _('Version ')
- . $wikiData['version'] . '</a>';
- $s .= sprintf(_(', geändert von %s am %s'),
- $user
- ? '<a href="' . URLHelper::getLink('dispatch.php/profile?username=' . $user->username) .'">' . htmlReady($user->getFullName()) . '</a>'
- : _('unbekannt'),
- date('d.m.Y, H:i', $wikiData['chdate']));
-
- return $s;
-}
-
-function getWikiIndex($descendants, $i = 0)
-{
- $i++;
- $hidden = '';
- $items = '<ul class="wiki-index">';
- if($i >= 4) {
- $hidden = ' class="hidden"';
- $items .= '<li><a href="#" class="wiki-index-more">[…]</a></li>';
- }
- foreach ($descendants as $descendant) {
- $children = $descendant->children;
- $items .= '<li'. $hidden .'><a href="' . URLHelper::getLink('wiki.php', ['keyword' => $descendant->keyword]) . '">'.htmlReady($descendant->keyword) .'</a>';
- if($children) {
- $items .= getWikiIndex($children, $i);
- }
- }
- $items .= '</ul>';
- return $items;
-}
-
-/**
-* Display yes/no dialog to confirm WikiPage version deletion.
-*
-* @param string WikiPage name
-* @param string WikiPage version (if empty: take latest)
-*
-* @return string Version number to delete
-*
-**/
-function showDeleteDialog($keyword, $version) {
- $islatest=0; // will another version become latest version?
- $willvanish=0; // will the page be deleted entirely?
- $lv=getLatestVersion($keyword, Context::getId());
- if ($version=="latest" || $version==$lv["version"]) {
- $lv=getLatestVersion($keyword, Context::getId());
- $fv=getFirstVersion($keyword, Context::getId());
- $version=$lv["version"];
- if ($version==$fv["version"]) {
- $willvanish=1;
- }
- $islatest=1;
- }
-
- $msg= sprintf(_("Wollen Sie die untenstehende Version %s der Seite %s wirklich löschen?"), $version, $keyword) . "\n";
- if (!$willvanish) {
- if ($islatest) {
- $msg .= _("Diese Version ist derzeit aktuell. Nach dem Löschen wird die nächstältere Version aktuell.");
- }
- } else {
- $msg .= _("Diese Version ist die derzeit einzige. Nach dem Löschen ist die Seite komplett gelöscht.");
- }
- return $msg;
-}
-
-
-function showDeleteAllDialog($keyword) {
- $msg= sprintf(_("Wollen Sie die Seite %s wirklich vollständig - mit allen Versionen - löschen?"), $keyword) . "\n";
- if ($keyword === "WikiWikiWeb") {
- $msg .= _("Sie sind im Begriff die Startseite zu löschen, die dann durch einen leeren Text ersetzt wird. Damit wären auch alle anderen Seiten nicht mehr direkt erreichbar und auch das Inhaltsverzeichnis wäre leer.");
- } else {
- $numbacklinks = count(getBacklinks($keyword));
- if ($numbacklinks == 0) {
- $msg .= _("Auf diese Seite verweist keine andere Seite.");
- } else if ($numbacklinks == 1) {
- $msg .= _("Auf diese Seite verweist 1 andere Seite.");
- } else {
- $msg .= sprintf(_("Auf diese Seite verweisen %s andere Seiten."), count(getBacklinks($keyword)));
- }
- }
- return $msg;
-}
-
-
-
-/**
-* Delete WikiPage version and adjust backlinks.
-*
-* @param string WikiPage name
-* @param string WikiPage version
-* @param string ID of seminar/einrichtung
-*
-* @return string WikiPage name to display next
-*
-**/
-function deleteWikiPage($keyword, $version, $range_id) {
- global $perm, $dellatest;
- if (!$perm->have_studip_perm("tutor", Context::getId())) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Seiten zu löschen.'));
- }
- $lv=getLatestVersion($keyword, Context::getId());
- if ($lv["version"] != $version) {
- throw new InvalidArgumentException(_('Die Version, die Sie löschen wollen, ist nicht die aktuellste. Überprüfen Sie, ob inzwischen eine aktuellere Version erstellt wurde.'));
- }
-
- $wp = WikiPage::find([$range_id, $keyword, $version]);
- if ($wp) {
- $wp->delete();
- }
-
- if (!keywordExists($keyword)) { // all versions have gone
- $addmsg = '<br>' . sprintf(_("Damit ist die Seite %s mit allen Versionen gelöscht."),'<b>'.htmlReady($keyword).'</b>');
- $newkeyword = "WikiWikiWeb";
- deleteAncestorRelation($keyword);
- } else {
- $newkeyword = $keyword;
- $addmsg = "";
- }
- $message = MessageBox::info(sprintf(_('Version %s der Seite %s gelöscht.'), htmlReady($version), '<b>'.htmlReady($keyword).'</b>') . $addmsg);
- PageLayout::postMessage($message);
- if ($dellatest) {
- $lv=getLatestVersion($keyword, Context::getId());
- if ($lv) {
- $body="";
- } else {
- $body=$lv["body"];
- }
- refreshBacklinks($keyword, $body);
- }
- return $newkeyword;
-}
-
-/**
-* Delete complete WikiPage with all versions and adjust backlinks.
-*
-* @param string WikiPage name
-* @param string ID of seminar/einrichtung
-*
-**/
-function deleteAllWikiPage($keyword, $range_id) {
- global $perm;
- if (!$perm->have_studip_perm("tutor", Context::getId())) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Seiten zu löschen.'));
- }
-
- WikiPage::deleteBySQL("keyword = ? AND range_id = ?", [$keyword, $range_id]);
- $message = MessageBox::info(sprintf(_('Die Seite %s wurde mit allen Versionen gelöscht.'), '<b>'.htmlReady($keyword).'</b>'));
- PageLayout::postMessage($message);
- refreshBacklinks($keyword, "");
- deleteAncestorRelation($keyword);
- return "WikiWikiWeb";
-}
-
-
-
-/**
-* List all topics in this seminar's wiki
-*
-* @param mode string Either "all" or "new", affects default sorting and page title.
-* @param sortby string Different sortings of entries.
-**/
-function listPages($mode, $sortby = NULL)
-{
- $lastlogindate = null;
- if ($mode === 'all') {
- $selfurl = '?view=listall';
- $sort = "ORDER by MAX(chdate) DESC"; // default sort order for "all pages"
- $nopages = _('In dieser Veranstaltung wurden noch keine WikiSeiten angelegt.');
-
- // help texts
- $help = _('Zeigt eine tabellarische Ãœbersicht aller Wiki-Seiten an.');
- Helpbar::get()->ignoreDatabaseContents();
- Helpbar::get()->addPlainText('', $help);
- } else if ($mode === 'new') {
- $core_wiki = PluginManager::getInstance()->getPlugin('CoreWiki');
- $lastlogindate = object_get_visit(Context::getId(), $core_wiki->getPluginId());
-
- $selfurl = '?view=listnew';
- $sort = "ORDER by MAX(chdate)"; // default sort order for "new pages"
- $nopages = _('Seit Ihrem letzten Login gab es keine Änderungen.');
-
- // help texts
- $help = _('Zeigt eine tabellarische Ãœbersicht neu erstellter bzw. bearbeiteter Wiki-Seiten an.');
- Helpbar::get()->ignoreDatabaseContents();
- Helpbar::get()->addPlainText('', $help);
- } else {
- throw new InvalidArgumentException(_('Fehler! Falscher Anzeigemodus:') . $mode);
- }
-
- $titlesortlink = 'title';
- $versionsortlink = 'version';
- $changesortlink = 'lastchange';
-
- switch ($sortby) {
- case 'title':
- // sort by keyword, prepare link for descending sorting
- $sort = "ORDER BY keyword";
- $titlesortlink = 'titledesc';
- break;
- case 'titledesc':
- // sort descending by keyword, prep link for asc. sort
- $sort = "ORDER BY keyword DESC";
- break;
- case 'version':
- $sort = "ORDER BY MAX(version) DESC, keyword ASC";
- $versionsortlink = 'versiondesc';
- break;
- case 'versiondesc':
- $sort = "ORDER BY MAX(version), keyword ASC";
- break;
- case 'lastchange':
- // sort by change date, default: newest first
- $sort = "ORDER BY MAX(chdate) DESC, keyword ASC";
- $changesortlink = 'lastchangedesc';
- break;
- case 'lastchangedesc':
- // sort by change date, oldest first
- $sort = "ORDER BY MAX(chdate), keyword ASC";
- break;
- }
-
- if ($mode === 'all') {
- $query = "SELECT keyword
- FROM wiki
- WHERE range_id = ?
- GROUP BY keyword
- {$sort}";
- $parameters = [Context::getId()];
- } else if ($mode === 'new') {
- $query = "SELECT keyword
- FROM wiki
- WHERE range_id = ? AND chdate > ?
- GROUP BY keyword
- {$sort}";
- $parameters = [Context::getId(), $lastlogindate];
- }
-
- $pages = DBManager::get()->fetchFirst($query, $parameters, function ($keyword) {
- return WikiPage::findLatestPage(Context::getId(), $keyword);
- });
-
- if (count($pages) === 0) {
- PageLayout::postInfo($nopages);
- } else {
- $template = $GLOBALS['template_factory']->open('wiki/list.php');
- $template->mode = $mode;
- $template->url = $selfurl;
- $template->titlesortlink = $titlesortlink;
- $template->versionsortlink = $versionsortlink;
- $template->changesortlink = $changesortlink;
- $template->pages = $pages;
- $template->lastlogindate = $lastlogindate;
- echo $template->render();
- }
-
- if ($mode === 'all'){
- $help_url = format_help_url('Basis.VerschiedenesFormat');
-
- $widget = Sidebar::get()->addWidget(new ExportWidget());
- $widget->addLink(
- _('PDF-Ausgabe aller Wiki-Seiten'),
- URLHelper::getURL('?view=exportall_pdf', ['sortby' => $sortby]),
- Icon::create('file-pdf'),
- ['target' => '_blank']
- );
- $widget->addLink(
- _('Druckansicht aller Wiki-Seiten'),
- URLHelper::getURL('?view=wikiprintall'),
- Icon::create('print'),
- ['target' => '_blank']
- );
- }
-
- showPageFrameEnd([]);
-}
-
-/**
-* List all versions of a wiki page
-*
-* @param string $keyword WikiPage name
-* @param string|null $sortby Different sortings of entries.
-**/
-function listPageVersions($keyword, $sortby = null)
-{
- $selfurl = '?view=pageversions';
- $sort = "ORDER by version DESC"; // default sort order for versions"
- $nopages = _('In dieser Veranstaltung wurden noch keine WikiSeiten angelegt.');
-
- // help texts
- $help = _('Zeigt eine tabellarische Ãœbersicht aller Versionen dieser Wiki-Seite an.');
- Helpbar::get()->ignoreDatabaseContents();
- Helpbar::get()->addPlainText('', $help);
-
- $versionsortlink = 'version';
- $changesortlink = 'lastchange';
-
- switch ($sortby) {
- case 'version':
- $sort = "ORDER BY version DESC";
- $versionsortlink = 'versiondesc';
- break;
- case 'versiondesc':
- $sort = "ORDER BY version";
- break;
- case 'lastchange':
- // sort by change date, default: newest first
- $sort = "ORDER BY chdate DESC, keyword ASC";
- $changesortlink = 'lastchangedesc';
- break;
- case 'lastchangedesc':
- // sort by change date, oldest first
- $sort = "ORDER BY chdate, keyword ASC";
- break;
- }
-
- $pages = WikiPage::findBySQL("range_id = ? AND keyword = ? ".$sort, [Context::getId(), $keyword]);
-
- if (count($pages) > 0) {
- $template = $GLOBALS['template_factory']->open('wiki/pageversions.php');
- $template->keyword = $keyword;
- $template->url = $selfurl;
- $template->versionsortlink = $versionsortlink;
- $template->changesortlink = $changesortlink;
- $template->pages = $pages;
- $template->sortby = $sortby;
- echo $template->render();
- }
-
- $wikiData = getWikiPage($keyword);
-
- getShowPageInfobox($keyword, $wikiData->isLatestVersion());
-
- showPageFrameEnd();
-}
-
-
-/**
-* Search Wiki
-*
-* @param searchfor string String to search for.
-* @param searchcurrentversions bool it true, only consider most recent versions or pages
-* @param keyword string last shown page or keyword for local (one page) search
-* @param keyword bool if localsearch is set, only one page (all versions) is searched
-**/
-function searchWiki($searchfor, $searchcurrentversions, $keyword, $localsearch)
-{
- $range_id = Context::getId();
- $result = null;
- $invalid_searchstring = false;
-
- // check for invalid search string
- if (mb_strlen($searchfor) < 3) {
- $invalid_searchstring = true;
- } else if ($localsearch && !$keyword) {
- $invalid_searchstring = true;
- } else {
- // make search string
- if ($localsearch) {
- $query = "SELECT *
- FROM wiki
- WHERE range_id = ? AND body LIKE CONCAT('%', ?, '%') AND keyword = ?
- ORDER BY version DESC";
- $parameters = [$range_id, htmlReady($searchfor), $keyword];
- } else if (!$searchcurrentversions) {
- // search in all versions of all pages
- $query = "SELECT *
- FROM wiki
- WHERE range_id = ? AND body LIKE CONCAT('%', ?, '%')
- ORDER BY keyword ASC, version DESC";
- $parameters = [$range_id, htmlReady($searchfor)];
- } else {
- // search only latest versions of all pages
- $query = "SELECT *
- FROM wiki AS w1
- WHERE range_id = ? AND w1.body LIKE CONCAT('%', ?, '%') AND version = (
- SELECT MAX(version)
- FROM wiki AS w2
- WHERE w2.range_id = ? AND w2.keyword = w1.keyword
- )
- ORDER BY w1.keyword ASC";
- $parameters = [$range_id, htmlReady($searchfor), $range_id];
- }
- $pages = DBManager::get()->fetchAll($query, $parameters, function ($row) {
- return WikiPage::buildExisting($row);
- });
-
- $pages = array_filter($pages, function ($page) {
- return $page->isVisibleTo($GLOBALS['user']);
- });
- }
-
- // quit if no pages found / search string was invalid
- if ($invalid_searchstring || count($pages) == 0) {
- if ($invalid_searchstring) {
- $message = MessageBox::error(_('Suchbegriff zu kurz. Geben Sie mindestens drei Zeichen ein.'));
- } else {
- $message = MessageBox::info(sprintf(_("Die Suche nach »%s« lieferte keine Treffer."), htmlReady($searchfor)));
- }
- PageLayout::postMessage($message);
- showWikiPage($keyword, NULL);
- return;
- }
-
- showPageFrameStart();
-
- // show hits
-?>
-<table class="default">
- <caption>
- <?= sprintf(_('Treffer für Suche nach %s'), '»' . htmlReady($searchfor) . '«') ?>
- <? if ($localsearch): ?>
- <?= sprintf(_('in allen Versionen der Seite %s'), '»' . htmlReady($keyword) . '«') ?>
- <? elseif ($searchcurrentversions): ?>
- <?= _('in aktuellen Versionen') ?>
- <? else: ?>
- <?= _('in allen Versionen') ?>
- <? endif; ?>
- </caption>
- <colgroup>
- <col width="10%">
- <col width="65%">
- <col width="25%">
- </colgroup>
- <thead>
- <tr>
- <th><?= _('Seite') ?></th>
- <th><?= _('Treffer') ?></th>
- <th><?= _('Version') ?></th>
- </tr>
- </thead>
- <tbody>
-<?php
- $c=1;
- $last_keyword="";
- $last_keyword_count=0;
- foreach ($pages as $result) {
- if (!$localsearch) {
- // don't display more than one hit in a page's versions
- // offer link instead
- if ($result['keyword']==$last_keyword) {
- $last_keyword_count++;
- continue;
- } else if ($last_keyword_count>0) {
- print($tdheadleft." ".$tdtail);
- if ($last_keyword_count==1) {
- $hitstring=_("Weitere Treffer in %s älteren Version. Klicken Sie %shier%s, um diese Treffer anzuzeigen.");
- } else {
- $hitstring=_("Weitere Treffer in %s älteren Versionen. Klicken Sie %shier%s, um diese Treffer anzuzeigen.");
- }
- print($tdheadleft."<em>".sprintf($hitstring,$last_keyword_count,"<b><a href=\"".URLHelper::getLink("?view=search&searchfor=$searchfor&keyword=".urlencode($last_keyword)."&localsearch=1")."\">","</a></b>")."</em>".$tdtail);
- print($tdheadleft." ".$tdtail);
- print("</tr>");
- }
- $last_keyword=$result['keyword'];
- $last_keyword_count=0;
- }
-
- $tdheadleft="<td>";
- $tdheadcenter="<td>";
- $tdtail="</td>";
-
- print("<tr>");
- // Pagename
- print($tdheadleft);
- print("<a href=\"".URLHelper::getLink('?', ['keyword' => $result['keyword'], 'version' => $result['version'], 'hilight' => $searchfor, 'searchfor' => $searchfor])."\">");
- print(htmlReady($result['keyword'])."</a>");
- print($tdtail);
- // display hit previews
- $offset=0; // step through text
- $ignore_next_hits=0; // don't show hits more than once
- $first_line=1; // don't print <br> before first hit
- $body = Studip\Markup::removeHtml($result['body']);
- print($tdheadleft);
- // find all occurences
- while ($offset < mb_strlen($body)) {
- $pos=mb_stripos($body, $searchfor, $offset);
- if ($pos===FALSE) break;
- $offset=$pos+1;
- if (($ignore_next_hits--)>0) {
- // if more than one occurence is found
- // in a fragment to be displayed,
- // the fragment is only shown once
- continue;
- }
- // show max 80 chars
- $fragment = '';
- $split_fragment = preg_split('/('.preg_quote($searchfor,'/').')/i', mb_substr($body, max(0, $pos-40), 80), -1, PREG_SPLIT_DELIM_CAPTURE);
- for ($i = 0; $i < count($split_fragment); ++$i) {
- if ($i % 2) {
- $fragment .= '<span style="background-color:#FFFF88">';
- $fragment .= htmlready($split_fragment[$i], false);
- $fragment .= '</span>';
- } else {
- $fragment .= htmlready($split_fragment[$i], false);
- }
- }
- $found_in_fragment = (count($split_fragment) - 1) / 2; // number of hits in fragment
- $ignore_next_hits = ($found_in_fragment > 1) ? $found_in_fragment - 1 : 0;
- print("...".$fragment."...");
- print "<br>";
- }
- print($tdtail);
- // version info
- print($tdheadleft);
- print(date("d.m.Y, H:i", $result['chdate'])." ("._("Version")." ".$result['version'].")");
- print($tdtail);
- print "</tr>";
-
- }
-
- if (!$localsearch && $last_keyword_count>0) {
- print("<tr>");
- print($tdheadleft." ".$tdtail);
- if ($last_keyword_count==1) {
- $hitstring=_("Weitere Treffer in %s älteren Version. Klicken Sie %shier%s, um diese Treffer anzuzeigen.");
- } else {
- $hitstring=_("Weitere Treffer in %s älteren Versionen. Klicken Sie %shier%s, um diese Treffer anzuzeigen.");
- }
- print($tdheadleft."<em>".sprintf($hitstring,$last_keyword_count,"<b><a href=\"".URLHelper::getLink("?view=search&searchfor=$searchfor&keyword=".urlencode($last_keyword)."&localsearch=1")."\">","</a></b>")."</em>".$tdtail);
- print($tdheadleft." ".$tdtail);
- print("</tr>");
- }
-
- echo "</tbody></table><p> </p>";
-
- // search
- $widget = new SearchWidget(URLHelper::getURL('?view=search&keyword=' . urlencode($keyword)));
- $widget->addNeedle(_('Im Wiki suchen'), 'searchfor', true);
- //$widget->addFilter(_('Nur in aktuellen Versionen'), 'searchcurrentversions');
- Sidebar::get()->addWidget($widget);
-
- showPageFrameEnd([]);
-}
-
-/**
-* Display edit form for wiki page.
-*
-* @param string keyword WikiPage name
-* @param array wikiData Array from DB with WikiPage data
-* @param string user_id Internal user id
-* @param string backpage Page to display if editing is aborted
-*
-**/
-function wikiEdit($keyword, $wikiData, $user_id, $backpage=NULL, $ancestor=NULL)
-{
- $parent = null;
- if (!$wikiData || $wikiData->isNew()) {
- $body = '';
- $version = 0;
- $lastpage = $backpage;
- $parent = $ancestor;
- } else {
- $body = $wikiData->body;
- $version = $wikiData->version;
- $lastpage = null;
- }
- releaseLocks($keyword); // kill old locks
- $locks=getLock($keyword, $user_id);
- $cont='';
- if ($locks) {
- $message = MessageBox::info(sprintf(_("Die Seite wird eventuell von %s bearbeitet."), htmlReady($locks)), [_("Wenn Sie die Seite trotzdem ändern, kann ein Versionskonflikt entstehen."), _("Es werden dann beide Versionen eingetragen und müssen von Hand zusammengeführt werden."), _("Klicken Sie auf Abbrechen, um zurückzukehren.")]);
- PageLayout::postMessage($message);
- }
- if ($keyword === 'toc') {
- $message = MessageBox::info(_("Sie bearbeiten die QuickLinks."), [_("Verwenden Sie Aufzählungszeichen (-, --, ---), um Verweise auf Seiten hinzuzufügen.")]);
- PageLayout::postMessage($message);
- if (!$body) {
- $body=_("- WikiWikiWeb\n- BeispielSeite\n-- UnterSeite1\n-- UnterSeite2");
- }
- }
-
- $page = WikiPage::findLatestPage(Context::getId(), Request::get('keyword', 'WikiWikiWeb'));
- // Info text for content bar (author, date etc.)
- $page_string = '';
- if ($page) {
- $user = User::find($page->user_id);
- if ($user) {
- $editor = sprintf('<a href="%s">%s</a>',
- URLHelper::getLink('dispatch.php/profile?username=' . $user->username),
- htmlReady($user->getFullName()));
- } else {
- $editor = _('unbekannt');
- }
- $page_string = sprintf(_('<a %s> Version %s</a>, geändert von %s'),
- ' href="' . URLHelper::getLink('', ['keyword' => $page->keyword, 'version' => $page->version]) . '"',
- $page->version, $editor);
- $page_string .= '<br>';
- $page_string .= strftime(_('am %x, %X'), $page->chdate);
- if ($page->keyword === 'WikiWikiWeb' || $page->isDescendantOf('WikiWikiWeb')) {
- $toc = CoreWiki::getTOC(WikiPage::getStartPage(Context::getId()));
- } else {
- $toc = new TOCItem($page->keyword);
- }
- } else {
- $toc = new TOCItem($keyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : $keyword);
- }
-
- // Action menu for content bar.
- $actionMenu = ActionMenu::get();
- if ($page && $page->isLatestVersion()) {
- $actionMenu->setContext($page->keyword);
- if ($page->isEditableBy($GLOBALS['user'])) {
- if (!$page->isNew()) {
- $actionMenu->addLink(
- URLHelper::getURL('dispatch.php/wiki/info', ['keyword' => $page->keyword]),
- _('Informationen'),
- Icon::create('info-circle'),
- ['data-dialog' => 1]
- );
- }
- }
- if ($GLOBALS['perm']->have_studip_perm('tutor', Context::getId()) && !$page->isNew()) {
- $actionMenu->addLink(
- URLHelper::getURL('dispatch.php/wiki/change_page_config', ['keyword' => $page->keyword]),
- _('Seiten-Einstellungen'),
- Icon::create('admin'),
- ['data-dialog' => 'size=auto']
- );
- $actionMenu->addLink(
- URLHelper::getURL('', ['keyword' => $page->keyword, 'cmd' => 'really_delete', 'version' => $page->version]),
- _('Löschen'),
- Icon::create('trash'),
- ['data-confirm' => showDeleteDialog($page->keyword, $page->version)]
- );
- }
- }
-
- // Create content bar.
- $contentBar = ContentBar::get()
- ->setTOC(CoreWiki::getTOC(WikiPage::getStartPage(Context::getId())))
- ->setInfo($page_string)
- ->setIcon(Icon::create('wiki'));
-
- if ($actionMenu) {
- $contentBar->setActionMenu($actionMenu);
- }
-
- $template = $GLOBALS['template_factory']->open('wiki/edit.php');
- $template->keyword = $keyword;
- $template->version = $version;
- $template->lastpage = $lastpage;
- $template->body = $body;
- $template->ancestor = $parent;
- $template->contentbar = $contentBar->render();
-
- echo $template->render();
-
- // help texts
- Helpbar::get()->ignoreDatabaseContents();
-
- $help = _('Der Editor dient zum Einfügen und Ändern von beliebigem Text.');
- Helpbar::get()->addPlainText('', $help);
-
- $tip = _('Links entstehen automatisch aus Wörtern, die von zwei paar eckigen Klammern umgeben sind (Beispiel: [nop][[[/nop]%%Schlüsselwort%%[nop]]][/nop]');
- Helpbar::get()->addPlainText(_('Tip'), $tip, Icon::create('info-circle'));
-}
-
-/**
-* Display wiki page for print.
-*
-* @param string keyword WikiPage name
-* @param string version WikiPage version
-*
-**/
-function printWikiPage($keyword, $version)
-{
- $wikiData=getWikiPage($keyword, $version);
- PageLayout::removeStylesheet('studip-base.css');
- PageLayout::addStylesheet('print.css'); // use special stylesheet for printing
- include ('lib/include/html_head.inc.php'); // Output of html head
- echo "<p><em>" . htmlReady(Context::getHeaderLine()) ."</em></p>";
- echo "<h1>" . htmlReady($keyword) ."</h1>";
- echo "<p><em>";
- echo sprintf(_("Version %s, letzte Änderung %s von %s."), $wikiData['version'],
- date("d.m.Y, H:i", $wikiData['chdate']), get_fullname($wikiData['user_id'], 'full', 1));
- echo "</em></p>";
- echo "<hr>";
- echo wikiReady($wikiData['body'], TRUE, FALSE, "none");
- echo "<hr><p><font size=-1>created by Stud.IP Wiki-Module ";
- echo date("d.m.Y, H:i", time());
- echo " </font></p>";
- include ('lib/include/html_end.inc.php');
-}
-
-function exportWikiPagePDF($keyword, $version)
-{
- $wikiData=getWikiPage($keyword,$version);
-
- $document = new ExportPDF();
- $document->SetTitle(_('Wiki: ') . $keyword);
- $document->setHeaderTitle(sprintf(_("Wiki von \"%s\""), Context::get()->Name));
- $document->setHeaderSubtitle(sprintf(_("Seite: %s"), $keyword));
- $document->addPage();
- $document->addContent(deleteWikiLinks($wikiData["body"]));
- $document->dispatch(Context::getHeaderLine() ." - ".$keyword);
-}
-
-function exportAllWikiPagesPDF($mode, $sortby)
-{
- $titlesortlink = 'title';
- $versionsortlink = 'version';
- $changesortlink = 'lastchange';
-
- $sort = '';
- switch ($sortby) {
- case 'title':
- // sort by keyword, prepare link for descending sorting
- $sort = "ORDER BY keyword";
- break;
- case 'titledesc':
- // sort descending by keyword, prep link for asc. sort
- $sort = "ORDER BY keyword DESC";
- break;
- case 'version':
- $sort = "ORDER BY MAX(version) DESC, keyword ASC";
- break;
- case 'versiondesc':
- $sort = " ORDER BY MAX(version), keyword ASC";
- break;
- case 'lastchange':
- // sort by change date, default: newest first
- $sort = " ORDER BY MAX(chdate) DESC, keyword ASC";
- break;
- case 'lastchangedesc':
- // sort by change date, oldest first
- $sort = " ORDER BY MAX(chdate), keyword ASC";
- break;
- }
-
- $query = "SELECT keyword
- FROM wiki
- WHERE range_id = ?
- GROUP BY keyword
- {$sort}";
-
- $statement = DBManager::get()->prepare($query);
- $statement->execute([Context::getId()]);
-
- $document = new ExportPDF();
- $document->SetTitle(_('Wiki: ') . Context::get()->name);
- $document->setHeaderTitle(sprintf(_('Wiki von "%s"'), Context::get()->name));
-
- while ($keyword = $statement->fetch(PDO::FETCH_COLUMN)) {
- $page = WikiPage::findLatestPage(Context::getId(), $keyword);
- if (!$page->isVisibleTo($GLOBALS['user'])) {
- continue;
- }
-
- $document->setHeaderSubtitle(sprintf(_('Seite: %s'), $page->keyword));
- $document->addPage();
-
- // We need the @ in front since TCPDF might throw warning that can lead
- // to errors viewing the document
- @$document->addContent(deleteWikiLinks($page->body));
- }
-
- $document->dispatch(Context::getHeaderLine());
-}
-
-function deleteWikiLinks($keyword) {
- $keyword = preg_replace('/\[\[[^|\]]*\|([^]]*)\]\]/', '$1', $keyword);
- $keyword = preg_replace('/\[\[([^|\]]*)\]\]/', '$1', $keyword);
- return $keyword;
-}
-
-/**
-* Show export all dialog
-*
-**/
-function exportWiki() {
- showPageFrameStart();
- $message = MessageBox::info(_('Alle Wiki-Seiten werden als große HTML-Datei zusammengefügt und in einem neuen Fenster angezeigt. Von dort aus können Sie die Datei abspeichern.'));
- PageLayout::postMessage($message);
-
- print '<div style="text-align: center;">';
- print LinkButton::create( _('Weiter'). ' >>' , URLHelper::getURL("?view=wikiprintall"), ['id'=>'wiki_export','title'=>_('Seiten exportieren'),'target'=>'_blank' ]);
- echo '</div>'; // end of content area
- showPageFrameEnd();
-}
-
-/**
-* Print HTML-dump of all wiki pages.
-*
-* @param string ID of veranstaltung/einrichtung
-* @param string Short title (header) of veranstaltung/einrichtung
-*
-**/
-function printAllWikiPages($range_id, $header) {
- echo getAllWikiPages($range_id, $header, TRUE);
-
- showPageFrameEnd();
-}
-
-/**
-* Return HTML-dump of all wiki pages.
-* Implements an iterative breadth-first traversal of WikiPage-tree.
-*
-* @param string $range_id ID of veranstaltung/einrichtung
-* @param string $header Short title (header) of veranstaltung/einrichtung
-* @param bool $fullhtml Include html/head/body tags?
-* @return string
-**/
-function getAllWikiPages($range_id, $header, $fullhtml = true) {
- $query = "SELECT DISTINCT keyword FROM wiki WHERE range_id = ? ORDER BY keyword DESC";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$range_id]);
- $allpages = $statement->fetchAll(PDO::FETCH_COLUMN);
-
- $out = [];
- $visited = []; // holds names of already visited pages
- $tovisit = []; // holds names of pages yetto visit/expand
-
- $tovisit[] = 'WikiWikiWeb'; // start with top level page
- if ($fullhtml) {
- $out[] = '<html><head><title>' . htmlReady($header) . '</title></head>';
- $out[] = '<body>';
- }
- $out[]="<p><a name=\"top\"></a><em>" . htmlReady($header) ."</em></p>";
- while (!empty($tovisit)) { // while there are still pages left to visit
- $pagename = array_shift($tovisit);
- if (!in_array($pagename, $visited)){
- $pagedata = WikiPage::findLatestPage($range_id, $pagename);
-
- // consider only pages with content and that are visible to the user
- if ($pagedata && $pagedata->isVisibleTo($GLOBALS['user'])) {
- $visited[] = $pagename;
- $linklist = getWikiLinks($pagedata['body']);
- foreach ($linklist as $l) {
- // add pages not visited yet to queue
- if (!in_array($l, $visited)) {
- $tovisit[] = $l; // breadth-first
- }
- }
- $out[] = "<hr><a name=\"$pagename\"></a><h1>" . htmlReady($pagename) . "</h1>";
- $out[] = "<font size=-1><p><em>";
- $out[] = sprintf(_("Version %s, letzte Änderung %s von %s."), $pagedata['version'], date("d.m.Y, H:i", $pagedata['chdate']), get_fullname($pagedata['user_id'], 'full', 1));
- $out[] = "</em></p></font>";
- // output is html without comments
- $out[] = wikiReady($pagedata['body'], true, false, 'none');
- $out[] = '<p><font size=-1>(<a href="#top">' . _("nach oben") . '</a>)</font></p>';
- }
- }
- if (empty($tovisit)){
- while (!empty($allpages)) {
- $l = array_pop($allpages);
- if (!in_array($l, $visited)) {
- $tovisit[] = $l;
- break;
- }
- }
- }
- }
- $out[] = '<hr><p><font size=-1>' . _('exportiert vom Stud.IP Wiki-Modul') . ' , ';
- $out[] = date('d.m.Y, H:i');
- $out[] = ' </font></p>';
- if ($fullhtml) {
- $out[] = '</body></html>';
- }
- return implode("\n",$out);
-}
-
-
-/**
-* Display start of page "frame", i.e. open correct table structure.
-*
-**/
-function showPageFrameStart() {
- echo '<div id="main_content">';
-}
-
-/**
-* Display the right and bottom part of a page "frame".
-*
-* Renders an infobox and closes the table.
-*
-* @param array ready to pass to print_infoxbox()
-*
-**/
-function showPageFrameEnd()
-{
- echo '</div>';
-}
-
-/**
-* Returns an infobox string holding information and action links for
-* current page.
-* If newest version is displayed, infobox includes backlinks.
-*
-* @param string WikiPage name
-* @param bool Is version displayed latest version?
-*
-**/
-function getShowPageInfobox($keyword, $latest_version)
-{
- $edit_perms = CourseConfig::get(Context::getId())->WIKI_COURSE_EDIT_RESTRICTED ? 'tutor' : 'autor';
-
- $versions = getWikiPageVersions($keyword);
-
- if (!$latest_version) {
- $message = sprintf(
- _('Sie betrachten eine alte Version, die nicht mehr geändert werden kann. Verwenden Sie dazu die %saktuelle Version%s.'),
- '<a href="' . URLHelper::getLink('', compact('keyword')) . '">',
- '</a>'
- );
- PageLayout::postInfo($message);
- }
-
- $sidebar = Sidebar::get();
-
- // Table of Contents/QuickLinks
- $widget = $sidebar->addWidget(new ListWidget());
- $widget->setTitle(_('QuickLinks'));
-
- $toccont = get_toc_content();
- $toccont_empty = !trim(strip_tags($toccont));
-
- if ($GLOBALS['perm']->have_studip_perm($edit_perms, Context::getId())) {
- $extra = sprintf(
- '<a href="%s">%s</a>',
- URLHelper::getLink('?keyword=toc&view=edit'),
- $toccont_empty
- ? Icon::create('add')->asImg(['title' => _('erstellen')])
- : Icon::create('edit')->asImg(['title' => _('bearbeiten')])
- );
- $widget->setExtra($extra);
- }
-
- $element = new WidgetElement($toccont_empty ? _('Keine QuickLinks vorhanden') : $toccont);
- $element->icon = Icon::create('link-intern');
- $widget->addElement($element);
-
- // Index:
-
- $wikistartpage = WikiPage::findLatestPage(Context::getId(), 'WikiWikiWeb');
- /*
- if ($wikistartpage->children) {
- $widget = $sidebar->addWidget(new SidebarWidget());
- $widget->setTitle(_('Inhalt'));
- $header = new WidgetElement('<a href="' . URLHelper::getLink('wiki.php') . '">'._('Wiki-Startseite').'</a>');
- $widget->addElement($header);
- $element = new WidgetElement(getWikiIndex($wikistartpage->children));
- $widget->addElement($element);
-
- }
- */
-
- // Actions:
- $widget = $sidebar->addWidget(new ActionsWidget());
- if ($GLOBALS['perm']->have_studip_perm($edit_perms, Context::getId())) {
- $widget->addLink(
- _('Neue Wiki-Seite anlegen'),
- URLHelper::getURL('dispatch.php/wiki/create', compact('keyword')),
- Icon::create('add')
- )->asDialog('size=auto');
- }
-
- if ($GLOBALS['perm']->have_studip_perm('tutor', Context::getId())) {
- if (Context::getType() == Context::COURSE) {
- $widget->addLink(
- _('Seiten importieren'),
- URLHelper::getURL('dispatch.php/wiki/import/' . Context::getId()),
- Icon::create('import')
- )->asDialog('size=auto');
- }
-
- // Change wiki course permissions
- $widget->addLink(
- _('Wiki-Einstellungen ändern'),
- URLHelper::getURL('dispatch.php/wiki/change_courseperms', compact('keyword')),
- Icon::create('admin')
- )->asDialog('size=auto');
-
- // Alle Versionen löschen
- if (keywordExists($keyword)) {
- $widget->addLink(
- _('Alle Versionen löschen'),
- URLHelper::getURL("?cmd=really_delete_all&keyword=".urlencode($keyword)),
- Icon::create('trash'),
- ['data-confirm' => showDeleteAllDialog($keyword)]
- );
- }
- }
-
- // Suche
- $widget = $sidebar->addWidget(new SearchWidget(URLHelper::getURL('?view=search', compact('keyword'))));
- $widget->addNeedle(_('Im Wiki suchen'), 'searchfor', true);
- //$widget->addFilter(_('Nur in aktuellen Versionen'), 'searchcurrentversions');
-
- // Ansichten
- $widget = $sidebar->addWidget(new ViewsWidget());
- $widget->addLink(
- _('Leseansicht'),
- URLHelper::getURL('?view=show', compact('keyword')),
- Icon::create('wiki')
- )->setActive(Request::option('view') === 'show' || Request::option('view') == '');
-
- if (Request::option('view') != 'pageversions') {
- if (Request::option('wiki_comments') === 'none') {
- if ($GLOBALS['user']->cfg->WIKI_COMMENTS_ENABLE) {
- $widget->addLink(
- _('Kommentare anzeigen'),
- URLHelper::getURL('?wiki_comments=all&view='.Request::option('view'), compact('keyword'))
- );
- } else {
- $widget->addLink(
- _('Kommentare anzeigen'),
- URLHelper::getURL('?wiki_comments=icon&view='.Request::option('view'), compact('keyword'))
- );
- }
- } else {
- $widget->addLink(
- _('Kommentare ausblenden'),
- URLHelper::getURL('?wiki_comments=none&view='.Request::option('view'), compact('keyword'))
- );
- }
- }
-
- if (count($versions) >= 1) {
- $widget->addLink(
- _('Änderungsliste'),
- URLHelper::getURL('?view=diff', compact('keyword'))
- )->setActive(Request::option('view') === 'diff');
- $widget->addLink(
- _('Text mit Autor/-innenzuordnung'),
- URLHelper::getURL('?view=combodiff', compact('keyword'))
- )->setActive(Request::option('view') === 'combodiff');
- $widget->addLink(
- _('Alle Versionen dieser Seite'),
- URLHelper::getURL('?view=pageversions', compact('keyword'))
- )->setActive(Request::option('view') === 'pageversions');
- }
-
- // Exportfunktionen
- $version = Request::int('version') ?: '';
-
- $widget = $sidebar->addWidget(new ExportWidget());
- $widget->addLink(
- _('Druckansicht'),
- URLHelper::getURL('?view=wikiprint', compact('keyword', 'version')),
- Icon::create('print'),
- ['target' => '_blank']
- );
- $widget->addLink(
- _('PDF-Ausgabe'),
- URLHelper::getURL('?view=export_pdf', compact('keyword', 'version')),
- Icon::create('file-pdf'),
- ['target' => '_blank']
- );
-
- return [];
-}
-
-/**
-* Returns an infobox string holding information and action links for
-* diff view of current page.
-*
-* @param string WikiPage name
-*
-**/
-function getDiffPageInfobox($keyword) {
-
- $versions = getWikiPageVersions($keyword);
-
- // Aktuelle Version
- $widget = Sidebar::get()->addWidget(new ViewsWidget());
- $widget->addLink(
- _('Leseansicht'),
- URLHelper::getURL('?view=show', compact('keyword'))
- );
- if (count($versions) >= 1) {
- $widget->addLink(
- _('Änderungen anzeigen'),
- URLHelper::getURL('?view=diff', compact('keyword'))
- )->setActive(Request::option('view') === 'diff');
- $widget->addLink(
- _('Text mit Autor/-innenzuordnung anzeigen'),
- URLHelper::getURL('?view=combodiff', compact('keyword'))
- )->setActive(Request::option('view') === 'combodiff');
- }
-
- return [];
-}
-
-function get_toc_toggler() {
- $toc=getWikiPage("toc",0);
- if (!$toc) return '';
- $cont="";
- $ToggleText=[_("verstecken"),_("anzeigen")];
- $cont.="<script type=\"text/javascript\">
- function toggle(obj) {
- var elstyle = document.getElementById(obj).style;
- var text = document.getElementById(obj + \"tog\");
- if (elstyle.display == 'none') {
- elstyle.display = 'block';
- text.innerHTML = \"{$ToggleText[0]}\";
- } else {
- elstyle.display = 'none';
- text.innerHTML = \"{$ToggleText[1]}\";
- }
- }
- </script>";
- $cont.="<span class='wikitoc_toggler'> (<a id=\"00toctog\" href=\"javascript:toggle('00toc');\">{$ToggleText[0]}</a>)</span>";
- return $cont;
-}
-
-function get_toc_content() {
- // Table of Contents / Wiki navigation
- $toc = getWikiPage('toc',0);
- if (!$toc) {
- return '';
- }
-
- $toccont = '<div class="wikitoc" id="00toc">';
- $toccont .= wikiReady($toc['body'], true);
- $toccont .= '</div>';
- return $toccont;
-}
-
-/**
-* Display wiki page.
-*
-* @param string WikiPage name
-* @param string WikiPage version
-* @param string ID of special dialog to be printed (delete)
-* @param string Comment show mode (all, none, icon)
-*
-**/
-function showWikiPage($keyword, $version, $special="", $show_comments="icon", $hilight=NULL) {
- $wikiData = getWikiPage($keyword, $version);
- $content = wikiReady($wikiData["body"], TRUE, FALSE, $show_comments);
-
- $page = WikiPage::findLatestPage(Context::getId(), Request::get('keyword', 'WikiWikiWeb'));
- // Info text for content bar (author, date etc.)
- $page_string = '';
- if ($page) {
- $user = User::find($page->user_id);
- if ($user) {
- $editor = sprintf('<a href="%s">%s</a>',
- URLHelper::getLink('dispatch.php/profile?username=' . $user->username),
- htmlReady($user->getFullName()));
- } else {
- $editor = _('unbekannt');
- }
- $page_string = sprintf(_('<a %s> Version %s</a>, geändert von %s'),
- ' href="' . URLHelper::getLink('', ['keyword' => $page->keyword, 'version' => $page->version]) . '"',
- $page->version, $editor);
- $page_string .= '<br>';
- $page_string .= strftime(_('am %x, %X'), $page->chdate);
- if ($page->keyword === 'WikiWikiWeb' || $page->isDescendantOf('WikiWikiWeb')) {
- $toc = CoreWiki::getTOC(WikiPage::getStartPage(Context::getId()));
- } else {
- $toc = new TOCItem($page->keyword);
- }
- } else {
- $toc = new TOCItem($keyword === 'WikiWikiWeb' ? _('Wiki-Startseite') : $keyword);
- }
-
- // Action menu for content bar.
- $actionMenu = ActionMenu::get();
- if ($page && $page->isLatestVersion()) {
- $actionMenu->setContext($page->keyword);
- if ($page->isEditableBy($GLOBALS['user'])) {
- if (!$page->isNew()) {
- $actionMenu->addLink(
- URLHelper::getURL('dispatch.php/wiki/info', ['keyword' => $page->keyword]),
- _('Informationen'),
- Icon::create('info-circle'),
- ['data-dialog' => 1]
- );
- }
- $actionMenu->addLink(
- URLHelper::getURL('', ['keyword' => $page->keyword, 'view' => 'edit']),
- _('Bearbeiten'),
- Icon::create('edit')
- );
- }
- if ($GLOBALS['perm']->have_studip_perm('tutor', Context::getId()) && !$page->isNew()) {
- $actionMenu->addLink(
- URLHelper::getURL('dispatch.php/wiki/change_page_config', ['keyword' => $page->keyword]),
- _('Seiten-Einstellungen'),
- Icon::create('admin'),
- ['data-dialog' => 'size=auto']
- );
- $actionMenu->addLink(
- URLHelper::getURL('', ['keyword' => $page->keyword, 'cmd' => 'really_delete', 'version' => $page->version]),
- _('Löschen'),
- Icon::create('trash'),
- ['data-confirm' => showDeleteDialog($page->keyword, $page->version)]
- );
- }
- $actionMenu->addLink(
- '#',
- _('Als Vollbild anzeigen'),
- Icon::create('screen-full'),
- ['class' => 'fullscreen-trigger hidden-medium-down']
- );
- }
-
- // Create content bar.
- $contentBar = ContentBar::get()
- ->setTOC($toc)
- ->setInfo($page_string)
- ->setIcon(Icon::create('wiki'));
-
- if ($actionMenu) {
- $contentBar->setActionMenu($actionMenu);
- }
-
- if ($hilight) {
- // Highlighting must only take place outside HTML tags, so
- // 1. save all html tags in array $founds[0]
- // 2. replace all html tags with \007\007
- // 3. highlight
- // 4. replace all \007\007 with corresponding saved tags
- $founds = [];
- preg_match_all("/<[^>].*>/U", $content, $founds);
- $content = preg_replace("/<[^>].*>/U", "\007\007", $content);
- $content = preg_replace("/(".preg_quote(htmlReady($hilight), "/").")/i", "<span style='background-color:#FFFF88'>\\1</span>", $content, -1);
- foreach($founds[0] as $f) {
- $content = preg_replace("/\007\007/", $f, $content, 1);
- }
- }
-
- $template = $GLOBALS['template_factory']->open('wiki/show.php');
- $template->wikipage = $wikiData;
- $template->content = $content;
-
- $template->contentbar = $contentBar;
-
- echo $template->render();
-
- getShowPageInfobox($keyword, $wikiData->isLatestVersion());
-}
-
-/**
-* Display Page diffs, restrictable to recent versions
-*
-* @param string WikiPage name
-* @param string Only show versions newer than this timestamp
-*
-**/
-function showDiffs($keyword, $versions_since)
-{
- $query = "SELECT *
- FROM wiki
- WHERE keyword = ? AND range_id = ?
- ORDER BY version DESC";
- $statement = DBManager::get()->prepare($query);
- $statement->execute([$keyword, Context::getId()]);
- $versions = $statement->fetchAll(PDO::FETCH_ASSOC);
-
- if (count($versions) === 0) {
- throw new InvalidArgumentException(_('Es gibt keine zu vergleichenden Versionen.'));
- }
-
- $version = array_shift($versions);
- $last = Studip\Markup::removeHtml($version['body']);
- $lastversion = $version['version'];
- $zusatz = getZusatz($version);
-
- $content = '';
- foreach ($versions as $version) {
- $content .= '<tr>';
- $current = Studip\Markup::removeHtml($version['body']);
- $currentversion = $version['version'];
-
- $diffarray = '<b><font size=-1>'. _("Änderungen zu") . " </font> $zusatz</b><p>";
- $diffarray .= "<table cellpadding=0 cellspacing=0 border=0 width=\"100%\">\n";
- $diffarray .= do_diff($current, $last);
- $diffarray .= "</table>\n";
- $content .= printcontent(0, 0, $diffarray, '', false);
- $content .= '</tr>';
-
- $last = $current;
- $lastversion = $currentversion;
- $zusatz = getZusatz($version);
- if ($versions_since && $version['chdate'] < $versions_since) {
- break;
- }
- }
-
- $wikiData = getWikiPage($keyword, null);
-
- $template = $GLOBALS['template_factory']->open('wiki/show.php');
- $template->wikipage = $wikiData;
- $template->content = $content;
- echo $template->render();
-
- //getDiffPageInfobox($keyword);
- getShowPageInfobox($keyword, $wikiData->isLatestVersion());
-
- // help texts
- $help = _('Die Ansicht zeigt den Verlauf der Textänderungen einer Wiki-Seite.');
- Helpbar::get()->ignoreDatabaseContents();
- Helpbar::get()->addPlainText('', $help);
-}
-
-/////////////////////////////////////////////////
-// DIFF funcitons adapted from:
-// PukiWiki - Yet another WikiWikiWeb clone.
-// http://www.pukiwiki.org (GPL'd)
-//
-//
-//
-function do_diff($strlines1,$strlines2)
-{
- $plus="<td width=\"3\" bgcolor=\"green\"> </td>";
- $minus="<td width=\"3\" bgcolor=\"red\"> </td>";
- $equal="<td width=\"3\" bgcolor=\"grey\"> </td>";
- $obj = new line_diff($plus, $minus, $equal);
- $str = $obj->str_compare($strlines1,$strlines2);
- return $str;
-}
-
-function toDiffLineArray($lines, $who) {
- $dla = [];
- $lines = Studip\Markup::removeHtml($lines);
- $lines = explode("\n",preg_replace("/\r/",'',$lines));
- foreach ($lines as $l) {
- $dla[] = new DiffLine($l, $who);
- }
- return $dla;
-}
-
-function showComboDiff($keyword, $db=NULL)
-{
- $version2=getLatestVersion($keyword, Context::getId());
- $version1=getFirstVersion($keyword, Context::getId());
- $version2=$version2["version"];
- $version1=$version1["version"];
-
- $content = "\n<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">";
-
- // create combodiff
-
- $wd1 = getWikiPage($keyword, $version1);
- $diffarray1 = toDiffLineArray($wd1['body'], $wd1['user_id']);
- $current_version = $version1 + 1;
- $differ = new line_diff();
- while ($current_version <= $version2) {
- $wd2 = getWikiPage($keyword, $current_version);
- if ($wd2) {
- $diffarray2 = toDiffLineArray($wd2['body'], $wd2['user_id']);
- $newarray = $differ->arr_compare("diff", $diffarray1, $diffarray2);
- $diffarray1=[];
- foreach ($newarray as $i) {
- if ($i->status["diff"] != "-") {
- $diffarray1[]=$i;
- }
- }
- }
- $current_version++;
- }
- $legend="<table>";
- $count=0;
- $authors=[];
- foreach ($diffarray1 as $i) {
- if ($i && !in_array($i->who, $authors)) {
- $authors[]=$i->who;
- if ($count % 4 == 0) {
- $legend.= "<tr width=\"100%\">";
- }
- $legend.= "<td class=\"wiki-author".($count % 30)."\" width=\"14\"> </td><td><font size=-1>".get_fullname($i->who,'full',1)."</font></td><td> </td>";
- if ($count % 4 == 3) {
- $legend .= "</tr>";
- }
- $count++;
- }
- }
- $content .= "<tr><td colspan=2>";
- $content .= "<p><font size=-1> <br>";
- $content .= _("Legende der Autor/-innenfarben:");
- $content .= "<table cellpadding=6 cellspacing=6>$legend</table>\n";
- $content .= "</p>";
- $content .= "<table cellpadding=0 cellspacing=0 width=\"100%\">";
- $last_author = 'None';
- $collect="";
- $diffarray1[]=NULL;
- foreach ($diffarray1 as $i) {
- if (!$i || $last_author != $i->who) {
- if (trim($collect)!="") {
- $idx=array_search($last_author, $authors);
- $content .= "<tr class=\"wiki-author".($idx % 30)."\">";
- $content .= "<td width=30 align=center valign=top>";
- $content .= Icon::create('info-circle', 'inactive', ['title' => _("Änderung von").' ' . get_fullname($last_author)])->asImg();
- $content .= "</td>";
- $content .= "<td><font size=-1>";
- $content .= wikiReady($collect);
- $content .= "</font></td>";
- $content .= "</tr>";
- }
- $collect="";
- }
- if ($i) {
- $last_author = $i->who;
- $collect .= $i->text;
- }
- }
- $content .= "</table></td></tr>";
- $content .= "</table> ";
-
- $wikiData = getWikiPage($keyword, null);
-
- $template = $GLOBALS['template_factory']->open('wiki/show.php');
- $template->wikipage = $wikiData;
- $template->content = $content;
- echo $template->render();
-
- //getDiffPageInfobox($keyword);
- getShowPageInfobox($keyword, $wikiData->isLatestVersion());
-
- // help texts
- $help = [
- _('Die Ansicht zeigt den Verlauf der Textänderungen einer Wiki-Seite '.
- 'mit einer Übersicht, welche Autor/-innen welche Textänderungen ' .
- 'vorgenommen haben.')];
- Helpbar::get()->ignoreDatabaseContents();
- Helpbar::get()->addPlainText('', $help);
-}
-
-/*
-line_diff
-
-S. Wu, <a href="http://www.cs.arizona.edu/people/gene/vita.html">
-E. Myers,</a> U. Manber, and W. Miller,
-<a href="http://www.cs.arizona.edu/people/gene/PAPERS/np_diff.ps">
-"An O(NP) Sequence Comparison Algorithm,"</a>
-Information Processing Letters 35, 6 (1990), 317-323.
-*/
-
-class line_diff
-{
- var $arr1,$arr2,$m,$n,$pos,$key,$plus,$minus,$equal,$reverse,$result,$path;
- var $add_count;
- var $delete_count;
-
- function __construct($plus='+',$minus='-',$equal='=')
- {
- $this->plus = $plus;
- $this->minus = $minus;
- $this->equal = $equal;
- }
- function arr_compare($key,$arr1,$arr2)
- {
- $this->key = $key;
- $this->arr1 = $arr1;
- $this->arr2 = $arr2;
- $this->compare();
- $arr = $this->toArray();
- return $arr;
- }
- function set_str($key,$str1,$str2)
- {
- $this->key = $key;
- $this->arr1 = [];
- $this->arr2 = [];
- $str1 = preg_replace("/\r/",'',$str1);
- $str2 = preg_replace("/\r/",'',$str2);
- foreach (explode("\n",$str1) as $line)
- {
- $this->arr1[] = new DiffLine($line, 'nobody');
- }
- foreach (explode("\n",$str2) as $line)
- {
- $this->arr2[] = new DiffLine($line, 'nobody');
- }
- }
- function str_compare($str1, $str2, $show_equal=FALSE)
- {
- $this->set_str('diff',$str1,$str2);
- $this->compare();
-
- $str = '';
- $lastdiff = "";
- $textaccu = "";
- $template = "<tr>%s<td width=\"10\"> </td><td><font size=-1>%s</font> </td></tr>";
- foreach ($this->toArray() as $obj)
- {
- if ($show_equal || $obj->get('diff') != $this->equal) {
- if ($lastdiff && $obj->get("diff") != $lastdiff) {
- $str .= sprintf($template, $lastdiff, wikiReady($textaccu));
- $textaccu="";
- }
- $textaccu .= $obj->text();
- $lastdiff = $obj->get("diff");
- }
- }
- if ($textaccu) {
- $str .= sprintf($template, $lastdiff, wikiReady($textaccu));
- }
- return $str;
- }
- function compare()
- {
- $this->m = count($this->arr1);
- $this->n = count($this->arr2);
-
- if ($this->m == 0 or $this->n == 0) // no need compare.
- {
- $this->result = [['x'=>0,'y'=>0]];
- return;
- }
-
- // sentinel
- array_unshift($this->arr1,new DiffLine(''));
- $this->m++;
- array_unshift($this->arr2,new DiffLine(''));
- $this->n++;
-
- $this->reverse = ($this->n < $this->m);
- if ($this->reverse) // swap
- {
- $tmp = $this->m; $this->m = $this->n; $this->n = $tmp;
- $tmp = $this->arr1; $this->arr1 = $this->arr2; $this->arr2 = $tmp;
- unset($tmp);
- }
-
- $delta = $this->n - $this->m; // must be >=0;
-
- $fp = [];
- $this->path = [];
-
- for ($p = -($this->m + 1); $p <= ($this->n + 1); $p++)
- {
- $fp[$p] = -1;
- $this->path[$p] = [];
- }
-
- for ($p = 0;; $p++)
- {
- for ($k = -$p; $k <= $delta - 1; $k++)
- {
- $fp[$k] = $this->snake($k, $fp[$k - 1], $fp[$k + 1]);
- }
- for ($k = $delta + $p; $k >= $delta + 1; $k--)
- {
- $fp[$k] = $this->snake($k, $fp[$k - 1], $fp[$k + 1]);
- }
- $fp[$delta] = $this->snake($delta, $fp[$delta - 1], $fp[$delta + 1]);
- if ($fp[$delta] >= $this->n)
- {
- $this->pos = $this->path[$delta]; //
- return;
- }
- }
- }
- function snake($k, $y1, $y2)
- {
- if ($y1 >= $y2)
- {
- $_k = $k - 1;
- $y = $y1 + 1;
- }
- else
- {
- $_k = $k + 1;
- $y = $y2;
- }
- $this->path[$k] = $this->path[$_k];//
- $x = $y - $k;
- while ((($x + 1) < $this->m) and (($y + 1) < $this->n)
- and $this->arr1[$x + 1]->compare($this->arr2[$y + 1]))
- {
- $x++; $y++;
- $this->path[$k][] = ['x'=>$x,'y'=>$y]; //
- }
- return $y;
- }
- function toArray()
- {
- $arr = [];
- if ($this->reverse) //
- {
- $_x = 'y'; $_y = 'x'; $_m = $this->n; $arr1 =& $this->arr2; $arr2 =& $this->arr1;
- }
- else
- {
- $_x = 'x'; $_y = 'y'; $_m = $this->m; $arr1 =& $this->arr1; $arr2 =& $this->arr2;
- }
-
- $x = $y = 1;
- $this->add_count = $this->delete_count = 0;
- $this->pos[] = ['x'=>$this->m,'y'=>$this->n]; // sentinel
- foreach ($this->pos as $pos)
- {
- $this->delete_count += ($pos[$_x] - $x);
- $this->add_count += ($pos[$_y] - $y);
-
- while ($pos[$_x] > $x)
- {
- $arr1[$x]->set($this->key,$this->minus);
- $arr[] = $arr1[$x++];
- }
-
- while ($pos[$_y] > $y)
- {
- $arr2[$y]->set($this->key,$this->plus);
- $arr[] = $arr2[$y++];
- }
-
- if ($x < $_m)
- {
- $arr1[$x]->merge($arr2[$y]);
- $arr1[$x]->set($this->key,$this->equal);
- $arr[] = $arr1[$x];
- }
- $x++; $y++;
- }
- return $arr;
- }
-}
-
-class DiffLine
-{
- var $text;
- var $status;
- var $who; // who originally wrote this line?
-
- function __construct($text, $who=NULL)
- {
- $this->text = "$text\n";
- $this->status = [];
- $this->who = $who;
- }
- function compare($obj)
- {
- return $this->text == $obj->text;
- }
- function set($key,$status)
- {
- $this->status[$key] = $status;
- }
- function get($key)
- {
- return array_key_exists($key,$this->status) ? $this->status[$key] : '';
- }
- function merge($obj)
- {
- $this->status += $obj->status;
- }
- function text()
- {
- return $this->text;
- }
-}
diff --git a/public/assets/javascripts/ckeditor/plugins/studip-wiki/plugin.js b/public/assets/javascripts/ckeditor/plugins/studip-wiki/plugin.js
index 104c5ba044c818a41606cadb77487efab51ec412..aff2785b2a0e81428e204c7ee293570e58799a7e 100644
--- a/public/assets/javascripts/ckeditor/plugins/studip-wiki/plugin.js
+++ b/public/assets/javascripts/ckeditor/plugins/studip-wiki/plugin.js
@@ -29,7 +29,7 @@ CKEDITOR.plugins.add('studip-wiki', {
},
data: function () {
var text = this.data.text ? ('|' + this.data.text) : '';
- this.element.setText('[[' + this.data.link + text + ']]');
+ this.element.setText('<a href="' + this.data.link + '" class="wiki-link">' + text + '</a>');
}
});
CKEDITOR.dialog.add('wikiDialog', this.path + 'dialogs/wikilink.js');
diff --git a/public/wiki.php b/public/wiki.php
deleted file mode 100644
index 16326f6dbc4c73ed1674e28a822c68180ef0f00e..0000000000000000000000000000000000000000
--- a/public/wiki.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-# Lifter001: DONE
-# Lifter002: TODO
-# Lifter007: TODO
-# Lifter003: TODO
-# Lifter010: TODO
-
-/*
-wiki.php - (No longer so) Simple WikiWikiWeb in Stud.IP
-
-@module wiki
-@author Tobias Thelen <tthelen@uos.de>
-
-Copyright (C) 2003 Tobias Thelen <tthelen@uni-osnabrueck.de>
-Contains code (regex for WikiWord detection) from Blast Wiki http://www.roboticboy.com/wiki/ (GPL'd)
-Contains code (diff routine) from PukiWiki http://www.pukiwiki.org (GPL'd)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-
-require '../lib/bootstrap.php';
-
-page_open(["sess" => "Seminar_Session", "auth" => "Seminar_Default_Auth", "perm" => "Seminar_Perm", "user" => "Seminar_User"]);
-$GLOBALS['auth']->login_if(Request::get('again') && $GLOBALS['user']->id === 'nobody');
-
-include ('lib/seminar_open.php'); // initialise Stud.IP-Session
-
-// -- here you have to put initialisations for the current page
-require_once 'lib/wiki.inc.php';
-
-$view = Request::get('view');
-$keyword = Request::get('keyword');
-$version = Request::int('version');
-$cmd = Request::option('cmd');
-
-if ($view === 'wikiprint') {
- printWikiPage($keyword, $version);
- page_close();
- die();
-} elseif ($view === 'wikiprintall') {
- printAllWikiPages(Context::getId(), Context::getHeaderLine());
- page_close();
- die();
-} elseif ($view === 'export_pdf') {
- exportWikiPagePDF($keyword, $version);
-} elseif ($view === 'exportall_pdf') {
- exportAllWikiPagesPDF('all', Request::option('sortby'));
-}
-
-checkObject(); // do we have an open object?
-checkObjectModule("wiki"); //are we allowed to use this module here?
-object_set_visit_module("wiki");
-
-PageLayout::setHelpKeyword("Basis.Wiki"); // Hilfeseite im Hilfewiki
-PageLayout::setTitle(Context::getHeaderLine() . " - " . _("Wiki"));
-
-if (in_array(Request::get('view'), words('listnew listall export'))) {
- Navigation::activateItem('/course/wiki/'.$view);
-} else if ($keyword) {
- Navigation::activateItem('/course/wiki/show');
-} else {
- Navigation::activateItem('/course/wiki/start');
-}
-
-if (Request::option('wiki_comments') === 'none') { // don't show comments
- $show_wiki_comments = 'none';
-} else if ($GLOBALS['user']->cfg->WIKI_COMMENTS_ENABLE) { // show all comments
- $show_wiki_comments = 'all';
-} else { // show comments as icons
- $show_wiki_comments = 'icon';
-}
-
-URLHelper::addLinkParam('wiki_comments', $show_wiki_comments);
-
-ob_start();
-
-// ---------- Start of main WikiLogic
-
-if ($view === 'listall') {
- //
- // list all pages, default sorting = alphabetically
- //
- listPages('all', Request::option('sortby'));
-
-} else if ($view === 'listnew') {
- //
- // list new pages, default sorting = newest first
- //
- listPages('new', Request::option('sortby'));
-
-} else if ($view === 'diff') {
- //
- // show one large diff-file containing all changes
- //
- showDiffs($keyword, Request::option('versionssince'));
-
-} else if ($view === 'combodiff') {
- //
- // show one large diff-file containing all changes
- //
- showComboDiff($keyword);
-
-} else if ($view === 'pageversions') {
- //
- // show versions of a wiki page
- //
- listPageVersions($keyword, Request::option('sortby'));
-
-} else if ($view === 'export') {
- //
- // show export dialog
- //
- exportWiki();
-
-} else if ($view === 'search') {
- searchWiki(Request::get('searchfor'), Request::get('searchcurrentversions'), Request::get('keyword'), Request::get('localsearch'));
-
-} else if ($view === 'edit') {
- //
- // show page for editing
- //
-
- // prevent malformed urls: keyword must be set
- if (!$keyword) {
- throw new InvalidArgumentException(_('Es wurde keine zu editierende Seite übergeben!'));
- }
-
- $wikiData = getWikiPage($keyword, 0); // always get newest page
-
- if ($wikiData && !$wikiData->isEditableBy($GLOBALS['user'])) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, Seiten zu editieren!'));
- }
-
- // set lock
- setWikiLock(null, $GLOBALS['user']->id, Context::getId(), $keyword);
-
- // show form
- wikiEdit($keyword, $wikiData, $GLOBALS['user']->id);
-
-} else if ($view === 'editnew') {
- //
- // edit a new page
- //
-
- $range_id = Context::getId();
- $ancestor = Request::get('origin') ? : Request::get('ancestor_select');
- if (!$ancestor) {
- $ancestor = null;
- }
- $edit_perms = CourseConfig::get($range_id)->WIKI_COURSE_EDIT_RESTRICTED ? 'tutor' : 'autor';
- if (!$GLOBALS['perm']->have_studip_perm($edit_perms, $range_id)) {
- throw new AccessDeniedException(_('Sie haben keine Berechtigung, in dieser Veranstaltung Seiten zu editieren!'));
- }
-
- // prevent malformed urls: keyword must be set
- if (!$keyword) {
- throw new InvalidArgumentException(_('Es wurde keine zu editierende Seite übergeben!'));
- }
-
- $wikiData = getWikiPage($keyword, 0); // always get newest page
-
- // warning in the case of an existing wiki page
- if ($wikiData && !$wikiData->isNew()) {
- PageLayout::postInfo(sprintf(
- _('Die Wiki-Seite "%s" existiert bereits. Änderungen hier überschreiben diese Seite!'),
- htmlReady($keyword)
- ));
- }
-
- // set lock
- setWikiLock(null, $GLOBALS['user']->id, Context::getId(), $keyword);
-
- //show form
- wikiEdit($keyword, $wikiData, $GLOBALS['user']->id, Request::get('lastpage'), $ancestor);
-
-} else {
- // Default action: Display WikiPage (+ logic for submission)
- //
- if (empty($keyword)) {
- $keyword = 'WikiWikiWeb'; // display Start page as default
- }
- releaseLocks($keyword); // kill old locks
- $special = '';
-
- if (Request::submitted('submit')) {
- //
- // Page was edited and submitted
- //
- if (Request::get('ancestor')) {
- $ancestor = Request::get('ancestor');
- } else {
- $latest_page = WikiPage::findLatestPage(Context::getId(), $keyword);
- $ancestor = $latest_page ? $latest_page->ancestor : null;
- }
- submitWikiPage($keyword, $version, Studip\Markup::purifyHtml(Request::get('body')), $GLOBALS['user']->id, Context::getId(), $ancestor);
- $version = ''; // $version="" means: get latest
-
- } else if ($cmd === 'abortedit') { // Editieren abgebrochen
- //
- // Editing page was aborted
- //
-
- // kill lock (set when starting to edit)
- releasePageLocks($keyword, $GLOBALS['user']->id);
-
- // if editing new page was aborted, display last page again
- $keyword = Request::get('lastpage', $keyword);
-
- } else if ($cmd === 'really_delete') {
- //
- // Delete was confirmed -> really delete
- //
-
- $keyword = deleteWikiPage($keyword, $version, Context::getId());
- $version = ''; // show latest version
-
- } else if ($cmd === 'really_delete_all') {
- //
- // Delete all was confirmed -> delete entire page
- //
- $keyword = deleteAllWikiPage($keyword, Context::getId());
- $version = ''; // show latest version
- }
-
- //
- // Show Page
- //
-
- $page = WikiPage::findLatestPage(Context::getId(), $keyword);
- if (!$page || $page->isVisibleTo($GLOBALS['user']->id)) {
- showWikiPage($keyword, $version, $special, $show_wiki_comments, Request::get('hilight'));
- } else {
- throw new AccessDeniedException(sprintf(
- _('Sie haben keine Berechtigung, die Seite %s zu lesen!'),
- $keyword
- ));
- }
-
-} // end default action
-
-$layout = $GLOBALS['template_factory']->open('layouts/base');
-$layout->content_for_layout = ob_get_clean();
-
-if (in_array($cmd, words('show abortedit really_delete really_delete_all'))) {
- // redirect to normal view to avoid duplicate edits on reload or back/forward
- header('Location: ' . URLHelper::getURL('', compact('keyword')));
-} else {
- echo $layout->render();
-}
-
-// Save data back to database.
-page_close();
diff --git a/resources/assets/javascripts/bootstrap/forms.js b/resources/assets/javascripts/bootstrap/forms.js
index 2cbac9ea08dc59ceecad899b923499c8697b9eab..bbc3d8a01ed8c08797e7973812d6252496937dc6 100644
--- a/resources/assets/javascripts/bootstrap/forms.js
+++ b/resources/assets/javascripts/bootstrap/forms.js
@@ -254,6 +254,8 @@ STUDIP.ready(function () {
params.STUDIPFORM_DISPLAYVALIDATION = false;
params.STUDIPFORM_VALIDATIONNOTES = [];
params.STUDIPFORM_AUTOSAVEURL = f.dataset.autosave;
+ params.STUDIPFORM_VALIDATION_URL = f.dataset.validation_url;
+ params.STUDIPFORM_VALIDATED = false;
params.STUDIPFORM_REDIRECTURL = f.dataset.url;
params.STUDIPFORM_INPUTS_ORDER = [];
for (let i in JSON.parse(f.dataset.inputs)) {
@@ -263,6 +265,9 @@ STUDIP.ready(function () {
},
methods: {
submit: function (e) {
+ if (this.STUDIPFORM_VALIDATED) {
+ return;
+ }
let v = this;
v.STUDIPFORM_VALIDATIONNOTES = [];
this.STUDIPFORM_DISPLAYVALIDATION = true;
@@ -290,6 +295,9 @@ STUDIP.ready(function () {
}
}
});
+ } else {
+ v.STUDIPFORM_VALIDATED = true;
+ v.$el.submit();
}
});
e.preventDefault();
@@ -359,7 +367,7 @@ STUDIP.ready(function () {
params.STUDIPFORM_SERVERVALIDATION = 1;
$.ajax({
- url: v.STUDIPFORM_AUTOSAVEURL,
+ url: v.STUDIPFORM_VALIDATION_URL,
data: params,
type: 'post',
dataType: 'json',
diff --git a/resources/assets/javascripts/bootstrap/wiki.js b/resources/assets/javascripts/bootstrap/wiki.js
index 25a277b2602f618eb72721dfcd38a2a9eeb5dbbd..e2ce20c6427a39faf7479f7624f07290565e8bb7 100644
--- a/resources/assets/javascripts/bootstrap/wiki.js
+++ b/resources/assets/javascripts/bootstrap/wiki.js
@@ -9,122 +9,47 @@
* @since Stud.IP 3.3
*/
-$(document).on('click', '#wiki button[name="submit-and-edit"]', function(event) {
- var form = $(this).closest('form'),
- data = {},
- form_data,
- i,
- wysiwyg_editor = false;
- const textarea = $('textarea[name="body"]', form).get(0);
- if (textarea) {
- wysiwyg_editor = STUDIP.wysiwyg.getEditor(textarea);
- wysiwyg_editor.sourceElement.value = STUDIP.wysiwyg.markAsHtml(wysiwyg_editor.getData());
- }
-
- form_data = form.serializeArray();
-
- // Show ajax overlay to indicate activity (and prevent buttons to be
- // clicked again)
- STUDIP.Overlay.show(true, form.css('position', 'relative'));
- // Include this button into form's data
- form_data.push({
- name: $(this).attr('name'),
- value: true
+STUDIP.domReady(() => {
+ STUDIP.JSUpdater.register('wiki_page_content', STUDIP.Wiki.updatePageContent, function () {
+ //update the wiki page for readers:
+ return Array.from(document.getElementsByClassName('wiki_page_content')).map(node => {
+ return node.data.set.page_id;
+ });
});
- // Transform data into an easier accessible format
- for (i = 0; i < form_data.length; i += 1) {
- data[form_data[i].name] = form_data[i].value;
+ if (document.querySelector('.wiki-editor-container') !== null) {
+ STUDIP.Wiki.initEditor();
}
- // Check version
- $.getJSON(
- STUDIP.URLHelper.getURL('dispatch.php/wiki/version_check/' + data.version, {
- keyword: data.wiki
- })
- )
- .then(function(response, status, jqxhr) {
- var error = jqxhr.getResponseHeader('X-Studip-Error'),
- to_confirm = jqxhr.getResponseHeader('X-Studip-Confirm'),
- confirmed = false;
- // Unrecoverable error
- if (response === false) {
- window.alert(error);
- return;
+ STUDIP.JSUpdater.register('wiki_editor_status', STUDIP.Wiki.updateEditorStatus, function () {
+ let info = {
+ page_ids: [],
+ focussed: null
+ };
+ for (let page_id in STUDIP.Wiki.Editors) {
+ info.page_ids.push(page_id);
+ let editor = STUDIP.Wiki.Editors[page_id].editor;
+ if (STUDIP.Wiki.Editors[page_id].isChanged && STUDIP.Wiki.Editors[page_id].autosave) {
+ //if either the textarea or the wysiwyg has focus:
+ info.page_content = editor.getData();
+ STUDIP.Wiki.Editors[page_id].isChanged = false;
+ STUDIP.Wiki.Editors[page_id].lastSaveDate = new Date();
}
- // Saving needs confirmation (newer version available?)
- if (response === null) {
- confirmed = window.confirm(error + '\n\n' + to_confirm);
- } else {
- confirmed = true;
+ if (editor.editing.view.document.isFocused) {
+ STUDIP.Wiki.Editors[page_id].lastFocussedDate = new Date();
}
- // Ready to save
- if (confirmed) {
- $.ajax({
- type: (form.attr('method') || 'GET').toUpperCase(),
- url: STUDIP.URLHelper.getURL('dispatch.php/wiki/store/' + data.version),
- data: {
- keyword: data.wiki,
- body: data.body
- },
- dataType: 'json'
- }).then(function(response) {
- var textarea = $('textarea[name=body]', form);
-
- // Update header info containing version and author
- $(form)
- .closest('table')
- .prev('table')
- .find('td:last-child')
- .html(response.zusatz);
-
- // Update version field
- $('input[type=hidden][name=version]', form).val(response.version);
-
- if (wysiwyg_editor) {
- wysiwyg_editor.setData(response.body);
- } else {
- // Store current selection/caret position
- textarea.storeSelection();
-
- // Update textarea, restore selection/caret position
- textarea.val(response.body);
- textarea.prop('defaultValue', textarea.val());
- textarea.restoreSelection();
- textarea.change();
- textarea.focus();
- }
-
- // Remove messages (and display new messages, if any)
- $('#content .messagebox').remove();
- if (response.messages !== false) {
- $(response.messages).prependTo('#content');
- }
- });
+ if (new Date() - STUDIP.Wiki.Editors[page_id].lastFocussedDate < 1000 * 60) { //time after inactivity
+ info.focussed = page_id;
+ } else {
+ if (STUDIP.Wiki.Editors[page_id].users.length !== 1) {
+ //then I will likely lose my edit mode so others can obtain it
+ STUDIP.Wiki.Editors[page_id].editing = false;
+ }
}
- })
- .always(function() {
- // Always hide overlay when ajax request is complete
- STUDIP.Overlay.hide();
- });
-
- event.preventDefault();
-});
-
-$(document).on('change', '#wiki-config .global-permissions :checkbox', function () {
- if ($(this).is(':checked')) {
- return;
- }
-
- $('#wiki-config .read-permissions [data-activates],[data-deactivates]').filter(':checked').change();
-}).on('change', '#wiki-config .read-permissions :radio', function () {
- $('#wiki-config .edit-permissions:has(:radio[disabled]:checked) :radio:not([disabled]):first').prop('checked', true);
+ }
+ return info;
+ });
});
-$(document).on('click', '.wiki-index-more', function (ev) {
- ev.preventDefault();
- $(this).parent().toggle();
- $(this).parent().nextAll('li').toggle();
-});
diff --git a/resources/assets/javascripts/cke/wiki-link/insertcommand.js b/resources/assets/javascripts/cke/wiki-link/insertcommand.js
index 2b57cac0e2223c722cfb9d72428e0f5e616be35d..a1ca9e2b30d6ebb6c10445a6995b9c97ab47dde5 100644
--- a/resources/assets/javascripts/cke/wiki-link/insertcommand.js
+++ b/resources/assets/javascripts/cke/wiki-link/insertcommand.js
@@ -11,7 +11,7 @@ export default class InsertCommand extends Command {
execute({ keyword, label }) {
this.editor.model.change((writer) => {
this.editor.model.insertContent(
- writer.createText(label !== '' ? `[[${keyword}|${label}]]` : `[[${keyword}]]`)
+ writer.createText(label !== '' ? `[[ ${keyword} | ${label} ]]` : `[[ ${keyword} ]]`)
);
});
}
diff --git a/resources/assets/javascripts/init.js b/resources/assets/javascripts/init.js
index 3ec1960da5d197c3051feb6e2395653de03960f2..e824775ae920dd601b946045f7f2c91ef2fed413 100644
--- a/resources/assets/javascripts/init.js
+++ b/resources/assets/javascripts/init.js
@@ -81,6 +81,7 @@ import * as Gettext from './lib/gettext.js';
import UserFilter from './lib/user_filter.js';
import wysiwyg from './lib/wysiwyg.js';
import ScrollToTop from './lib/scroll_to_top.js';
+import Wiki from './lib/wiki.js';
const configURLHelper = _.get(window, 'STUDIP.URLHelper', {});
const URLHelper = createURLHelper(configURLHelper);
@@ -172,5 +173,6 @@ window.STUDIP = _.assign(window.STUDIP || {}, {
domReady,
dialogReady,
ScrollToTop,
- Vue
+ Vue,
+ Wiki
});
diff --git a/resources/assets/javascripts/lib/wiki.js b/resources/assets/javascripts/lib/wiki.js
new file mode 100644
index 0000000000000000000000000000000000000000..962011865927c32ba876b0a38503e9abf2c1e93f
--- /dev/null
+++ b/resources/assets/javascripts/lib/wiki.js
@@ -0,0 +1,112 @@
+const Wiki = {
+ updatePageContent(pageContents) {
+ if (!pageContents) {
+ return;
+ }
+ for (let page_id in pageContents.contents) {
+ $('.wiki_page_content_' + page_id).html(pageContents.contents[page_id]);
+ }
+ },
+ updateEditorStatus(editorStatus) {
+ if (!editorStatus) {
+ return;
+ }
+ for (let page_id in STUDIP.Wiki.Editors) {
+ STUDIP.Wiki.Editors[page_id].users = editorStatus.users[page_id];
+ if (!STUDIP.Wiki.Editors[page_id].editing) {
+ STUDIP.Wiki.Editors[page_id].content = editorStatus.contents[page_id];
+ STUDIP.Wiki.Editors[page_id].editor.setData(editorStatus.wysiwyg_contents[page_id]);
+ }
+ if (
+ !STUDIP.Wiki.Editors[page_id].editing
+ && editorStatus.pages[page_id].editing > 0
+ ) {
+ STUDIP.Wiki.Editors[page_id].editing = true;
+ STUDIP.Wiki.Editors[page_id].focusEditor();
+ } else {
+ STUDIP.Wiki.Editors[page_id].editing = editorStatus.pages[page_id].editing > 0;
+ }
+ STUDIP.Wiki.Editors[page_id].lastSaveDate = new Date(editorStatus.pages[page_id].chdate * 1000);
+ }
+
+ },
+ Editors: {},
+ initEditor() {
+
+ let wiki_edit_container = document.querySelectorAll( '.wiki-editor-container');
+ for (let edit_container of wiki_edit_container) {
+ let page_id = edit_container.dataset.page_id;
+
+ Promise.all([
+ STUDIP.Vue.load(),
+ import('../../../vue/components/WikiEditorOnlineUsers.vue').then((config) => config.default),
+ ]).then(([{ createApp }, WikiEditorOnlineUsers]) => {
+ return createApp({
+ el: edit_container,
+ data() {
+ return {
+ page_id: page_id,
+ editing: edit_container.dataset.editing > 0,
+ content: edit_container.dataset.content,
+ users: JSON.parse(edit_container.dataset.users),
+ editor: null,
+ isChanged: false,
+ lastSaveDate: new Date(edit_container.dataset.chdate * 1000),
+ lastChangeDate: 0,
+ lastFocussedDate: 0,
+ autosave: true
+ };
+ },
+ methods: {
+ applyEditing() {
+ const url = STUDIP.URLHelper.getURL('dispatch.php/course/wiki/apply_editing/' + this.page_id)
+ $.post(url).done(output => {
+ if (output.me_online.editing > 0) {
+ this.editing = true;
+ this.focusEditor();
+ }
+ this.users = output.users;
+ });
+ },
+ delegateEditMode(user_id) {
+ const url = STUDIP.URLHelper.getURL('dispatch.php/course/wiki/delegate_edit_mode/' + this.page_id + '/' + user_id);
+ $.post(url).done(() => this.editing = false);
+ },
+ focusEditor() {
+ this.$nextTick(() => {
+ this.editor.editing.view.focus();
+ });
+ }
+ },
+ mounted() {
+ let textarea = this.$refs['wiki_editor'];
+ let promise = STUDIP.wysiwyg.replace(textarea);
+ promise.then((editor) => {
+ if (this.editing) {
+ editor.editing.view.focus();
+ }
+ editor.model.document.on('change:data',() => {
+ this.isChanged = true;
+ this.lastChangeDate = new Date();
+ });
+ this.editor = editor;
+ });
+ },
+ computed: {
+ requestingUsers() {
+ return this.users
+ .filter(u => u.editing_request)
+ .sort((a, b) => a.fullname.localeCompare(b.fullname));
+ }
+ },
+ components: { WikiEditorOnlineUsers }
+ });
+ }).then((app) => {
+ STUDIP.Wiki.Editors[page_id] = app;
+ });
+ }
+
+ }
+};
+
+export default Wiki;
diff --git a/resources/assets/stylesheets/scss/wiki.scss b/resources/assets/stylesheets/scss/wiki.scss
index 4290f1fefece286a35b63767ae58f3f9c425f458..12cf63b3bd579f41189df3897611ad1a1c199ed5 100644
--- a/resources/assets/stylesheets/scss/wiki.scss
+++ b/resources/assets/stylesheets/scss/wiki.scss
@@ -58,6 +58,7 @@ a.wiki-restricted {
}
.wiki-empty-background {
+ display: block;
@include empty-placeholder-image('wiki', false);
}
@@ -93,42 +94,83 @@ a.wiki-restricted {
}
}
-$authors: (
- 0: var(--dark-gray-color-20),
- 1: var(--red-20),
- 2: var(--green-20),
- 3: var(--brown-20),
- 4: var(--dark-violet-20),
- 5: var(--orange-20),
- 6: var(--dark-green-20),
- 7: var(--violet-20),
- 8: var(--yellow-20),
- 9: var(--petrol-20),
- 10: var(--dark-gray-color-40),
- 11: var(--red-40),
- 12: var(--green-40),
- 13: var(--brown-40),
- 14: var(--dark-violet-40),
- 15: var(--orange-40),
- 16: var(--dark-green-40),
- 17: var(--violet-40),
- 18: var(--yellow-40),
- 19: var(--petrol-40),
- 20: var(--dark-gray-color-60),
- 21: var(--red-60),
- 22: var(--green-60),
- 23: var(--brown-60),
- 24: var(--dark-violet-60),
- 25: var(--orange-60),
- 26: var(--dark-green-60),
- 27: var(--violet-60),
- 28: var(--yellow-60),
- 29: var(--petrol-60)
-);
-
-@each $index, $bgcolor in $authors {
- .wiki-author#{$index} {
- background-color: $bgcolor;
+.blame_diff {
+ > .wiki_line {
+ display: flex;
+ > .author {
+ text-align: center;
+ width: 100px;
+ max-width: 100px;
+ overflow: hidden;
+ background: var(--content-color-20);
+ border-bottom: 1px solid var(--content-color-40);
+ border-left: 1px solid var(--content-color-40);
+ padding-top: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
+ .author_name {
+ font-size: 0.8em;
+ }
+ }
+ > .difflink {
+ background: var(--content-color-20);
+ border-bottom: 1px solid var(--content-color-40);
+ padding-top: 21px;
+ padding-left: 5px;
+ padding-right: 10px;
+ }
+ > .content {
+ border-bottom: 1px solid var(--content-color-40);
+ border-right: 1px solid var(--content-color-40);
+ border-left: 1px solid var(--content-color-40);
+ padding-left: 5px;
+ width: 100%;
+ }
+
+ &:first-child {
+ > .author {
+ border-top: 1px solid var(--content-color-40);
+ }
+ > .difflink {
+ border-top: 1px solid var(--content-color-40);
+ }
+ > .content {
+ border-top: 1px solid var(--content-color-40);
+ }
+ }
+ }
+
+}
+
+.wiki_diffs {
+ > .wiki_diff {
+ display: flex;
+ align-items: stretch;
+ .wiki_added,
+ .wiki_erased {
+ width: 30px;
+ background-repeat: no-repeat;
+ background-position: center center;
+ min-height: 22px;
+ }
+ .wiki_added {
+ background-color: var(--content-color-20);
+ border: 1px solid var(--content-color-40);
+ @include background-icon('add', 'inactive', 20);
+
+ }
+ .wiki_erased {
+ background-color: var(--white);
+ border: 1px solid var(--light-gray-color-40);
+ @include background-icon('remove', 'inactive', 20);
+ }
+ .wiki_added + div,
+ .wiki_erased + div {
+ margin-left: 10px;
+ }
+ .wiki_erased + div {
+ opacity: 0.5;
+ }
}
}
@@ -139,3 +181,7 @@ article.studip.wiki {
margin: 0;
}
}
+
+.wiki_highlight {
+ background-color: var(--yellow);
+}
diff --git a/resources/vue/components/WikiEditorOnlineUsers.vue b/resources/vue/components/WikiEditorOnlineUsers.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b4a1b6099f55d42e17ace52047d33fad7c6d1036
--- /dev/null
+++ b/resources/vue/components/WikiEditorOnlineUsers.vue
@@ -0,0 +1,30 @@
+<template>
+ <MountingPortal mountTo="#sidebar" append name="wiki_online_editing_users">
+ <SidebarWidget :title="$gettext('Anwesende Personen')">
+ <template #content>
+ <ol class="clean">
+ <li v-for="user in users" :key="user.user_id">
+ <img class="avatar-small" :src="user.avatar">
+ {{ user.fullname }}
+
+ <span v-if="user.editing" :title="$gettext('Diese Person hat den Bearbeitungsmodus.')">
+ <studip-icon shape="comment" role="info" class="text-bottom"></studip-icon>
+ </span>
+ <span v-else-if="user.editing_request" :title="$gettext('Diese Person beantragt den Bearbeitungsmodus.')">
+ <studip-icon shape="hand" role="info" class="text-bottom"></studip-icon>
+ </span>
+ </li>
+ </ol>
+ </template>
+ </SidebarWidget>
+ </MountingPortal>
+</template>
+
+<script>
+export default {
+ name: 'WikiEditorOnlineUsers',
+ props: {
+ users: Array
+ },
+};
+</script>
diff --git a/templates/forms/form.php b/templates/forms/form.php
index 96cd2c055d9cb9ac20c2e0fb6589224e97c60291..4745225414db9e1858bb65d4cdb8a543d2b4543d 100644
--- a/templates/forms/form.php
+++ b/templates/forms/form.php
@@ -32,6 +32,7 @@ $form_id = md5(uniqid());
data-debugmode="<?= htmlReady(json_encode($form->getDebugMode())) ?>"
data-required="<?= htmlReady(json_encode($required_inputs)) ?>"
data-server_validation="<?= $server_validation ? 1 : 0?>"
+ data-validation_url="<?= htmlReady($_SERVER['REQUEST_URI']) ?>"
class="default studipform<?= $form->isCollapsable() ? ' collapsable' : '' ?>">
<?= CSRFProtection::tokenTag(['ref' => 'securityToken']) ?>
@@ -77,5 +78,11 @@ $form_id = md5(uniqid());
<? if (Request::isDialog()) : ?>
<footer data-dialog-button>
<?= \Studip\Button::create($form->getSaveButtonText(), $form->getSaveButtonName(), ['form' => $form_id]) ?>
+ <? foreach ($form->getButtons() as $button) : ?>
+ <?
+ $button->attributes['form'] = $form_id;
+ echo $button;
+ ?>
+ <? endforeach ?>
</footer>
<? endif ?>
diff --git a/templates/forms/select_input.php b/templates/forms/select_input.php
index 07a03ca906d771c4d546fb070f2e99bbbc4f09ac..1552ace533eb3c446e4e592e871716eecc066fc7 100644
--- a/templates/forms/select_input.php
+++ b/templates/forms/select_input.php
@@ -7,7 +7,7 @@
<span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span>
<? endif ?>
</label>
- <select class="select2" v-model="<?= htmlReady($this->name) ?>" <?= ($this->required ? 'required aria-required="true"' : '') ?> id="<?= $id ?>" <?= $attributes ?>>
+ <select class="select2" v-model="<?= htmlReady($this->name) ?>" name="<?= htmlReady($this->name) ?>" <?= ($this->required ? 'required aria-required="true"' : '') ?> id="<?= $id ?>" <?= $attributes ?>>
<? foreach ($options as $key => $option) : ?>
<option value="<?= htmlReady($key) ?>"<?= ($key == $value ? " selected" : "") ?>>
<?= htmlReady($option) ?>
diff --git a/tests/_support/_generated/JsonapiTesterActions.php b/tests/_support/_generated/JsonapiTesterActions.php
index c191a3e0c399d9e966474754c2d3f5c8bfc000ff..5f9e833d5c23a5b49cdd53388fe1304fae9fd8f9 100644
--- a/tests/_support/_generated/JsonapiTesterActions.php
+++ b/tests/_support/_generated/JsonapiTesterActions.php
@@ -12,7 +12,7 @@ trait JsonapiTesterActions
*/
abstract protected function getScenario();
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -47,7 +47,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -81,7 +81,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('expectThrowable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -95,7 +95,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -110,7 +110,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -124,7 +124,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -139,7 +139,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -154,7 +154,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -169,7 +169,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -184,7 +184,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertThatItsNot', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -199,7 +199,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -214,7 +214,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -229,7 +229,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassHasAttribute', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -244,7 +244,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassHasStaticAttribute', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -259,7 +259,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassNotHasAttribute', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -274,7 +274,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertClassNotHasStaticAttribute', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -289,7 +289,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -302,7 +302,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContainsEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -318,7 +318,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContainsOnly', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -333,7 +333,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContainsOnlyInstancesOf', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -348,7 +348,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCount', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -362,7 +362,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryDoesNotExist', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -376,7 +376,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryExists', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -390,7 +390,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsNotReadable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -404,7 +404,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsNotWritable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -418,7 +418,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsReadable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -432,7 +432,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDirectoryIsWritable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -447,7 +447,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertDoesNotMatchRegularExpression', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -461,7 +461,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -476,7 +476,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -491,7 +491,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEqualsCanonicalizing', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -506,7 +506,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEqualsIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -522,7 +522,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEqualsWithDelta', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -536,7 +536,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -550,7 +550,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileDoesNotExist', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -565,7 +565,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -580,7 +580,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileEqualsCanonicalizing', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -595,7 +595,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileEqualsIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -609,7 +609,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -623,7 +623,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsNotReadable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -637,7 +637,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsNotWritable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -651,7 +651,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsReadable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -665,7 +665,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileIsWritable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -680,7 +680,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -695,7 +695,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotEqualsCanonicalizing', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -710,7 +710,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotEqualsIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -724,7 +724,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFinite', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -739,7 +739,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -754,7 +754,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -768,7 +768,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInfinite', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -783,7 +783,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInstanceOf', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -797,7 +797,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsArray', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -811,7 +811,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsBool', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -825,7 +825,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsCallable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -839,7 +839,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsClosedResource', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -853,7 +853,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsFloat', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -867,7 +867,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsInt', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -881,7 +881,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsIterable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -895,7 +895,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotArray', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -909,7 +909,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotBool', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -923,7 +923,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotCallable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -937,7 +937,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotClosedResource', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -951,7 +951,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotFloat', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -965,7 +965,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotInt', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -979,7 +979,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotIterable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -993,7 +993,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotNumeric', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1007,7 +1007,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotObject', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1021,7 +1021,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotReadable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1035,7 +1035,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotResource', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1049,7 +1049,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotScalar', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1063,7 +1063,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1077,7 +1077,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNotWritable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1091,7 +1091,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsNumeric', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1105,7 +1105,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsObject', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1119,7 +1119,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsReadable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1133,7 +1133,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsResource', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1147,7 +1147,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsScalar', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1161,7 +1161,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1175,7 +1175,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsWritable', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1189,7 +1189,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJson', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1204,7 +1204,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonFileEqualsJsonFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1219,7 +1219,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonFileNotEqualsJsonFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1234,7 +1234,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringEqualsJsonFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1249,7 +1249,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringEqualsJsonString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1264,7 +1264,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringNotEqualsJsonFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1279,7 +1279,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertJsonStringNotEqualsJsonString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1294,7 +1294,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1309,7 +1309,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1324,7 +1324,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertMatchesRegularExpression', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1338,7 +1338,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNan', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1353,7 +1353,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1364,7 +1364,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContainsEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1380,7 +1380,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContainsOnly', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1395,7 +1395,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotCount', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1409,7 +1409,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1424,7 +1424,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1439,7 +1439,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEqualsCanonicalizing', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1454,7 +1454,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEqualsIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1470,7 +1470,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEqualsWithDelta', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1484,7 +1484,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotFalse', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1499,7 +1499,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1513,7 +1513,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1528,7 +1528,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1543,7 +1543,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSameSize', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1557,7 +1557,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotTrue', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1571,7 +1571,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1586,7 +1586,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertObjectHasAttribute', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1601,7 +1601,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertObjectNotHasAttribute', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1616,7 +1616,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1631,7 +1631,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSameSize', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1644,7 +1644,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringContainsString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1655,7 +1655,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringContainsStringIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1670,7 +1670,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEndsNotWith', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1685,7 +1685,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEndsWith', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1700,7 +1700,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEqualsFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1715,7 +1715,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEqualsFileCanonicalizing', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1730,7 +1730,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringEqualsFileIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1745,7 +1745,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringMatchesFormat', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1760,7 +1760,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringMatchesFormatFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1773,7 +1773,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotContainsString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1786,7 +1786,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotContainsStringIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1801,7 +1801,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotEqualsFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1815,7 +1815,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotEqualsFileCanonicalizing', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1830,7 +1830,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotEqualsFileIgnoringCase', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1845,7 +1845,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotMatchesFormat', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1860,7 +1860,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringNotMatchesFormatFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1875,7 +1875,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsNotWith', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1890,7 +1890,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsWith', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1905,7 +1905,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertThat', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1919,7 +1919,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1934,7 +1934,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlFileEqualsXmlFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1949,7 +1949,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlFileNotEqualsXmlFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1964,7 +1964,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringEqualsXmlFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1979,7 +1979,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringEqualsXmlString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -1994,7 +1994,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringNotEqualsXmlFile', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2009,7 +2009,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('assertXmlStringNotEqualsXmlString', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2022,7 +2022,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2035,7 +2035,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('markTestIncomplete', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2048,7 +2048,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('markTestSkipped', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2059,7 +2059,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForTestAutor', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2070,7 +2070,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForTestDozent', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2081,7 +2081,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForTestAdmin', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2092,7 +2092,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('getCredentialsForRoot', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2108,7 +2108,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('withPHPLib', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2125,7 +2125,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('createApp', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2138,7 +2138,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('createRequestBuilder', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
@@ -2151,7 +2151,7 @@ trait JsonapiTesterActions
return $this->getScenario()->runStep(new \Codeception\Step\Action('sendMockRequest', func_get_args()));
}
-
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
diff --git a/tests/jsonapi/WikiCreateTest.php b/tests/jsonapi/WikiCreateTest.php
index 114d450b4de134d99cfe4184f301272c65a3a423..842db1fabbb0b546511ad2125b4fc8c0205d13c8 100644
--- a/tests/jsonapi/WikiCreateTest.php
+++ b/tests/jsonapi/WikiCreateTest.php
@@ -12,6 +12,7 @@ class WikiCreateTest extends \Codeception\Test\Unit
protected function _before()
{
\DBManager::getInstance()->setConnection('studip', $this->getModule('\\Helper\\StudipDb')->dbh);
+ \WikiPage::deleteBySQL('1');
}
protected function _after()
@@ -24,22 +25,22 @@ class WikiCreateTest extends \Codeception\Test\Unit
$credentials = $this->tester->getCredentialsForTestAutor();
$rangeId = 'a07535cf2f8a72df33c12ddfa4b53dde';
- $keyword = 'IphiklosIphitos';
+ $name = 'IphiklosIphitos';
$content = 'This is just fake wiki.';
$json = [
'data' => [
'type' => 'wiki',
- 'attributes' => compact('keyword', 'content'),
+ 'attributes' => compact('name', 'content'),
],
];
- $this->tester->assertCount(0, \WikiPage::findLatestPages($rangeId));
+ $this->tester->assertCount(0, \WikiPage::findBySQL('`range_id` = ?', [$rangeId]));
$response = $this->createWikiPage($credentials, $rangeId, $json);
$this->tester->assertSame(201, $response->getStatusCode());
- $this->tester->assertCount(1, \WikiPage::findLatestPages($rangeId));
+ $this->tester->assertCount(1, \WikiPage::findBySQL('`range_id` = ?', [$rangeId]));
$page = $response->document()->primaryResource();
diff --git a/tests/jsonapi/WikiIndexTest.php b/tests/jsonapi/WikiIndexTest.php
index 8fd8e96bf755125e2c40711e05386a94c68d57d6..a0b29e254c25d3d26996f47c6d05252d0d11ac52 100644
--- a/tests/jsonapi/WikiIndexTest.php
+++ b/tests/jsonapi/WikiIndexTest.php
@@ -27,7 +27,7 @@ class WikiIndexTest extends \Codeception\Test\Unit
$this->createWikiPage($credentials['id'], $rangeId, 'yxilo', $body);
$this->createWikiPage($credentials['id'], $rangeId, 'ulyq', $body);
- $countPages = \WikiPage::findLatestPages($rangeId);
+ $countPages = \WikiPage::findBySQL('`range_id` = ?', [$rangeId]);
$this->tester->assertCount(2, $countPages);
$response = $this->getWikiIndex($credentials, $rangeId);
@@ -63,22 +63,21 @@ class WikiIndexTest extends \Codeception\Test\Unit
}
- private function createWikiPage($userId, $courseId, $keyword, $body)
+ private function createWikiPage($userId, $courseId, $keyword, $content)
{
// EVIL HACK
$oldPerm = $GLOBALS['perm'] ?? null;
$oldUser = $GLOBALS['user'] ?? null;
$GLOBALS['perm'] = new \Seminar_Perm();
- $GLOBALS['user'] = \User::find($userId);
+ $GLOBALS['user'] = new \Seminar_User(\User::find($userId));
- $latest = \WikiPage::findLatestPage($courseId, $keyword);
+ $latest = \WikiPage::findOneBySQL('`range_id` = ? AND `name` = ?', [$courseId, $keyword]);
$result = \WikiPage::create(
[
'user_id' => $userId,
'range_id' => $courseId,
- 'keyword' => $keyword,
- 'version' => $latest ? $latest->version + 1 : 1,
- 'body' => $body
+ 'name' => $keyword,
+ 'content' => $content
]
);
diff --git a/tests/jsonapi/WikiShowTest.php b/tests/jsonapi/WikiShowTest.php
index 51135fc241316e50e67b480afc17c34d40a67357..c77aea98264aa1c4d6c988857fc810c4ca18249a 100644
--- a/tests/jsonapi/WikiShowTest.php
+++ b/tests/jsonapi/WikiShowTest.php
@@ -12,6 +12,7 @@ class WikiShowTest extends \Codeception\Test\Unit
protected function _before()
{
\DBManager::getInstance()->setConnection('studip', $this->getModule('\\Helper\\StudipDb')->dbh);
+ \WikiPage::deleteBySQL('1');
}
protected function _after()
@@ -28,7 +29,7 @@ class WikiShowTest extends \Codeception\Test\Unit
$content = 'Es gibt im Moment in diese Mannschaft, oh, einige Spieler vergessenihren Profi was sie sind. Ich lese nicht sehr viele Zeitungen, aberich habe gehört viele Situationen. Erstens: Wir haben nicht offensivgespielt. Es gibt keine deutsche Mannschaft spielt offensiv und dieNamen offensiv wie Bayern. Letzte Spiel hatten wir in Platz dreiSpitzen: Elber, Jancker und dann Zickler. Wir mussen nicht vergessenZickler. Zickler ist eine Spitzen mehr, Mehmet mehr Basler. Ist klardiese Wörter, ist möglich verstehen, was ich hab’ gesagt? Danke.';
$this->createWikiPage($rangeId, $keyword, $content);
- $this->tester->assertCount(1, \WikiPage::findLatestPages($rangeId));
+ $this->tester->assertCount(1, \WikiPage::findBySQL('`range_id` = ?', [$rangeId]));
$response = $this->getWikiPage($credentials, $rangeId, $keyword);
$this->tester->assertTrue($response->isSuccessfulDocument([200]));
@@ -52,13 +53,25 @@ class WikiShowTest extends \Codeception\Test\Unit
);
}
- private function createWikiPage($rangeId, $keyword, $body)
+ private function createWikiPage($rangeId, $keyword, $content)
{
- $wikiPage = new \WikiPage([$rangeId, $keyword, 0]);
- $wikiPage->body = $body;
+ $credentials = $this->tester->getCredentialsForTestDozent();
+ // EVIL HACK
+ $oldPerm = $GLOBALS['perm'] ?? null;
+ $oldUser = $GLOBALS['user'] ?? null;
+ $GLOBALS['perm'] = new \Seminar_Perm();
+ $GLOBALS['user'] = new \Seminar_User(\User::find($credentials['id']));
+
+ $wikiPage = new \WikiPage();
+ $wikiPage->name = $keyword;
+ $wikiPage->range_id = $rangeId;
+ $wikiPage->content = $content;
$wikiPage->user_id = 'nobody';
$wikiPage->store();
+ $GLOBALS['perm'] = $oldPerm;
+ $GLOBALS['user'] = $oldUser;
+
return $wikiPage;
}
}
diff --git a/tests/jsonapi/WikiUpdateTest.php b/tests/jsonapi/WikiUpdateTest.php
index 380952bb5e6210677e2aebfd759f98545d77b691..c46f42cf66db7a44aa201564c23271a811f64eb3 100644
--- a/tests/jsonapi/WikiUpdateTest.php
+++ b/tests/jsonapi/WikiUpdateTest.php
@@ -12,6 +12,7 @@ class WikiUpdateTest extends \Codeception\Test\Unit
protected function _before()
{
\DBManager::getInstance()->setConnection('studip', $this->getModule('\\Helper\\StudipDb')->dbh);
+ \WikiPage::deleteBySQL('1');
}
protected function _after()
@@ -26,11 +27,11 @@ class WikiUpdateTest extends \Codeception\Test\Unit
$keyword = 'KaineusKalais';
$content = 'This is just fake wiki.';
- $this->createWikiPage($rangeId, $keyword, $content);
+ $createdpage = $this->createWikiPage($rangeId, $keyword, $content);
$newContent = 'Es gibt im Moment in diese Mannschaft, oh, einige Spieler vergessenihren Profi was sie sind. Ich lese nicht sehr viele Zeitungen, aberich habe gehört viele Situationen. Erstens: Wir haben nicht offensivgespielt. Es gibt keine deutsche Mannschaft spielt offensiv und dieNamen offensiv wie Bayern. Letzte Spiel hatten wir in Platz dreiSpitzen: Elber, Jancker und dann Zickler. Wir mussen nicht vergessenZickler. Zickler ist eine Spitzen mehr, Mehmet mehr Basler. Ist klardiese Wörter, ist möglich verstehen, was ich hab’ gesagt? Danke.';
- $response = $this->updateWiki($credentials, $rangeId, $keyword, $newContent);
+ $response = $this->updateWiki($credentials, $rangeId, $createdpage->id, $newContent);
$this->tester->assertSame(200, $response->getStatusCode());
$page = $response->document()->primaryResource();
@@ -38,12 +39,12 @@ class WikiUpdateTest extends \Codeception\Test\Unit
}
//helpers:
- private function updateWiki($credentials, $rangeId, $keyword, $content)
+ private function updateWiki($credentials, $rangeId, $page_id, $content)
{
$json = [
'data' => [
'type' => 'wiki',
- 'id' => $rangeId.'_'.$keyword,
+ 'id' => $page_id,
'attributes' => compact('content')
],
];
@@ -53,7 +54,7 @@ class WikiUpdateTest extends \Codeception\Test\Unit
return $this->tester->sendMockRequest(
$app,
$this->tester->createRequestBuilder($credentials)
- ->setUri('/wiki-pages/'.$rangeId.'_'.$keyword)
+ ->setUri('/wiki-pages/'.$page_id)
->setJsonApiBody($json)
->update()
->getRequest()
@@ -62,11 +63,23 @@ class WikiUpdateTest extends \Codeception\Test\Unit
private function createWikiPage($rangeId, $keyword, $body)
{
- $wikiPage = new \WikiPage([$rangeId, $keyword, 0]);
- $wikiPage->body = $body;
+ $credentials = $this->tester->getCredentialsForTestDozent();
+ // EVIL HACK
+ $oldPerm = $GLOBALS['perm'] ?? null;
+ $oldUser = $GLOBALS['user'] ?? null;
+ $GLOBALS['perm'] = new \Seminar_Perm();
+ $GLOBALS['user'] = new \Seminar_User(\User::find($credentials['id']));
+
+ $wikiPage = new \WikiPage();
+ $wikiPage->range_id = $rangeId;
+ $wikiPage->name = $keyword;
+ $wikiPage->content = $body;
$wikiPage->user_id = 'nobody';
$wikiPage->store();
+ $GLOBALS['perm'] = $oldPerm;
+ $GLOBALS['user'] = $oldUser;
+
return $wikiPage;
}
}