Skip to content

Commit

Permalink
Restore Hogfather compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@annda
annda committed Jul 26, 2022
1 parent 13bc1f8 commit 6a7b7f6
Show file tree
Hide file tree
Showing 3 changed files with 141 additions and 4 deletions.
3 changes: 2 additions & 1 deletion action.php
View file
Expand Up @@ -29,7 +29,8 @@ function __construct(){
function register(Doku_Event_Handler $controller) {
$controller->register_hook('IO_WIKIPAGE_WRITE', 'BEFORE', $this, '_handle');
$controller->register_hook('HTML_SECEDIT_BUTTON', 'BEFORE', $this, '_editbutton');
$controller->register_hook('EDIT_FORM_ADDTEXTAREA', 'BEFORE', $this, '_editform');
$controller->register_hook('HTML_EDIT_FORMSELECTION', 'BEFORE', $this, '_editform'); // deprecated
$controller->register_hook('EDIT_FORM_ADDTEXTAREA', 'BEFORE', $this, '_editform'); // replacement
$controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, '_handle_edit_post');
$controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, '_handle_ajax');
}
Expand Down
2 changes: 1 addition & 1 deletion renderer_data_edit.php
View file
Expand Up @@ -10,7 +10,7 @@

class Doku_Renderer_plugin_data_edit extends Doku_Renderer {
/**
* @var \dokuwiki\Form\Form
* @var Doku_Form|\dokuwiki\Form\Form
*/
public $form;

Expand Down
140 changes: 138 additions & 2 deletions syntax/entry.php
View file
Expand Up @@ -138,7 +138,11 @@ function render($format, Doku_Renderer $renderer, $data) {
return true;
case 'plugin_data_edit':
/** @var $renderer Doku_Renderer_plugin_data_edit */
$this->_editData($data, $renderer);
if (is_a($renderer->form, 'Doku_Form')) {
$this->_editDataLegacy($data, $renderer);
} else {
$this->_editData($data, $renderer);
}
return true;
default:
return false;
Expand Down Expand Up @@ -289,6 +293,138 @@ function replaceQuery() {
return call_user_func_array(array(&$sqlite, 'query'), $args);
}


/**
* The custom editor for editing data entries
*
* Gets called from action_plugin_data::_editform() where also the form member is attached
*
* @deprecated _editData() is used since Igor
* @param array $data
* @param Doku_Renderer_plugin_data_edit $renderer
*/
protected function _editDataLegacy($data, &$renderer) {
$renderer->form->startFieldset($this->getLang('dataentry'));
$renderer->form->_content[count($renderer->form->_content) - 1]['class'] = 'plugin__data';
$renderer->form->addHidden('range', '0-0'); // Adora Belle bugfix

if($this->getConf('edit_content_only')) {
$renderer->form->addHidden('data_edit[classes]', $data['classes']);

$columns = array('title', 'value', 'comment');
$class = 'edit_content_only';

} else {
$renderer->form->addElement(form_makeField('text', 'data_edit[classes]', $data['classes'], $this->getLang('class'), 'data__classes'));

$columns = array('title', 'type', 'multi', 'value', 'comment');
$class = 'edit_all_content';

// New line
$data['data'][''] = '';
$data['cols'][''] = array('type' => '', 'multi' => false);
}

$renderer->form->addElement("<table class=\"$class\">");

//header
$header = '<tr>';
foreach($columns as $column) {
$header .= '<th class="' . $column . '">' . $this->getLang($column) . '</th>';
}
$header .= '</tr>';
$renderer->form->addElement($header);

//rows
$n = 0;
foreach($data['cols'] as $key => $vals) {
$fieldid = 'data_edit[data][' . $n++ . ']';
$content = $vals['multi'] ? implode(', ', $data['data'][$key]) : $data['data'][$key];
if(is_array($vals['type'])) {
$vals['basetype'] = $vals['type']['type'];
if(isset($vals['type']['enum'])) {
$vals['enum'] = $vals['type']['enum'];
}
$vals['type'] = $vals['origtype'];
} else {
$vals['basetype'] = $vals['type'];
}

if($vals['type'] === 'hidden') {
$renderer->form->addElement('<tr class="hidden">');
} else {
$renderer->form->addElement('<tr>');
}
if($this->getConf('edit_content_only')) {
if(isset($vals['enum'])) {
$values = preg_split('/\s*,\s*/', $vals['enum']);
if(!$vals['multi']) {
array_unshift($values, '');
}
$content = form_makeListboxField(
$fieldid . '[value][]',
$values,
$data['data'][$key],
$vals['title'],
'', '',
($vals['multi'] ? array('multiple' => 'multiple') : array())
);
} else {
$classes = 'data_type_' . $vals['type'] . ($vals['multi'] ? 's' : '') . ' '
. 'data_type_' . $vals['basetype'] . ($vals['multi'] ? 's' : '');

$attr = array();
if($vals['basetype'] == 'date' && !$vals['multi']) {
$attr['class'] = 'datepicker';
}

$content = form_makeField('text', $fieldid . '[value]', $content, $vals['title'], '', $classes, $attr);

}
$cells = array(
hsc($vals['title']) . ':',
$content,
'<span title="' . hsc($vals['comment']) . '">' . hsc($vals['comment']) . '</span>'
);
foreach(array('multi', 'comment', 'type') as $field) {
$renderer->form->addHidden($fieldid . "[$field]", $vals[$field]);
}
$renderer->form->addHidden($fieldid . "[title]", $vals['origkey']); //keep key as key, even if title is translated
} else {
$check_data = $vals['multi'] ? array('checked' => 'checked') : array();
$cells = array(
form_makeField('text', $fieldid . '[title]', $vals['origkey'], $this->getLang('title')), // when editable, always use the pure key, not a title
form_makeMenuField(
$fieldid . '[type]',
array_merge(
array(
'', 'page', 'nspage', 'title',
'img', 'mail', 'url', 'tag', 'wiki', 'dt', 'hidden'
),
array_keys($this->dthlp->_aliases())
),
$vals['type'],
$this->getLang('type')
),
form_makeCheckboxField($fieldid . '[multi]', array('1', ''), $this->getLang('multi'), '', '', $check_data),
form_makeField('text', $fieldid . '[value]', $content, $this->getLang('value')),
form_makeField('text', $fieldid . '[comment]', $vals['comment'], $this->getLang('comment'), '', 'data_comment', array('readonly' => 1, 'title' => $vals['comment']))
);
}

foreach($cells as $index => $cell) {
$renderer->form->addElement("<td class=\"{$columns[$index]}\">");
$renderer->form->addElement($cell);
$renderer->form->addElement('</td>');
}
$renderer->form->addElement('</tr>');
}

$renderer->form->addElement('</table>');
$renderer->form->endFieldset();

}

/**
* The custom editor for editing data entries
*
Expand All @@ -297,7 +433,7 @@ function replaceQuery() {
* @param array $data
* @param Doku_Renderer_plugin_data_edit $renderer
*/
function _editData($data, &$renderer) {
protected function _editData($data, &$renderer) {
$renderer->form->addFieldsetOpen($this->getLang('dataentry'))->attr('class', 'plugin__data');

if ($this->getConf('edit_content_only')) {
Expand Down

0 comments on commit 6a7b7f6

Please sign in to comment.