Index: contributions/modules/workflow_ng/cclinks/cclinks.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/cclinks/Attic/cclinks.module,v
retrieving revision 1.1.2.12.2.4
diff -r1.1.2.12.2.4 cclinks.module
136c136
< '#label' => t('Content Link "!label" Toggle', array('!label' => $settings['label'])),
---
> '#label' => t('Content Link "!label" Toggle', array('!label' => $settings['label'])),
248,249c248,249
< '#type' => 'textfield',
< '#title' => t('Date'),
---
> '#type' => 'textfield',
> '#title' => t('Date'),
Index: contributions/modules/workflow_ng/cclinks/cclinks_action.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/cclinks/Attic/cclinks_action.inc,v
retrieving revision 1.1.2.3.2.2
diff -r1.1.2.3.2.2 cclinks_action.inc
1a2
> // $Id$
37c38
< '#type' => 'textarea',
---
> '#type' => 'textarea',
Index: contributions/modules/workflow_ng/cclinks/cclinks_admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/cclinks/Attic/cclinks_admin.inc,v
retrieving revision 1.1.2.1.2.6
diff -r1.1.2.1.2.6 cclinks_admin.inc
1a2
> // $Id$
7d7
<
73c73
< $output .= ''. l(t('Add a link'), CCLINKS_PATH. '/add') . '
';
---
> $output .= ''. l(t('Add a link'), CCLINKS_PATH .'/add') .'
';
77c77
< $rows = array();
---
> $rows = array();
84,85c84,85
< $row[] = l(t('edit'), CCLINKS_PATH. '/edit/'. $event_name);
< $row[] = l(t('delete'), CCLINKS_PATH. '/delete/'. $event_name);
---
> $row[] = l(t('edit'), CCLINKS_PATH .'/edit/'. $event_name);
> $row[] = l(t('delete'), CCLINKS_PATH .'/delete/'. $event_name);
Index: contributions/modules/workflow_ng/states/states.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/states/Attic/states.module,v
retrieving revision 1.1.2.8.2.1
diff -r1.1.2.8.2.1 states.module
2d1
<
112c111
< foreach($machines[$node->type] as $name => $info) {
---
> foreach ($machines[$node->type] as $name => $info) {
127c126
< foreach($machines[$node->type] as $name => $info) {
---
> foreach ($machines[$node->type] as $name => $info) {
180,181c179,180
< if(($machines = states_user_has_machines($user)) && $edit['states']) {
< foreach($machines as $name => $info) {
---
> if (($machines = states_user_has_machines($user)) && $edit['states']) {
> foreach ($machines as $name => $info) {
272c271
< foreach($machines as $name => $info) {
---
> foreach ($machines as $name => $info) {
347c346
< if(($machines = variable_get('states_init_state_machines', -1)) == -1) {
---
> if (($machines = variable_get('states_init_state_machines', -1)) == -1) {
Index: contributions/modules/workflow_ng/states/states_admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/states/Attic/states_admin.inc,v
retrieving revision 1.1.2.1.2.5
diff -r1.1.2.1.2.5 states_admin.inc
78c78
< 'weight' => -1,
---
> 'weight' => -1,
Index: contributions/modules/workflow_ng/states/states_workflow_ng.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/states/Attic/states_workflow_ng.inc,v
retrieving revision 1.1.2.5.2.1
diff -r1.1.2.5.2.1 states_workflow_ng.inc
1a2
> // $Id$
69c70
< $events['machine_'. $name. '_change'] = array(
---
> $events['machine_'. $name .'_change'] = array(
82c83
< $events['machine_'. $name. '_change'] = array(
---
> $events['machine_'. $name .'_change'] = array(
147c148
< workflow_ng_invoke_event('machine_'. $name. '_change', $entity, $entity);
---
> workflow_ng_invoke_event('machine_'. $name .'_change', $entity, $entity);
154c155
< $state2 = states_entity_get_machine_state($entity, $name);
---
> $state2 = states_entity_get_machine_state($entity, $name);
156c157
< workflow_ng_invoke_event('machine_'. $name. '_change', $entity, $entity_unchanged);
---
> workflow_ng_invoke_event('machine_'. $name .'_change', $entity, $entity_unchanged);
163c164
< * Action: Sets a new state for a machine
---
> * Action: Sets a new state for a machine.
166c167
< $value = workflow_ng_token_replace($settings['value'], $settings['value_args'], $arguments, $log);
---
> $value = workflow_ng_token_replace($settings['value'], $settings['value_args'], $arguments, $log);
Index: contributions/modules/workflow_ng/workflow_ng/workflow_ng_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/Attic/workflow_ng_ui.module,v
retrieving revision 1.1.2.14.2.6
diff -r1.1.2.14.2.6 workflow_ng_ui.module
1a2
> // $Id$
84c85
< 'path' => WORKFLOW_NG_UI_PATH .'/'. arg(3) .'/edit/' . arg(5),
---
> 'path' => WORKFLOW_NG_UI_PATH .'/'. arg(3) .'/edit/'. arg(5),
167c168
< * Lists the available configurations..
---
> * Lists the available configurations.
179c180
< $events = array(0 => '') + workflow_ng_get_grouped_labels(workflow_ng_get_events());
---
> $events = array(0 => '') + workflow_ng_get_grouped_labels(workflow_ng_get_events());
185c186
< $modules = array(0 => '') + drupal_map_assoc(workflow_ng_ui_get_modules(workflow_ng_get_configurations()));
---
> $modules = array(0 => '') + drupal_map_assoc(workflow_ng_ui_get_modules(workflow_ng_get_configurations()));
196c197
< $form['active_header'] = array('#value' => ''. t('Active rules'). '
');
---
> $form['active_header'] = array('#value' => ''. t('Active rules') .'
');
198c199
< $form['inactive_header'] = array('#value' => ''. t('Inactive rules'). '
');
---
> $form['inactive_header'] = array('#value' => ''. t('Inactive rules') .'
');
202c203
< $form['fixed_header'] = array('#value' => ''. t('Fixed rules'). '
');
---
> $form['fixed_header'] = array('#value' => ''. t('Fixed rules') .'
');
264c265
< return $html ? ''. t('Modified'). '' : 'modified';
---
> return $html ? ''. t('Modified') .'' : 'modified';
272c273
< return $html ? ''. t('Custom'). '' : 'custom';
---
> return $html ? ''. t('Custom') .'' : 'custom';
495c496
< if (function_exists($function = 'workflow_ng_ui_form_edit_'. $element['#type'] . '_submit')) {
---
> if (function_exists($function = 'workflow_ng_ui_form_edit_'. $element['#type'] .'_submit')) {
560c561
< if (function_exists($function = 'workflow_ng_ui_form_edit_'. $form_values['element_type'] . '_submit')) {
---
> if (function_exists($function = 'workflow_ng_ui_form_edit_'. $form_values['element_type'] .'_submit')) {
710c711
< $function = $element['#name']. '_form';
---
> $function = $element['#name'] .'_form';
716c717
< $argument_info = workflow_ng_ui_event_get_argument_info($form['cfg']['#value'], $element);
---
> $argument_info = workflow_ng_ui_event_get_argument_info($form['cfg']['#value'], $element);
720c721
< $form['#validate'][$element['#name']. '_validate'] = array();
---
> $form['#validate'][$element['#name'] .'_validate'] = array();
725c726
< $function = $element['#name']. '_submit';
---
> $function = $element['#name'] .'_submit';
804c805
< $function = $element['#name']. '_form';
---
> $function = $element['#name'] .'_form';
814c815
<
---
>
1060c1061
< if(!isset($id)) {
---
> if (!isset($id)) {
1232c1233
< foreach($elements as $element) {
---
> foreach ($elements as $element) {
1244c1245
< *
---
> *
1277c1278
< * configuration
---
> * configuration
Index: contributions/modules/workflow_ng/workflow_ng_log/workflow_ng_log.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng_log/Attic/workflow_ng_log.module,v
retrieving revision 1.1.2.9
diff -r1.1.2.9 workflow_ng_log.module
35,38c35,38
< 'title' => t('Delete entry'),
< 'access' => user_access('access content'),
< 'type' => MENU_CALLBACK,
< 'callback' => 'drupal_get_form',
---
> 'title' => t('Delete entry'),
> 'access' => user_access('access content'),
> 'type' => MENU_CALLBACK,
> 'callback' => 'drupal_get_form',
136c136
< 'help' => t('Displays the time at which the message was logged.') .' '.
---
> 'help' => t('Displays the time at which the message was logged.') .' '.
148c148
< 'help' => t('Display a link to delete an entry.'),
---
> 'help' => t('Display a link to delete an entry.'),
203c203
< }
---
> }
219c219
<
---
>
230,232c230,234
< if (($type == 'user' && !(user_access('delete all user entries') || (($user->uid == $result['uid']) && user_access('delete own user entries')))) ||
< ($type == 'node' && !(user_access('delete all node entries')))) {
< drupal_access_denied();
---
> if (
> ($type == 'user' && !(user_access('delete all user entries') || (($user->uid == $result['uid']) && user_access('delete own user entries'))))
> || ($type == 'node' && !(user_access('delete all node entries')))
> ) {
> drupal_access_denied();
234c236
<
---
>
244,245c246,247
< return confirm_form($form, t('Delete entry'), $_GET['destination'],
< t("Are you sure you want to delete the entry %message?", array('%message' => $result['message'])),
---
> return confirm_form($form, t('Delete entry'), $_GET['destination'],
> t("Are you sure you want to delete the entry %message?", array('%message' => $result['message'])),
254c256
<
---
>
257c259
<
---
>
282c284
<
---
>
300c302
<
---
>
312c314
< $view->access = array (
---
> $view->access = array(
336c338
< $view->sort = array (
---
> $view->sort = array(
338c340
< $view->argument = array (
---
> $view->argument = array(
340,341c342,343
< $view->field = array (
< array (
---
> $view->field = array(
> array(
348c350
< array (
---
> array(
354c356
< array (
---
> array(
360c362
< array (
---
> array(
366c368
< array (
---
> array(
374c376
< array (
---
> array(
381,382c383,384
< $view->filter = array (
< array (
---
> $view->filter = array(
> array(
389c391
< array (
---
> array(
397,398c399,400
< $view->exposed_filter = array (
< array (
---
> $view->exposed_filter = array(
> array(
407c409
< array (
---
> array(
423c425
< $view->access = array (
---
> $view->access = array(
447c449
< $view->sort = array (
---
> $view->sort = array(
449c451
< $view->argument = array (
---
> $view->argument = array(
451,452c453,454
< $view->field = array (
< array (
---
> $view->field = array(
> array(
460c462
< array (
---
> array(
466c468
< array (
---
> array(
472c474
< array (
---
> array(
478c480
< array (
---
> array(
486c488
< array (
---
> array(
493,494c495,496
< $view->filter = array (
< array (
---
> $view->filter = array(
> array(
501c503
< array (
---
> array(
509,510c511,512
< $view->exposed_filter = array (
< array (
---
> $view->exposed_filter = array(
> array(
519c521
< array (
---
> array(