From 5c355fd027167b8cdfcc4dd7a9e4958ecd3d5cab Mon Sep 17 00:00:00 2001 From: Dark Nightmare Date: Wed, 6 Aug 2014 12:19:10 +0600 Subject: [PATCH] R594 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Добавлена дата создания группы Signed-off-by: Dark Nightmare --- install/sql/mysql.sql | 3 ++- upload/admin/admin_groups.php | 6 +++--- upload/group_config.php | 2 +- upload/groupcp.php | 3 ++- upload/templates/default/groupcp.tpl | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index c504b4165..e4965a3a6 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -789,7 +789,8 @@ INSERT INTO `bb_forums` VALUES (1, 1, 'Ваш первый форум', 'Опи CREATE TABLE IF NOT EXISTS `bb_groups` ( `group_id` mediumint(8) NOT NULL AUTO_INCREMENT, `avatar_ext_id` int(15) NOT NULL DEFAULT '0', - `group_time` int(11) NOT NULL DEFAULT '0', + `group_time` INT(11) NOT NULL DEFAULT '0', + `mod_time` INT(11) NOT NULL DEFAULT '0', `group_type` tinyint(4) NOT NULL DEFAULT '1', `release_group` tinyint(4) NOT NULL DEFAULT '0', `group_name` varchar(40) NOT NULL DEFAULT '', diff --git a/upload/admin/admin_groups.php b/upload/admin/admin_groups.php index 5d86807b3..d84ddf853 100644 --- a/upload/admin/admin_groups.php +++ b/upload/admin/admin_groups.php @@ -133,7 +133,7 @@ else if (!empty($_POST['group_update'])) { // Create user_group for new group's moderator add_user_into_group($group_id, $group_moderator); - $sql_ary['group_time'] = TIMENOW; + $sql_ary['mod_time'] = TIMENOW; // Delete old moderator's user_group if (isset($_POST['delete_old_moderator'])) @@ -155,8 +155,8 @@ else if (!empty($_POST['group_update'])) } else if ($mode == 'newgroup') { - $sql_ary['group_time'] = TIMENOW; - $sql_args = DB()->build_array('INSERT', $sql_ary); + $sql_ary['group_time'] = $sql_ary['mod_time'] = TIMENOW; + $sql_args = DB()->build_array('INSERT', $sql_ary); // Create new group DB()->query("INSERT INTO ". BB_GROUPS ." $sql_args"); diff --git a/upload/group_config.php b/upload/group_config.php index 4604389a8..d65f72dbf 100644 --- a/upload/group_config.php +++ b/upload/group_config.php @@ -33,7 +33,7 @@ if ($group_id) if ($is_moderator) { - // TODO Creation Date, Admin panel, Some tasty features + // TODO Admin panel, Some tasty features // Avatar if ($submit) diff --git a/upload/groupcp.php b/upload/groupcp.php index 4e94f85ac..718042fdc 100644 --- a/upload/groupcp.php +++ b/upload/groupcp.php @@ -515,6 +515,7 @@ else 'GROUP_DESCRIPTION' => bbcode2html($group_info['group_description']), 'GROUP_AVATAR' => get_avatar(GROUP_AVATAR_MASK . $group_id, $group_info['avatar_ext_id'], true), 'GROUP_DETAILS' => $group_details, + 'GROUP_TIME' => (!empty($group_info['group_time'])) ? sprintf('%s (%s)', bb_date($group_info['group_time']), delta_time($group_info['group_time'])) : $lang['NONE'], 'MOD_USER' => profile_url($group_moderator), 'MOD_AVATAR' => $avatar, 'MOD_FROM' => $from, @@ -523,7 +524,7 @@ else 'MOD_PM' => $pm, 'MOD_EMAIL' => $email, 'MOD_WWW' => $www, - 'MOD_TIME' => (!empty($group_info['group_time'])) ? bb_date($group_info['group_time']) : $lang['NONE'], + 'MOD_TIME' => (!empty($group_info['mod_time'])) ? bb_date($group_info['mod_time']) : $lang['NONE'], 'U_SEARCH_USER' => "search.php?mode=searchuser", 'U_GROUP_CONFIG' => "group_config.php?g=$group_id", diff --git a/upload/templates/default/groupcp.tpl b/upload/templates/default/groupcp.tpl index 2e8236c56..83760cc52 100644 --- a/upload/templates/default/groupcp.tpl +++ b/upload/templates/default/groupcp.tpl @@ -73,7 +73,7 @@ {L_GROUP_TIME} - {MOD_TIME} + {GROUP_TIME} {L_GROUP_MEMBERSHIP}: