From c3f5722ddfd01bdfb82bc3594a79ac45edbea353 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 28 Nov 2008 02:14:42 +0000 Subject: [PATCH 1/1] Surfbar continued: - Template for unlocking locked URLs renamed - Fix in status handler function - Again status commented out for developing --- .gitattributes | 4 ++-- inc/databases.php | 2 +- inc/libs/surfbar_functions.php | 12 ++++++------ inc/modules/admin/admin-inc.php | 5 ++++- ...r_urls.tpl => admin_lock_active_surfbar_urls.tpl} | 0 ..._urls.tpl => member_lock_active_surfbar_urls.tpl} | 0 6 files changed, 13 insertions(+), 10 deletions(-) rename templates/de/emails/admin/{admin_lock_confirmed_surfbar_urls.tpl => admin_lock_active_surfbar_urls.tpl} (100%) rename templates/de/emails/member/{member_lock_confirmed_surfbar_urls.tpl => member_lock_active_surfbar_urls.tpl} (100%) diff --git a/.gitattributes b/.gitattributes index 8835d5b330..5440dc26d1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -630,7 +630,7 @@ templates/de/emails/admin/admin_edit_surfbar_urls.tpl -text templates/de/emails/admin/admin_holiday_deactivated.tpl -text templates/de/emails/admin/admin_holiday_request.tpl -text templates/de/emails/admin/admin_holiday_unlock.tpl -text -templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl -text +templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl -text templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl -text templates/de/emails/admin/admin_mydata_notify.tpl -text templates/de/emails/admin/admin_newsletter_request.tpl -text @@ -714,7 +714,7 @@ templates/de/emails/member/member_holiday_activated.tpl -text templates/de/emails/member/member_holiday_removed.tpl -text templates/de/emails/member/member_holiday_request.tpl -text templates/de/emails/member/member_holiday_unlock.tpl -text -templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl -text +templates/de/emails/member/member_lock_active_surfbar_urls.tpl -text templates/de/emails/member/member_lock_locked_surfbar_urls.tpl -text templates/de/emails/member/member_mydata_notify.tpl -text templates/de/emails/member/member_newsletter_done.tpl -text diff --git a/inc/databases.php b/inc/databases.php index d05929501d..f268fd450a 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "573"); +define('CURR_SVN_REVISION', "574"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index e64aac3a53..26610a438e 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -1205,15 +1205,15 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Update the status now // ---------- Comment out for debugging/developing member actions! --------- - SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET status='%s' WHERE id=%s LIMIT 1", - array($newStatus, bigintval($urlId)), __FILE__, __LINE__); + //SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET status='%s' WHERE id=%s LIMIT 1", + // array($newStatus, bigintval($urlId)), __FILE__, __LINE__); // ---------- Comment out for debugging/developing member actions! --------- // Was that fine? - if (SQL_AFFECTEDROWS() != 1) { - // No, something went wrong - return false; - } // END - if + //if (SQL_AFFECTEDROWS() != 1) { + // // No, something went wrong + // return false; + //} // END - if // Prepare content for notification routines $data[$urlId]['uid'] = $data[$urlId]['userid']; diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 355d5ef938..b6fa6a83dd 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -987,6 +987,9 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct } else { // Add regular entry $SQL .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id])); + + // Add entry + $content[$key] = $entries[$id]; } } // END - if } // END - foreach @@ -1156,7 +1159,7 @@ function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc // Shall we un-/lock here or list for locking? if ($lockNow) { // Un-/lock entries - ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); + ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray); } else { // List for editing ADMIN_BUILD_LIST("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); diff --git a/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl similarity index 100% rename from templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl rename to templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl diff --git a/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl b/templates/de/emails/member/member_lock_active_surfbar_urls.tpl similarity index 100% rename from templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl rename to templates/de/emails/member/member_lock_active_surfbar_urls.tpl -- 2.30.2