r486

Черновики. ALTER TABLE `bb_topics` ADD COLUMN `is_draft` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `topic_show_first_post`; git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@486 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

install/sql/mysql.sql

@@ -1331,6 +1331,7 @@ CREATE TABLE IF NOT EXISTS `bb_topics` (
   `topic_dl_type` tinyint(1) NOT NULL DEFAULT '0',
   `topic_last_post_time` int(11) NOT NULL DEFAULT '0',
   `topic_show_first_post` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `is_draft` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`topic_id`),
   KEY `forum_id` (`forum_id`),
   KEY `topic_last_post_id` (`topic_last_post_id`),

upload/ajax.php

@@ -8,14 +8,12 @@ require('./common.php');
 $ajax->init();
 
 // Handle "board disabled via ON/OFF trigger"
-if (file_exists(BB_DISABLED))
-{
+if (file_exists(BB_DISABLED)) {
 	$ajax->ajax_die($bb_cfg['board_disabled_msg']);
 }
 
 // Load actions required modules
-switch ($ajax->action)
-{
+switch ($ajax->action) {
 	case 'view_post':
 		require(INC_DIR . 'bbcode.php');
 		break;
@@ -81,6 +79,7 @@ class ajax_common
 		'gen_passkey' => array('user'),
 		'change_torrent' => array('user'),
 		'change_tor_status' => array('user'),
+		'modify_draft' => array('user'),
 
 		'view_post' => array('guest'),
 		'view_torrent' => array('guest'),
@@ -110,42 +109,35 @@ class ajax_common
 		global $lang;
 
 		// Exit if we already have errors
-		if (!empty($this->response['error_code']))
-		{
+		if (!empty($this->response['error_code'])) {
 			$this->send();
 		}
 
 		// Check that requested action is valid
 		$action = $this->action;
 
-		if (!$action || !is_string($action))
-		{
+		if (!$action || !is_string($action)) {
 			$this->ajax_die('no action specified');
-		}
-		else if (!$action_params =& $this->valid_actions[$action])
-		{
+		} else if (!$action_params =& $this->valid_actions[$action]) {
 			$this->ajax_die('invalid action: ' . $action);
 		}
 
 		// Auth check
-		switch ($action_params[AJAX_AUTH])
-		{
+		switch ($action_params[AJAX_AUTH]) {
 			// GUEST
 			case 'guest':
 				break;
 
 			// USER
 			case 'user':
-				if (IS_GUEST)
-				{
+				if (IS_GUEST) {
 					$this->ajax_die($lang['NEED_TO_LOGIN_FIRST']);
 				}
 				break;
 
 			// MOD
 			case 'mod':
-				if (!IS_AM)
-				{
+				if (!IS_AM) {
 					$this->ajax_die($lang['ONLY_FOR_MOD']);
 				}
 				$this->check_admin_session();
@@ -153,8 +145,7 @@ class ajax_common
 
 			// ADMIN
 			case 'admin':
-				if (!IS_ADMIN)
-				{
+				if (!IS_ADMIN) {
 					$this->ajax_die($lang['ONLY_FOR_ADMIN']);
 				}
 				$this->check_admin_session();
@@ -198,8 +189,7 @@ class ajax_common
 	{
 		$this->response['action'] = $this->action;
 
-		if (DBG_USER && SQL_DEBUG && !empty($_COOKIE['sql_log']))
-		{
+		if (DBG_USER && SQL_DEBUG && !empty($_COOKIE['sql_log'])) {
 			$this->response['sql_log'] = get_sql_log();
 		}
 
@@ -212,20 +202,16 @@ class ajax_common
 	 */
 	function ob_handler($contents)
 	{
-		if (DBG_USER)
-		{
-			if ($contents)
-			{
+		if (DBG_USER) {
+			if ($contents) {
 				$this->response['raw_output'] = $contents;
 			}
 		}
 
 		$response_js = bb_json_encode($this->response);
 
-		if (GZIP_OUTPUT_ALLOWED && !defined('NO_GZIP'))
-		{
-			if (UA_GZIP_SUPPORTED && strlen($response_js) > 2000)
-			{
+		if (GZIP_OUTPUT_ALLOWED && !defined('NO_GZIP')) {
+			if (UA_GZIP_SUPPORTED && strlen($response_js) > 2000) {
 				header('Content-Encoding: gzip');
 				$response_js = gzencode($response_js, 1);
 			}
@@ -241,20 +227,15 @@ class ajax_common
 	{
 		global $user;
 
-		if (!$user->data['session_admin'])
-		{
-			if (empty($this->request['user_password']))
-			{
+		if (!$user->data['session_admin']) {
+			if (empty($this->request['user_password'])) {
 				$this->prompt_for_password();
-			}
-			else
-			{
+			} else {
 				$login_args = array(
 					'login_username' => $user->data['username'],
 					'login_password' => $_POST['user_password'],
 				);
-				if (!$user->login($login_args, true))
-				{
+				if (!$user->login($login_args, true)) {
 					$this->ajax_die('Wrong password');
 				}
 			}
@@ -291,8 +272,7 @@ class ajax_common
 
 		$is_auth = auth(AUTH_MOD, $forum_id, $userdata);
 
-		if (!$is_auth['auth_mod'])
-		{
+		if (!$is_auth['auth_mod']) {
 			$this->ajax_die($lang['ONLY_FOR_MOD']);
 		}
 	}
@@ -309,12 +289,10 @@ class ajax_common
 		$ranks = $datastore->get('ranks');
 		$rank_id = intval($this->request['rank_id']);
 
-		if (!$user_id = intval($this->request['user_id']) OR !$profiledata = get_userdata($user_id))
-		{
+		if (!$user_id = intval($this->request['user_id']) OR !$profiledata = get_userdata($user_id)) {
 			$this->ajax_die("invalid user_id: $user_id");
 		}
-		if ($rank_id != 0 && !isset($ranks[$rank_id]))
-		{
+		if ($rank_id != 0 && !isset($ranks[$rank_id])) {
 			$this->ajax_die("invalid rank_id: $rank_id");
 		}
 
@@ -332,19 +310,15 @@ class ajax_common
 		$user_id = (int)$this->request['user_id'];
 		$new_opt = bb_json_decode($this->request['user_opt']);
 
-		if (!$user_id OR !$u_data = get_userdata($user_id))
-		{
+		if (!$user_id OR !$u_data = get_userdata($user_id)) {
 			$this->ajax_die('invalid user_id');
 		}
-		if (!is_array($new_opt))
-		{
+		if (!is_array($new_opt)) {
 			$this->ajax_die('invalid new_opt');
 		}
 
-		foreach ($bf['user_opt'] as $opt_name => $opt_bit)
-		{
-			if (isset($new_opt[$opt_name]))
-			{
+		foreach ($bf['user_opt'] as $opt_name => $opt_bit) {
+			if (isset($new_opt[$opt_name])) {
 				setbit($u_data['user_opt'], $opt_bit, !empty($new_opt[$opt_name]));
 			}
 		}
@@ -363,21 +337,17 @@ class ajax_common
 
 		$req_uid = (int)$this->request['user_id'];
 
-		if ($req_uid == $userdata['user_id'] || IS_ADMIN)
-		{
-			if (empty($this->request['confirmed']))
-			{
+		if ($req_uid == $userdata['user_id'] || IS_ADMIN) {
+			if (empty($this->request['confirmed'])) {
 				$this->prompt_for_confirm($lang['BT_GEN_PASSKEY_NEW']);
 			}
 
-			if (!$passkey = generate_passkey($req_uid, IS_ADMIN))
-			{
+			if (!$passkey = generate_passkey($req_uid, IS_ADMIN)) {
 				$this->ajax_die('Could not insert passkey');
 			}
 			tracker_rm_user($req_uid);
 			$this->response['passkey'] = $passkey;
-		}
-		else $this->ajax_die($lang['NOT_AUTHORISED']);
+		} else $this->ajax_die($lang['NOT_AUTHORISED']);
 	}
 
 	// User groups membership
@@ -385,17 +355,14 @@ class ajax_common
 	{
 		global $lang, $user;
 
-		if (!$user_id = intval($this->request['user_id']) OR !$profiledata = get_userdata($user_id))
-		{
+		if (!$user_id = intval($this->request['user_id']) OR !$profiledata = get_userdata($user_id)) {
 			$this->ajax_die("invalid user_id: $user_id");
 		}
-		if (!$mode = (string) $this->request['mode'])
-		{
+		if (!$mode = (string)$this->request['mode']) {
 			$this->ajax_die('invalid mode (empty)');
 		}
 
-		switch ($mode)
-		{
+		switch ($mode) {
 			case 'get_group_list':
 				$sql = "
 					SELECT ug.user_pending, g.group_id, g.group_type, g.group_name, g.group_moderator, self.user_id AS can_view
@@ -406,27 +373,21 @@ class ajax_common
 					ORDER BY g.group_name
 				";
 				$html = array();
-				foreach (DB()->fetch_rowset($sql) as $row)
-				{
+				foreach (DB()->fetch_rowset($sql) as $row) {
 					$class = ($row['user_pending']) ? 'med' : 'med bold';
 					$class .= ($row['group_moderator'] == $user_id) ? ' colorMod' : '';
 					$href = "groupcp.php?g={$row['group_id']}";
 
-					if (IS_ADMIN)
-					{
+					if (IS_ADMIN) {
 						$href .= "&u=$user_id";
 						$link = '<a href="' . $href . '" class="' . $class . '" target="_blank">' . htmlCHR($row['group_name']) . '</a>';
 						$html[] = $link;
-					}
-					else
-					{
+					} else {
 						// скрытая группа и сам юзер не является её членом
-						if ($row['group_type'] == GROUP_HIDDEN && !$row['can_view'])
-						{
+						if ($row['group_type'] == GROUP_HIDDEN && !$row['can_view']) {
 							continue;
 						}
-						if ($row['group_moderator'] == $user->id)
-						{
+						if ($row['group_moderator'] == $user->id) {
 							$class .= ' selfMod';
 							$href .= "&amp;u=$user_id"; // сам юзер модератор этой группы
 						}
@@ -434,12 +395,9 @@ class ajax_common
 						$html[] = $link;
 					}
 				}
-				if ($html)
-				{
+				if ($html) {
 					$this->response['group_list_html'] = '<ul><li>' . join('</li><li>', $html) . '</li></ul>';
-				}
-				else
-				{
+				} else {
 					$this->response['group_list_html'] = $lang['GROUP_LIST_HIDDEN'];
 				}
 				break;
@@ -523,4 +481,29 @@ class ajax_common
 	{
 		require(AJAX_DIR . 'index_data.php');
 	}
+
+	function modify_draft()
+	{
+		global $userdata;
+		$tid = (int)$this->request["id_draft"];
+		$mode = (int)$this->request["mode"];
+		$sql = "SELECT * FROM " . BB_TOPICS . " WHERE topic_id = {$tid}";
+
+		if (!$row = DB()->fetch_row($sql)) {
+			$this->ajax_die("Нет такого черновика");
+		}
+
+		if ($row["topic_poster"] != $userdata["user_id"] && !IS_ADMIN) {
+			$this->ajax_die("Нельзя удалять чужие черновики");
+		}
+
+		print_r($mode);
+		if (!$mode) {
+			DB()->query("DELETE FROM `bb_topics` WHERE  `topic_id`={$tid} LIMIT 1;");
+		}else {
+			DB()->query("UPDATE `bb_topics` SET `is_draft`=0 WHERE  `topic_id`={$tid}");
+		}
+
+		$this->response["tid"] = $tid;
+	}
 }

upload/config.php

@@ -57,7 +57,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 pre-stable';
 $bb_cfg['tp_release_date'] = '08-01-2013';
-$bb_cfg['tp_release_state'] = 'R485';
+$bb_cfg['tp_release_state'] = 'R486';
 
 // Database
 $charset  = 'utf8';
@@ -529,3 +529,6 @@ $bb_cfg['captcha'] = array(
 
 // SEO
 $bb_cfg['seo_link_home_page'] = false;
+
+// Status of draft
+$bb_cfg['status_of_draft'] = true;

upload/includes/datastore/build_cat_forums.php

@@ -137,6 +137,7 @@ if ($bb_cfg['show_latest_news'] AND $news_forum_ids = $bb_cfg['latest_news_forum
 		FROM ". BB_TOPICS ."
 		WHERE forum_id IN ($news_forum_ids)
 	      AND topic_moved_id = 0
+	      AND is_draft = 0
 		ORDER BY topic_time DESC
 		LIMIT $news_count
 	");

upload/includes/functions_post.php

@@ -160,7 +160,9 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 
 		$topic_dl_type = (isset($_POST['topic_dl_type']) && ($post_info['allow_reg_tracker'] || $is_auth['auth_mod'])) ? TOPIC_DL_TYPE_DL : TOPIC_DL_TYPE_NORMAL;
 
-		$sql  = ($mode != "editpost") ? "INSERT INTO " . BB_TOPICS . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_dl_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_dl_type, $topic_vote)" : "UPDATE " . BB_TOPICS . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_dl_type = $topic_dl_type " . ((@$post_data['edit_vote'] || !empty($poll_title)) ? ", topic_vote = " . $topic_vote : "") . " WHERE topic_id = $topic_id";
+		$is_draft = (empty($_POST['to_draft'])) ? 0 : 1;
+
+		$sql  = ($mode != "editpost") ? "INSERT INTO " . BB_TOPICS . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_dl_type, topic_vote, is_draft) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_dl_type, $topic_vote, $is_draft)" : "UPDATE " . BB_TOPICS . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_dl_type = $topic_dl_type " . ((@$post_data['edit_vote'] || !empty($poll_title)) ? ", topic_vote = " . $topic_vote : "") . ", is_draft={$is_draft}" . " WHERE topic_id = $topic_id";
 
 		if (!DB()->sql_query($sql))
 		{

upload/includes/ucp/usercp_viewprofile.php

@@ -96,6 +96,9 @@ else if ($signature)
 	$signature = bbcode2html($signature);
 }
 
+$count_draft = DB()->fetch_row("SELECT COUNT(topic_id) as count FROM ". BB_TOPICS . " WHERE topic_poster = {$profiledata['user_id']} AND is_draft=1");
+$count_draft = $count_draft["count"];
+
 $template->assign_vars(array(
 	'PAGE_TITLE'           => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']),
 	'USERNAME'             => $profiledata['username'],
@@ -116,6 +119,8 @@ $template->assign_vars(array(
 	'LOCATION'             => $profiledata['user_from'],
 
 	'USER_ACTIVE'          => $profiledata['user_active'],
+	'COUNT_DRAFT'          => $count_draft,
+	'SEE_I'                => ($profiledata['user_id'] == $userdata['user_id'] || IS_ADMIN) ? true : false,
 
 	'OCCUPATION'           => $profiledata['user_occ'],
 	'INTERESTS'            => $profiledata['user_interests'],

upload/language/lang_russian/lang_main.php

@@ -379,6 +379,7 @@ $lang['MAX_SMILIES_PER_POST'] = 'Лимит в %s смайликов в сооб
 
 $lang['ATTACH_SIGNATURE'] = 'Присоединить подпись (можно изменять в профиле)';
 $lang['NOTIFY'] = 'Сообщать мне о получении ответа';
+$lang['TO_DRAFT'] = 'Сохранить как черновик';
 
 $lang['STORED'] = 'Ваше сообщение было успешно добавлено';
 $lang['DELETED'] = 'Ваше сообщение было успешно удалено';

upload/posting.php

@@ -321,9 +321,11 @@ if ($mode == 'newtopic' && $topic_tpl && $post_info['topic_tpl_id'])
 if ($submit || $refresh)
 {
 	$notify_user = (int) !empty($_POST['notify']);
+	$to_draft = (int) !empty($_POST['to_draft']);
 }
 else
 {
+	$to_draft = ($bb_cfg['status_of_draft']) ? $post_info['is_draft'] : false ;
 	$notify_user = bf($userdata['user_opt'], 'user_opt', 'notify');
 	if (!IS_GUEST && $mode != 'newtopic' && !$notify_user)
 	{
@@ -851,6 +853,7 @@ $template->assign_vars(array(
 	'U_VIEWTOPIC' => ( $mode == 'reply' ) ? "viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&postorder=desc" : '',
 
 	'S_NOTIFY_CHECKED' => ( $notify_user ) ? 'checked="checked"' : '',
+	'S_DRAFT_CHECKED' => ( $to_draft ) ? 'checked="checked"' : '',
 	'S_TYPE_TOGGLE' => $topic_type_toggle,
 	'S_TOPIC_ID' => $topic_id,
 	'S_POST_ACTION' => "posting.php",

upload/profile.php

@@ -20,6 +20,10 @@ switch ($mode)
 		require(INC_DIR . 'ucp/usercp_viewprofile.php');
 		break;
 
+	case 'viewdraft':
+		require(INC_DIR . 'ucp/usercp_viewdraft.php');
+		break;
+
 	case 'register':
 	case 'editprofile':
 		if ( !$userdata['session_logged_in'] && $mode == 'editprofile' )

upload/templates/default/posting.tpl

@@ -135,6 +135,12 @@
 		</tr>
 		<!-- ENDIF -->
 		</table>
+		<table class="borderless inline">
+		<tr>
+			<td><input type="checkbox" id="to_draft" name="to_draft" {S_DRAFT_CHECKED} /></td>
+			<td><label for="to_draft">{L_TO_DRAFT}</label></td>
+		</tr>
+		</table>
 	</div>
 	</td>
 </tr>

upload/templates/default/usercp_viewprofile.tpl

@@ -403,6 +403,12 @@ ajax.callback.gen_passkey = function(data){
 				<td id="ignore_srv_load">{L_ACCESS_SRV_LOAD}: <b class="editable">{IGNORE_SRV_LOAD}</b></td>
 			</tr>
 			<!-- ENDIF -->
+			<!-- IF SEE_I -->
+			<tr>
+				<th>Черновиков:</th>
+				<td><a href="./profile.php?mode=viewdraft&u={PROFILE_USER_ID}"><b>{COUNT_DRAFT}</b></a></td>
+			</tr>
+			<!-- ENDIF -->
 
 		    <tr>
 			    <td colspan="2" class="pad_4">

upload/triggers/cron_allowed

@@ -0,0 +1 @@
+xZ6v0bcwckAqvp506NFR

upload/viewforum.php

@@ -49,6 +49,7 @@ if (!$forum_id OR !$forum_data = @$forums['forum'][$forum_id])
 // Only new
 $only_new = $user->opt_js['only_new'];
 $only_new_sql = '';
+$no_draft = "AND `t`.`is_draft` = 0";
 if ($only_new == ONLY_NEW_POSTS)
 {
 	$only_new_sql = "AND t.topic_last_post_time > $lastvisit";
@@ -362,6 +363,7 @@ $sql = "
 		$only_new_sql
 		$title_match_sql
 		$limit_topics_time_sql
+		$no_draft
 	$order_sql
 	LIMIT $start, $topics_per_page
 ";