@@ -306,7 +306,7 @@ |
||
| 306 | 306 | * See http://trac.midgard-project.org/ticket/1442 |
| 307 | 307 | $topic->set_parameter($this->_request_data['name'], var_export($value, true)); |
| 308 | 308 | */ |
| 309 | - continue; |
|
| 309 | + continue; |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | if ($value === false) { |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | if ($data['first_post']) { |
| 5 | 5 | $summary .= ' ' . sprintf($data['l10n']->get('first post was made on %s.'), |
| 6 | - $data['l10n']->get_formatter()->date($data['first_post'])); |
|
| 6 | + $data['l10n']->get_formatter()->date($data['first_post'])); |
|
| 7 | 7 | } |
| 8 | 8 | ?> |
| 9 | 9 | |
@@ -52,14 +52,14 @@ |
||
| 52 | 52 | data: entries, |
| 53 | 53 | colNames: ["id", |
| 54 | 54 | <?php |
| 55 | - //index is needed for sorting |
|
| 56 | - echo "'index_name',"; |
|
| 57 | - echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 58 | - echo "'" . $data['l10n']->get('entry text') . "',"; |
|
| 59 | - echo "'" . $data['l10n']->get('entry created') . "',"; |
|
| 60 | - echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
|
| 61 | - echo "'" . $data['l10n']->get('status') . "'"; |
|
| 62 | - ?> |
|
| 55 | + //index is needed for sorting |
|
| 56 | + echo "'index_name',"; |
|
| 57 | + echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 58 | + echo "'" . $data['l10n']->get('entry text') . "',"; |
|
| 59 | + echo "'" . $data['l10n']->get('entry created') . "',"; |
|
| 60 | + echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
|
| 61 | + echo "'" . $data['l10n']->get('status') . "'"; |
|
| 62 | + ?> |
|
| 63 | 63 | ], |
| 64 | 64 | colModel: [ |
| 65 | 65 | {name:'id',index:'id', hidden: true, key: true }, |
@@ -120,13 +120,13 @@ |
||
| 120 | 120 | $grid->set_option('loadonce', true) |
| 121 | 121 | ->set_option('grouping', true) |
| 122 | 122 | ->set_option('groupingView', [ |
| 123 | - 'groupField' => ['status'], |
|
| 124 | - 'groupColumnShow' => [false], |
|
| 125 | - 'groupText' => ['<strong>{0}</strong> ({1})'], |
|
| 126 | - 'groupOrder' => ['asc'], |
|
| 127 | - 'groupSummary' => [true], |
|
| 128 | - 'showSummaryOnHide' => true |
|
| 129 | - ]) |
|
| 123 | + 'groupField' => ['status'], |
|
| 124 | + 'groupColumnShow' => [false], |
|
| 125 | + 'groupText' => ['<strong>{0}</strong> ({1})'], |
|
| 126 | + 'groupOrder' => ['asc'], |
|
| 127 | + 'groupSummary' => [true], |
|
| 128 | + 'showSummaryOnHide' => true |
|
| 129 | + ]) |
|
| 130 | 130 | ->set_option('sortname', $sortname) |
| 131 | 131 | ->set_option('sortorder', $sortorder); |
| 132 | 132 | |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php echo $data['renderer']->block($data['form'], 'form_start'); ?> |
| 2 | 2 | <div class="maa_permissions_assignees"> |
| 3 | 3 | <?php |
| 4 | - if (empty($data['form']->children['add_assignee']->vars['value'])) { |
|
| 5 | - echo $data['renderer']->label($data['form']->children['add_assignee']); |
|
| 4 | + if (empty($data['form']->children['add_assignee']->vars['value'])) { |
|
| 5 | + echo $data['renderer']->label($data['form']->children['add_assignee']); |
|
| 6 | 6 | echo $data['renderer']->widget($data['form']->children['add_assignee']); |
| 7 | - } |
|
| 8 | - ?> |
|
| 7 | + } |
|
| 8 | + ?> |
|
| 9 | 9 | </div> |
| 10 | 10 | <table class="maa_permissions_items"> |
| 11 | 11 | <thead> |
@@ -8,6 +8,6 @@ |
||
| 8 | 8 | echo '<li' . ($link['selected'] ? ' class="selected"' : '') . '>'; |
| 9 | 9 | echo '<a href="' . $link['url'] . '/">' . $link['label'] . '</a></li>'; |
| 10 | 10 | } |
| 11 | - ?> |
|
| 11 | + ?> |
|
| 12 | 12 | </ul> |
| 13 | 13 | </div> |
| 14 | 14 | \ No newline at end of file |
@@ -163,17 +163,17 @@ |
||
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | /** |
| 166 | - * Inserts a link detector to the given HTML source. All outgoing |
|
| 167 | - * HTTP links in the source HTML are replaced with the given |
|
| 168 | - * link detector address so that the token "URL" is replaced with |
|
| 169 | - * encoded form of the original link. It is expected that the link detector |
|
| 170 | - * address points to a script that records the passed link and |
|
| 171 | - * forwards the client to the real link target. |
|
| 172 | - * |
|
| 173 | - * @param string $html the HTML source |
|
| 174 | - * @param string $address the link detector address |
|
| 175 | - * @return string HTML source with the link detector |
|
| 176 | - */ |
|
| 166 | + * Inserts a link detector to the given HTML source. All outgoing |
|
| 167 | + * HTTP links in the source HTML are replaced with the given |
|
| 168 | + * link detector address so that the token "URL" is replaced with |
|
| 169 | + * encoded form of the original link. It is expected that the link detector |
|
| 170 | + * address points to a script that records the passed link and |
|
| 171 | + * forwards the client to the real link target. |
|
| 172 | + * |
|
| 173 | + * @param string $html the HTML source |
|
| 174 | + * @param string $address the link detector address |
|
| 175 | + * @return string HTML source with the link detector |
|
| 176 | + */ |
|
| 177 | 177 | private function _insert_link_detector($html, $address) |
| 178 | 178 | { |
| 179 | 179 | $address = addslashes($address); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | if ( !$this->can_do('midgard:update') |
| 219 | 219 | || !$this->can_do('midgard:parameters')) { |
| 220 | 220 | debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
| 221 | - MIDCOM_LOG_ERROR); |
|
| 221 | + MIDCOM_LOG_ERROR); |
|
| 222 | 222 | midcom_connection::set_error(MGD_ERR_ACCESS_DENIED); |
| 223 | 223 | return false; |
| 224 | 224 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | if ( !$this->can_do('midgard:update') |
| 272 | 272 | || !$this->can_do('midgard:parameters')) { |
| 273 | 273 | debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
| 274 | - MIDCOM_LOG_ERROR); |
|
| 274 | + MIDCOM_LOG_ERROR); |
|
| 275 | 275 | midcom_connection::set_error(MGD_ERR_ACCESS_DENIED); |
| 276 | 276 | return false; |
| 277 | 277 | } |
@@ -105,12 +105,12 @@ |
||
| 105 | 105 | return $status; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - /** |
|
| 109 | - * Get the object of a revision |
|
| 110 | - * |
|
| 111 | - * @param string $revision identifier of revision wanted |
|
| 112 | - * @return array array representation of the object |
|
| 113 | - */ |
|
| 108 | + /** |
|
| 109 | + * Get the object of a revision |
|
| 110 | + * |
|
| 111 | + * @param string $revision identifier of revision wanted |
|
| 112 | + * @return array array representation of the object |
|
| 113 | + */ |
|
| 114 | 114 | public function get_revision($revision) |
| 115 | 115 | { |
| 116 | 116 | if (empty($this->_guid)) { |