New wrapper functions introduced, some one-line parameter monsters killed:

[mailer.git] / inc / modules / admin / what-list_surfbar_urls.php

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 207f45b6038c1d8e2639c8023821906ac3dbd894..5204455333db2d0fb79f91a1974a4bd3ef2a90de 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -61,9 +61,26 @@ if (isFormSent('edit')) {
        adminEditEntriesConfirm(
                postRequestParameter('url_id'),
                'surfbar_urls',
-               array('url_id', 'url_userid', 'url'),
-               array('bigintval', 'addMemberSelectionBox', ''),
-               array('', array(false, true, true, 'url_userid[]'), ''),
+               array(
+                       'url_id',
+                       'url_userid',
+                       'url'
+               ),
+               array(
+                       'bigintval',
+                       'addMemberSelectionBox',
+                       ''
+               ),
+               array(
+                       '',
+                       array(
+                               false,
+                               true,
+                               true,
+                               'url_userid[]'
+                       ),
+                       ''
+               ),
                false,
                'url_id',
                'url_userid',
@@ -88,9 +105,24 @@ if (isFormSent('edit')) {
        adminDeleteEntriesConfirm(
        postRequestParameter('url_id'),
                'surfbar_urls',
-               array('url_id', 'url_userid', 'url', 'url_registered'),
-               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', ''),
-               array('', '', '', ''),
+               array(
+                       'url_id',
+                       'url_userid',
+                       'url',
+                       'url_registered'
+               ),
+               array(
+                       'bigintval',
+                       'generateUserProfileLink',
+                       'generateFrametesterUrl',
+                       ''
+               ),
+               array(
+                       '',
+                       '',
+                       '',
+                       ''
+               ),
                false,
                'url_id',
                'url_userid',
@@ -99,15 +131,41 @@ if (isFormSent('edit')) {
        $show = false;
 } elseif (isPostRequestParameterSet('do_delete')) {
        // Remove entries from database
-       adminDeleteEntriesConfirm(postRequestParameter('url_id'), 'surfbar_urls', array(), array(), array(), true, 'url_id');
+       adminDeleteEntriesConfirm(
+               postRequestParameter('url_id'),
+               'surfbar_urls',
+               array(),
+               array(),
+               array(),
+               true,
+               'url_id'
+       );
 } elseif (isFormSent('lock')) {
        // Un-/lock selected URLs. This does not work for pending URLs
        adminLockEntriesConfirm(
                postRequestParameter('url_id'),
                'surfbar_urls',
-               array('url_id', 'url_userid', 'url', 'url_registered', 'url_status'),
-               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
-               array('', '', '', '', ''),
+               array(
+                       'url_id',
+                       'url_userid',
+                       'url',
+                       'url_registered',
+                       'url_status'
+               ),
+               array(
+                       'bigintval',
+                       'generateUserProfileLink',
+                       'generateFrametesterUrl',
+                       '',
+                       'translateSurfbarUrlStatus'
+               ),
+               array(
+                       '',
+                       '',
+                       '',
+                       '',
+                       ''
+               ),
                false,
                'url_id',
                'url_userid',
@@ -122,7 +180,12 @@ if (isFormSent('edit')) {
                array(),
                array(),
                array(),
-               array('url_status' => array('ACTIVE' => 'LOCKED', 'LOCKED' => 'ACTIVE')),
+               array(
+                       'url_status' => array(
+                               'ACTIVE' => 'LOCKED',
+                               'LOCKED' => 'ACTIVE'
+                       )
+               ),
                true,
                'url_id',
                'url_userid',
@@ -133,9 +196,27 @@ if (isFormSent('edit')) {
        adminUndeleteEntriesConfirm(
                postRequestParameter('url_id'),
                'surfbar_urls',
-               array('url_id', 'url_userid', 'url', 'url_registered', 'url_status'),
-               array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'),
-               array('', '', '', '', ''),
+               array(
+                       'url_id',
+                       'url_userid',
+                       'url',
+                       'url_registered',
+                       'url_status'
+               ),
+               array(
+                       'bigintval',
+                       'generateUserProfileLink',
+                       'generateFrametesterUrl',
+                       '',
+                       'translateSurfbarUrlStatus'
+               ),
+               array(
+                       '',
+                       '',
+                       '',
+                       '',
+                       ''
+               ),
                false,
                'url_id',
                'url_userid',
@@ -150,7 +231,11 @@ if (isFormSent('edit')) {
                array(),
                array(),
                array(),
-               array('url_status' => array('DELETED' => 'ACTIVE')),
+               array(
+                       'url_status' => array(
+                               'DELETED' => 'ACTIVE'
+                       )
+               ),
                true,
                'url_id',
                'url_userid',