Changeset 1121 for trunk/smf/Sources/Modlog.php

Timestamp:

03/29/10 15:37:29 (2 years ago)

Author:

bogdan2412

Message:

Updated with changes from live.

• Updated SMF to 1.1.11
• Added Summify to site and forum
• Small change to job detail view

File:

• trunk/smf/Sources/Modlog.php (modified) (5 diffs)

trunk/smf/Sources/Modlog.php

@@ -6 +6 @@
 * Open-Source Project Inspired by Zef Hemel (zef@zefhemel.com)                    *
 * =============================================================================== *
-* Software Version:           SMF 1.1                                             *
+* Software Version:           SMF 1.1.11                                          *
 * Software by:                Simple Machines (http://www.simplemachines.org)     *
-* Copyright 2006 by:          Simple Machines LLC (http://www.simplemachines.org) *
+* Copyright 2006-2009 by:     Simple Machines LLC (http://www.simplemachines.org) *
 *           2001-2006 by:     Lewis Media (http://www.lewismedia.com)             *
 * Support, News, Updates at:  http://www.simplemachines.org                       *
@@ -93 +93 @@
         }
 
-        // If we have no search, a broken search, or a new search - then create a new array.
+        // This array houses all the valid search types.
+        $searchTypes = array(
+                'action' => array('sql' => 'lm.action', 'label' => $txt['modlog_action']),
+                'member' => array('sql' => 'mem.realName', 'label' => $txt['modlog_member']),
+                'group' => array('sql' => 'mg.groupName', 'label' => $txt['modlog_position']),
+                'ip' => array('sql' => 'lm.ip', 'label' => $txt['modlog_ip'])
+        );
+
         if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-        {
-                // This array houses all the valid search types.
-                $searchTypes = array(
-                        'action' => array('sql' => 'lm.action', 'label' => $txt['modlog_action']),
-                        'member' => array('sql' => 'mem.realName', 'label' => $txt['modlog_member']),
-                        'group' => array('sql' => 'mg.groupName', 'label' => $txt['modlog_position']),
-                        'ip' => array('sql' => 'lm.ip', 'label' => $txt['modlog_ip'])
-                );
-
-                $search_params = array(
-                        'string' => empty($_REQUEST['search']) ? '' : $_REQUEST['search'],
-                        'type' => isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : isset($searchTypes[$context['order']]) ? $context['order'] : 'member',
-                        'type_sql' => isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $searchTypes[$_REQUEST['search_type']]['sql'] : isset($searchTypes[$context['order']]) ? $context['columns'][$context['order']]['sql'] : 'mem.realName',
-                        'type_label' => isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $searchTypes[$_REQUEST['search_type']]['label'] : isset($searchTypes[$context['order']]) ? $context['columns'][$context['order']]['label'] : $txt['modlog_member'],
-                );
-        }
+                $search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+        else
+                $search_params_string = $search_params['string'];
+
+        if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
+                $search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+        else
+                $search_params_type = $search_params['type'];
+
+        $search_params_column = $searchTypes[$search_params_type]['sql'];
+        $search_params = array(
+                'string' => $search_params_string,
+                'type' => $search_params_type,
+        );
 
         // Setup the search context.
@@ -117 +122 @@
                 'string' => stripslashes($search_params['string']),
                 'type' => $search_params['type'],
-                'label' => $search_params['type_label']
+                'label' => $searchTypes[$search_params_type]['label'],
         );
 
@@ -168 +173 @@
                         LEFT JOIN {$db_prefix}members AS mem ON (mem.ID_MEMBER = lm.ID_MEMBER)
                         LEFT JOIN {$db_prefix}membergroups AS mg ON (mg.ID_GROUP = IF(mem.ID_GROUP = 0, mem.ID_POST_GROUP, mem.ID_GROUP))" . (!empty($search_params['string']) ? "
-                WHERE INSTR($search_params[type_sql], '$search_params[string]')" : ''), __FILE__, __LINE__);
+                WHERE INSTR($search_params_column, '$search_params[string]')" : ''), __FILE__, __LINE__);
         list ($context['entry_count']) = mysql_fetch_row($result);
         mysql_free_result($result);
@@ -184 +189 @@
                         LEFT JOIN {$db_prefix}members AS mem ON (mem.ID_MEMBER = lm.ID_MEMBER)
                         LEFT JOIN {$db_prefix}membergroups AS mg ON (mg.ID_GROUP = IF(mem.ID_GROUP = 0, mem.ID_POST_GROUP, mem.ID_GROUP))" . (!empty($search_params['string']) ? "
-                WHERE INSTR($search_params[type_sql], '$search_params[string]')" : '') . "
+                WHERE INSTR($search_params_column, '$search_params[string]')" : '') . "
                 ORDER BY $orderType" . (isset($_REQUEST['d']) ? '' : ' DESC') . "
                 LIMIT $context[start], $displaypage", __FILE__, __LINE__);