diff --git a/admin/admin_log.php b/admin/admin_log.php index fb3ef5004..3452a403b 100644 --- a/admin/admin_log.php +++ b/admin/admin_log.php @@ -154,7 +154,7 @@ $order_val = 'log_time'; // Sort $sort_val = $def_sort; -if ($var =& $_REQUEST[$sort_key] and $var != $def_sort) { +if ($var =& $_REQUEST[$sort_key] && $var != $def_sort) { $sort_val = ($var == $sort_asc) ? $sort_asc : $sort_desc; $url = url_arg($url, $sort_key, $sort_val); } @@ -163,11 +163,11 @@ if ($var =& $_REQUEST[$sort_key] and $var != $def_sort) { $datetime_val = $def_datetime; $daysback_val = $def_days; -if ($var =& $_REQUEST[$daysback_key] and $var != $def_days) { +if ($var =& $_REQUEST[$daysback_key] && $var != $def_days) { $daysback_val = max(intval($var), 1); $url = url_arg($url, $daysback_key, $daysback_val); } -if ($var =& $_REQUEST[$datetime_key] and $var != $def_datetime) { +if ($var =& $_REQUEST[$datetime_key] && $var != $def_datetime) { $tz = TIMENOW + (3600 * $bb_cfg['board_timezone']); if (($tmp_timestamp = strtotime($var, $tz)) > 0) { $datetime_val = $tmp_timestamp; diff --git a/library/includes/functions_post.php b/library/includes/functions_post.php index 801b6aa29..f8c718c47 100644 --- a/library/includes/functions_post.php +++ b/library/includes/functions_post.php @@ -92,7 +92,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ if ($mode == 'newtopic' || $mode == 'reply') { $sql = "SELECT MAX(p.post_time) AS last_post_time FROM " . BB_POSTS . " p WHERE $where_sql"; - if ($row = DB()->fetch_row($sql) and $row['last_post_time']) { + if ($row = DB()->fetch_row($sql) && $row['last_post_time']) { if ($userdata['user_level'] == USER) { if (TIMENOW - $row['last_post_time'] < $bb_cfg['flood_interval']) { bb_die($lang['FLOOD_ERROR']); diff --git a/library/includes/posting_tpl.php b/library/includes/posting_tpl.php index e0b013847..c502eade1 100644 --- a/library/includes/posting_tpl.php +++ b/library/includes/posting_tpl.php @@ -33,14 +33,14 @@ $edit_tpl_mode = ($can_edit_tpl && !empty($_REQUEST['edit_tpl'])); // forum_data $sql = "SELECT forum_name, allow_reg_tracker, forum_tpl_id FROM " . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1"; -if (!$forum_id or !$f_data = DB()->fetch_row($sql)) { +if (!$forum_id || !$f_data = DB()->fetch_row($sql)) { bb_die($lang['FORUM_NOT_EXIST']); } // tpl_data $tpl_data = array(); $sql = "SELECT * FROM " . BB_TOPIC_TPL . " WHERE tpl_id = {$f_data['forum_tpl_id']} LIMIT 1"; -if (!$f_data['forum_tpl_id'] or !$tpl_data = DB()->fetch_row($sql)) { +if (!$f_data['forum_tpl_id'] || !$tpl_data = DB()->fetch_row($sql)) { if (!$edit_tpl_mode) { redirect(POSTING_URL . "?mode=newtopic&f=$forum_id"); }