diff --git a/upload/ajax/edit_user_profile.php b/upload/ajax/edit_user_profile.php index 132fca4f4..8fa4bf1af 100644 --- a/upload/ajax/edit_user_profile.php +++ b/upload/ajax/edit_user_profile.php @@ -118,13 +118,14 @@ switch ($field) case 'user_regdate': case 'user_lastvisit': - $tz = TIMENOW + (3600 * $bb_cfg['board_timezone']); - if (($value = strtotime($value, $tz)) < $bb_cfg['board_startdate'] OR $value > TIMENOW) - { - $this->ajax_die($lang['INVALID_DATE'] . $this->request['value']); - } - $this->response['new_value'] = bb_date($value); - break; + $tz = TIMENOW + (3600 * $bb_cfg['board_timezone']); + if (($value = strtotime($value, $tz)) < $bb_cfg['board_startdate'] OR $value > TIMENOW) + { + $this->ajax_die($lang['INVALID_DATE'] . $this->request['value']); + } + $value = $value - (3600 * -1); + $this->response['new_value'] = bb_date($value); + break; case 'ignore_srv_load': $value = ($this->request['value']) ? 0 : 1; diff --git a/upload/ajax/manage_user.php b/upload/ajax/manage_user.php index 3049a6d3a..937130020 100644 --- a/upload/ajax/manage_user.php +++ b/upload/ajax/manage_user.php @@ -25,7 +25,7 @@ switch($mode) case 'delete_topics': if (empty($this->request['confirmed']) && $userdata['user_id'] == $user_id) $this->prompt_for_confirm($lang['DELETE_USER_POSTS_ME']); - if (empty($this->request['confirmed'])) $this->prompt_for_confirm(' ?'); + if (empty($this->request['confirmed'])) $this->prompt_for_confirm('Удалить все сообщения и все начатые юзером топики целиком?'); if (IS_ADMIN) { @@ -40,7 +40,7 @@ switch($mode) case 'delete_message': if (empty($this->request['confirmed']) && $userdata['user_id'] == $user_id) $this->prompt_for_confirm($lang['DELETE_USER_POSTS_ME']); - if (empty($this->request['confirmed'])) $this->prompt_for_confirm(' , ?'); + if (empty($this->request['confirmed'])) $this->prompt_for_confirm('Удалить все сообщения, кроме заглавных?'); if (IS_ADMIN) { diff --git a/upload/config.php b/upload/config.php index 38ff755cf..e5199d4c3 100644 --- a/upload/config.php +++ b/upload/config.php @@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Stable'; -$bb_cfg['tp_release_state'] = 'R299'; -$bb_cfg['tp_release_date'] = '12-10-2011'; +$bb_cfg['tp_release_state'] = 'R300'; +$bb_cfg['tp_release_date'] = '15-10-2011'; // Database $charset = 'utf8'; @@ -102,7 +102,7 @@ $bb_cfg['cache']['engines'] = array( $bb_cfg['datastore_type'] = 'filecache'; // Server -$bb_cfg['server_name'] = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'torrentpier.me'; // The domain name from which this board runs +$bb_cfg['server_name'] = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : ''; // The domain name from which this board runs $bb_cfg['server_port'] = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : 80; // The port your server is running on $bb_cfg['script_path'] = '/'; // The path where FORUM is located relative to the domain name diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 97f87770c..dd064e650 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -1560,68 +1560,57 @@ function setup_style () // Create date/time from format and timezone function bb_date ($gmepoch, $format = false, $tz = null) { - global $bb_cfg, $lang, $userdata; + global $bb_cfg, $lang, $userdata; - if (is_null($tz)) - { - if (empty($userdata['session_logged_in'])) - { $tz = $bb_cfg['board_timezone']; } - else $tz = $userdata['user_timezone']; - } - if (!$format) - { - $format = $bb_cfg['default_dateformat']; - } - $date = gmdate($format, $gmepoch + (3600 * $tz)); + if (!$format) $format = $bb_cfg['default_dateformat']; + if (empty($lang))require_once($bb_cfg['default_lang_dir'] .'lang_main.php'); - if (empty($lang)) - { - require_once($bb_cfg['default_lang_dir'] .'lang_main.php'); - } - - $thetime = ($bb_cfg['translate_dates']) ? strtr(strtoupper($date), $lang['DATETIME']) : $date; - - if(is_numeric($tz)) - { + if (is_null($tz) || $tz == 'false') + { if (empty($userdata['session_logged_in'])) - { - $tz = $bb_cfg['board_timezone']; - } - else $tz = $userdata['user_timezone']; + { + $tz2 = $bb_cfg['board_timezone']; + } + else $tz2 = $userdata['user_timezone']; + } + elseif (is_numeric($tz)) $tz2 = $tz; - $time_format = " H:i"; + $date = gmdate($format, $gmepoch + (3600 * $tz2)); - $date = getdate(); - $today = $date['mday']; - $month = $date['mon']; - $year = $date['year']; + if($tz != 'false') + { + $time_format = " H:i"; - $forum_date_today = @gmdate ("d", $gmepoch + (3600 * $tz)); - $forum_date_month = @gmdate ("m", $gmepoch + (3600 * $tz)); - $forum_date_year = @gmdate ("Y", $gmepoch + (3600 * $tz)); + $today = gmdate("d", TIMENOW + (3600 * $tz2)); + $month = gmdate("m", TIMENOW + (3600 * $tz2)); + $year = gmdate("Y", TIMENOW + (3600 * $tz2)); - if ($forum_date_today == $today && $forum_date_month == $month && $forum_date_year == $year) - { - $thetime = $lang['TODAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz)); - } - elseif ($today != 1 && $forum_date_today == ($today-1) && $forum_date_month == $month && $forum_date_year == $year) - { - $thetime = $lang['YESTERDAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz)); - } - elseif ($today == 1 && $month != 1) - { - $yesterday = date ("t", mktime(0, 0, 0, ($month-1), 1, $year)); - if ($forum_date_today == $yesterday && $forum_date_month == ($month-1) && $forum_date_year == $year) - $thetime = $lang['YESTERDAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz)); - } - elseif ($today == 1 && $month == 1) - { - $yesterday = date ("t", mktime(0, 0, 0, 12, 1, ($year -1))); - if ($forum_date_today == $yesterday && $forum_date_month == 12 && $forum_date_year == ($year-1)) - $thetime = $lang['YESTERDAY'] . @gmdate($time_format, $gmepoch + (3600 * $tz)); - } - } - return ($thetime); + $date_today = gmdate("d", $gmepoch + (3600 * $tz2)); + $date_month = gmdate("m", $gmepoch + (3600 * $tz2)); + $date_year = gmdate("Y", $gmepoch + (3600 * $tz2)); + + if ($date_today == $today && $date_month == $month && $date_year == $year) + { + $date = 'today' . gmdate($time_format, $gmepoch + (3600 * $tz2)); + } + elseif ($today != 1 && $date_today == ($today-1) && $date_month == $month && $date_year == $year) + { + $date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz2)); + } + elseif ($today == 1 && $month != 1) + { + $yesterday = date ("t", mktime(0, 0, 0, ($month-1), 1, $year)); + if ($date_today == $yesterday && $date_month == ($month-1) && $date_year == $year) + $date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz2)); + } + elseif ($today == 1 && $month == 1) + { + $yesterday = date ("t", mktime(0, 0, 0, 12, 1, ($year -1))); + if ($date_today == $yesterday && $date_month == 12 && $date_year == ($year-1)) + $date = 'yesterday' . gmdate($time_format, $gmepoch + (3600 * $tz)); + } + } + return ($bb_cfg['translate_dates']) ? strtr(strtoupper($date), $lang['DATETIME']) : $date; } // Birthday diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 99f0fb5ad..dad54819c 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1007,8 +1007,8 @@ $lang['TZ']['11'] = 'GMT + 11 Hours'; $lang['TZ']['12'] = 'GMT + 12 Hours'; $lang['TZ']['13'] = 'GMT + 13 Hours'; -$lang['TODAY'] = 'Today'; -$lang['YESTERDAY'] = 'Yesterday'; +$lang['DATETIME']['TODAY'] = 'Today'; +$lang['DATETIME']['YESTERDAY'] = 'Yesterday'; $lang['DATETIME']['SUNDAY'] = 'Sunday'; $lang['DATETIME']['MONDAY'] = 'Monday'; @@ -1598,7 +1598,8 @@ $lang['USER_DELETE_ME'] = 'Sorry, your account is forbidden to remove!'; $lang['USER_DELETE_CSV'] = 'Sorry, this account is not allowed to delete!'; $lang['USER_DELETE_CONFIRM'] = 'Are you sure you want to delete this user?'; $lang['USER_DELETED'] = 'User was successfully deleted'; -$lang['DELETE_USER_POSTS'] = 'Delete all user posts'; +$lang['DELETE_USER_ALL_POSTS'] = 'Delete all user posts'; +$lang['DELETE_USER_POSTS'] = 'Delete all messages, except for capital'; $lang['DELETE_USER_POSTS_ME'] = 'Are you sure you want to delete all my posts?'; $lang['DELETE_USER_POSTS_CONFIRM'] = 'Are you sure you want to delete all of your users?'; $lang['USER_DELETED_POSTS'] = 'Posts were successfully removed'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index acb358918..4ccf881fb 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1014,8 +1014,8 @@ $lang['TZ']['11'] = 'GMT + 11'; $lang['TZ']['12'] = 'GMT + 12'; $lang['TZ']['13'] = 'GMT + 13'; -$lang['TODAY'] = 'Сегодня'; -$lang['YESTERDAY'] = 'Вчера'; +$lang['DATETIME']['TODAY'] = 'Сегодня'; +$lang['DATETIME']['YESTERDAY'] = 'Вчера'; $lang['DATETIME']['SUNDAY'] = 'Воскресенье'; $lang['DATETIME']['MONDAY'] = 'Понедельник'; @@ -1603,7 +1603,8 @@ $lang['USER_DELETE_ME'] = 'Извините, свой аккаунт запре $lang['USER_DELETE_CSV'] = 'Извините, этот аккаунт запрещено удалять!'; $lang['USER_DELETE_CONFIRM'] = 'Вы действительно хотите удалить этого пользователя?'; $lang['USER_DELETED'] = 'Пользователь был успешно удалён'; -$lang['DELETE_USER_POSTS'] = 'Удалить все сообщения пользователя'; +$lang['DELETE_USER_ALL_POSTS'] = 'Удалить все сообщения пользователя'; +$lang['DELETE_USER_POSTS'] = 'Удалить все сообщения, кроме заглавных'; $lang['DELETE_USER_POSTS_ME'] = 'Вы действительно хотите удалить все свои сообщения?'; $lang['DELETE_USER_POSTS_CONFIRM'] = 'Вы действительно хотите удалить все свои пользователя?'; $lang['USER_DELETED_POSTS'] = 'Сообщения успешно удалены'; diff --git a/upload/templates/board_disabled_exit.php b/upload/templates/board_disabled_exit.php index 7c93d5468..ffbc7d4f5 100644 --- a/upload/templates/board_disabled_exit.php +++ b/upload/templates/board_disabled_exit.php @@ -20,7 +20,7 @@ if (!empty($_POST['message'])) - <?php echo $bb_cfg['sitename']?> + <?php echo $bb_cfg['server_name']; ?>