Админка логирования

Мелкие изменения в выводе.

admin/admin_log.php

@@ -182,9 +182,7 @@ if ($var =& $_REQUEST[$title_match_key])
 	}
 }
 
-//
 // SQL
-//
 $where = " WHERE l.log_time BETWEEN '$time_start_val' AND '$time_end_val'";
 $where .= ($type_csv) ? " AND l.log_type_id IN($type_csv)" : '';
 $where .= ($user_csv) ? " AND l.log_user_id IN($user_csv)" : '';
@@ -193,7 +191,7 @@ $where .= ($topic_csv) ? " AND l.log_topic_id IN($topic_csv)" : '';
 $where .= ($title_match_sql) ? " AND MATCH (l.log_topic_title) AGAINST ('$title_match_sql' IN BOOLEAN MODE)" : '';
 
 $sql = "SELECT l.*, u.*
-	FROM ". BB_LOG ." l 
+	FROM ". BB_LOG ." l
 	LEFT JOIN ". BB_USERS ." u ON(u.user_id = l.log_user_id)
 	$where
 	ORDER BY l.log_time
@@ -265,7 +263,7 @@ if ($log_rowset)
 			break;
 		}
 
-		$msg .= " $row[log_msg]";
+		$msg .= " {$row['log_msg']}";
 
 		$row_class = !($row_num & 1) ? $row_class_1 : $row_class_2;
 
@@ -347,14 +345,9 @@ else
 	$template->assign_block_vars('log_not_found', array());
 }
 
-//
-// Selects
-//
+// Select
 $log_type_select = array($lang['ACTS_LOG_ALL_ACTIONS'] => $all_types) + $log_action->log_type_select;
 
-// Order select
-$order_options = '<option value="">&nbsp;'.$lang['ACTS_LOG_TIME'].'&nbsp;</option>';
-
 $template->assign_vars(array(
 	'LOG_COLSPAN'       => 4,
 
@@ -368,9 +361,6 @@ $template->assign_vars(array(
 	'TITLE_MATCH_NAME'  => $title_match_key,
 	'TITLE_MATCH_VAL'   => $title_match_val,
 
-	'ORDER_NAME'        => '',
-	'ORDER_OPTIONS'     => $order_options,
-
 	'SORT_NAME'         => $sort_key,
 	'SORT_ASC'          => $sort_asc,
 	'SORT_DESC'         => $sort_desc,

install/upgrade/changes.txt

@@ -63,4 +63,5 @@ DROP TABLE IF EXISTS `bb_attach_quota`;
 DROP TABLE IF EXISTS `bb_quota_limits`;
 ALTER TABLE `bb_topics` ADD `attach_ext_id` TINYINT(4) NOT NULL DEFAULT '0' AFTER `topic_dl_type`;
 ALTER TABLE `bb_topics` ADD `filesize` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `attach_ext_id`;
-DELETE FROM `bb_config` WHERE `config_name` = 'new_tpls';
+DELETE FROM `bb_config` WHERE `config_name` = 'new_tpls';
+ALTER TABLE `bb_log` DROP COLUMN `log_username`;

library/language/en/main.php

@@ -2525,7 +2525,7 @@ $lang['ACTS_LOG_FORUM'] = 'Forum';
 $lang['ACTS_LOG_ACTION'] = 'Action';
 $lang['ACTS_LOG_USER'] = 'User';
 $lang['ACTS_LOG_LOGS_FROM'] = 'Logs from ';
-$lang['ACTS_LOG_FIRST'] = 'first ';
+$lang['ACTS_LOG_FIRST'] = 'beginning with';
 $lang['ACTS_LOG_DAYS_BACK'] = 'days back';
 $lang['ACTS_LOG_TOPIC_MATCH'] = 'Topic title match';
 $lang['ACTS_LOG_SORT_BY'] = 'Sort by';
@@ -2535,6 +2535,7 @@ $lang['ACTS_LOG_TIME'] = 'Time';
 $lang['ACTS_LOG_INFO'] = 'Info';
 $lang['ACTS_LOG_FILTER'] = 'Filter';
 $lang['ACTS_LOG_TOPICS'] = 'Topics:';
+$lang['ACTS_LOG_OR'] = 'or';
 
 $lang['RELEASE'] = 'Release Templates';
 $lang['RELEASES'] = 'Releases';

library/language/ru/main.php

@@ -2525,7 +2525,7 @@ $lang['ACTS_LOG_FORUM'] = 'Форум';
 $lang['ACTS_LOG_ACTION'] = 'Действие';
 $lang['ACTS_LOG_USER'] = 'Пользователь';
 $lang['ACTS_LOG_LOGS_FROM'] = 'Логи с ';
-$lang['ACTS_LOG_FIRST'] = 'сначала: ';
+$lang['ACTS_LOG_FIRST'] = 'начало с';
 $lang['ACTS_LOG_DAYS_BACK'] = 'дней назад';
 $lang['ACTS_LOG_TOPIC_MATCH'] = 'Совпадение с названием темы';
 $lang['ACTS_LOG_SORT_BY'] = 'Сортировать по';
@@ -2535,6 +2535,7 @@ $lang['ACTS_LOG_TIME'] = 'Время';
 $lang['ACTS_LOG_INFO'] = 'Инфо';
 $lang['ACTS_LOG_FILTER'] = 'Фильтр';
 $lang['ACTS_LOG_TOPICS'] = 'Топик:';
+$lang['ACTS_LOG_OR'] = 'или';
 
 $lang['RELEASE'] = 'Шаблоны для релизов';
 $lang['RELEASES'] = 'Релизы';

library/language/uk/main.php

@@ -2525,7 +2525,7 @@ $lang['ACTS_LOG_FORUM'] = 'Форум';
 $lang['ACTS_LOG_ACTION'] = 'Дія';
 $lang['ACTS_LOG_USER'] = 'Користувач';
 $lang['ACTS_LOG_LOGS_FROM'] = 'Логи ';
-$lang['ACTS_LOG_FIRST'] = 'спочатку: ';
+$lang['ACTS_LOG_FIRST'] = 'початок';
 $lang['ACTS_LOG_DAYS_BACK'] = 'днів назад';
 $lang['ACTS_LOG_TOPIC_MATCH'] = 'Збіг з назвою теми';
 $lang['ACTS_LOG_SORT_BY'] = 'Сортувати по';
@@ -2535,6 +2535,7 @@ $lang['ACTS_LOG_TIME'] = 'Час';
 $lang['ACTS_LOG_INFO'] = 'Інфо';
 $lang['ACTS_LOG_FILTER'] = 'Фільтр';
 $lang['ACTS_LOG_TOPICS'] = 'Топік:';
+$lang['ACTS_LOG_OR'] = 'або';
 
 $lang['RELEASE'] = 'Шаблони для релізів';
 $lang['RELEASES'] = 'Релізи';

styles/templates/admin/admin_log.tpl

@@ -53,11 +53,11 @@ table.log_filters td {
 				<tr>
 					<td valign="top" class="row1">
 						<fieldset>
-						<legend>{L_ACTS_LOG_LOGS_FROM} <span style="font-size: 9px;">(<i>{L_ACTS_LOG_FIRST}{FIRST_LOG_TIME}</i>)</span></legend>
+						<legend>{L_ACTS_LOG_LOGS_FROM} ({L_ACTS_LOG_FIRST}: {FIRST_LOG_TIME})</legend>
 						<div>
 							<p class="input nowrap">
 								<input class="post" type="text" size="10" maxlength="20" name="{DATETIME_NAME}" value="{DATETIME_VAL}" />
-								&amp;
+								{L_ACTS_LOG_OR}
 								<input class="post" type="text" size="2" maxlength="5" name="{DAYSBACK_NAME}" value="{DAYSBACK_VAL}" />
 								{L_ACTS_LOG_DAYS_BACK}
 							</p>
@@ -72,14 +72,13 @@ table.log_filters td {
 							</div>
 						</fieldset>
 					</td>
-					<td valign="top" class="row1" style="padding: 0;">
-						<fieldset>
+					<td valign="top" class="row1">
+						<fieldset style="height: 45px; width: 110px;">
 						<legend>{L_ACTS_LOG_SORT_BY}</legend>
 							<div>
 								<p class="select nowrap">
-									<select class="post" name="{ORDER_NAME}">{ORDER_OPTIONS}</select>
-									<label><input id="sort_asc" type="radio" name="{SORT_NAME}" value="{SORT_ASC}" {SORT_ASC_CHECKED} /> A-Z</label>
-									<label><input id="sort_desc" type="radio" name="{SORT_NAME}" value="{SORT_DESC}" {SORT_DESC_CHECKED} /> Z-A</label>
+									<label><input id="sort_asc" type="radio" name="{SORT_NAME}" value="{SORT_ASC}" {SORT_ASC_CHECKED} /> {L_ASC}</label>
+									<label><input id="sort_desc" type="radio" name="{SORT_NAME}" value="{SORT_DESC}" {SORT_DESC_CHECKED} /> {L_DESC}</label>
 								</p>
 							</div>
 						</fieldset>