Surfbar continued:

- Template for unlocking locked URLs renamed
- Fix in status handler function
- Again status commented out for developing

diff --git a/.gitattributes b/.gitattributes
index 8835d5b3307d3c8a58152df48a29b5a0615e83ae..5440dc26d10d548066c4d6d7b41a2157fecf9b0e 100644 (file)
--- 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_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
 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_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
 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 d05929501d6f186ffd099b35daa4fc0181e6abde..f268fd450a26469684d73394f0f3b619cd9f64dd 100644 (file)
--- 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('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);
 
 // 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 e64aac3a53b6be392ac126dfb817704a8beca256..26610a438ed795a8d4430cfbd5886651cc9dd28f 100644 (file)
--- 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! ---------
 
        // 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?
        // ---------- 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'];
 
        // 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 355d5ef93860ae1aad34aabbd63faa45f3c278b2..b6fa6a83dd5e077e8724e5393e1f96b4708893c9 100644 (file)
--- 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]));
                                        } 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
                                        }
                                } // 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
                // 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);
                } else {
                        // List for editing
                        ADMIN_BUILD_LIST("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);

diff --git a/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl
new file mode 100644 (file)
index 0000000..ad32d2f
--- /dev/null
+++ b/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl
@@ -0,0 +1,26 @@
+{--HELLO_ADMIN--},
+
+Es wurde eine URL in der Surfbar freigegeben.
+
+Hier sind alle Daten dazu:
+------------------------------------------
+URL: $content[url]
+------------------------------------------
+Framekiller-Test:
+$content[frametester]
+------------------------------------------
+User-ID: $content[userid]
+------------------------------------------
+Sperrgrund: $content[lock_reason]
+------------------------------------------
+Letzte Sperrung: $content[last_locked]
+------------------------------------------
+Angemeldet: $content[registered]
+------------------------------------------
+ID in der Surfbar: $content[id]
+------------------------------------------
+
+{--ADMIN_THANX--}
+  {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--}
+
+{!URL!}/admin.php

diff --git a/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl
deleted file mode 100644 (file)
index ad32d2f..0000000
--- a/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{--HELLO_ADMIN--},
-
-Es wurde eine URL in der Surfbar freigegeben.
-
-Hier sind alle Daten dazu:
-------------------------------------------
-URL: $content[url]
-------------------------------------------
-Framekiller-Test:
-$content[frametester]
-------------------------------------------
-User-ID: $content[userid]
-------------------------------------------
-Sperrgrund: $content[lock_reason]
-------------------------------------------
-Letzte Sperrung: $content[last_locked]
-------------------------------------------
-Angemeldet: $content[registered]
-------------------------------------------
-ID in der Surfbar: $content[id]
-------------------------------------------
-
-{--ADMIN_THANX--}
-  {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--}
-
-{!URL!}/admin.php

diff --git a/templates/de/emails/member/member_lock_active_surfbar_urls.tpl b/templates/de/emails/member/member_lock_active_surfbar_urls.tpl
new file mode 100644 (file)
index 0000000..9c7b73c
--- /dev/null
+++ b/templates/de/emails/member/member_lock_active_surfbar_urls.tpl
@@ -0,0 +1,19 @@
+Hallo Mitglied,
+
+wir haben soeben Ihre URL in der Surfbar wieder freigegeben.
+
+Hier sind alle Daten dazu:
+------------------------------------------
+Gebuchte URL: $content[url]
+------------------------------------------
+Angemeldet: $content[registered]
+------------------------------------------
+Ihre User-ID: $content[userid]
+------------------------------------------
+ID in der Surfbar: $content[id]
+------------------------------------------
+
+Mit freundlichem Gruss,
+  Ihr {!MAIN_TITLE!} Team
+
+{!URL!}/login.php ({!WEBMASTER!})

diff --git a/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl b/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl
deleted file mode 100644 (file)
index 9c7b73c..0000000
--- a/templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-Hallo Mitglied,
-
-wir haben soeben Ihre URL in der Surfbar wieder freigegeben.
-
-Hier sind alle Daten dazu:
-------------------------------------------
-Gebuchte URL: $content[url]
-------------------------------------------
-Angemeldet: $content[registered]
-------------------------------------------
-Ihre User-ID: $content[userid]
-------------------------------------------
-ID in der Surfbar: $content[id]
-------------------------------------------
-
-Mit freundlichem Gruss,
-  Ihr {!MAIN_TITLE!} Team
-
-{!URL!}/login.php ({!WEBMASTER!})