minor changes...

git-svn-id: file:///svn/phpbb/trunk@4738 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/ucp/ucp_attachments.php

@@ -12,7 +12,7 @@
 // -------------------------------------------------------------
 
 //
-// * Use this for ucp integration - changeable user id
+// * Use this for ACP integration - changeable user id
 //
 
 class ucp_attachments extends module
@@ -93,18 +93,21 @@ class ucp_attachments extends module
 		$sql = 'SELECT a.*, t.topic_title
 			FROM ' . ATTACHMENTS_TABLE . ' a, ' . TOPICS_TABLE . ' t
 			WHERE a.topic_id = t.topic_id
-				AND a.poster_id = ' . $user->data['user_id'] . '
+				AND a.poster_id = ' . $user->data['user_id'] . "
-			ORDER BY ' . $order_by;
+			ORDER BY $order_by";
 		$result = $db->sql_query_limit($sql, $config['posts_per_page'], $start);
 
-		$i = 0;
+		$row_count = 0;
-		while ($row = $db->sql_fetchrow($result))
+		if ($row = $db->sql_fetchrow($result))
+		{
+			$template->assign_var('S_ATTACHMENT_ROWS', true);
+
+			do
 			{
 				$view_topic = "{$phpbb_root_path}viewtopic.$phpEx$SID&t=" . $row['topic_id'] . '&p=' . $row['post_id'] . '#' . $row['post_id'];
 
 				$template->assign_block_vars('attachrow', array(
 					'ROW_NUMBER'		=> $i + ($start + 1),
-				'ATTACH_ID'			=> $row['attach_id'],
 					'FILENAME'			=> $row['real_filename'],
 					'COMMENT'			=> str_replace("\n", '<br />', $row['comment']),
 					'EXTENSION'			=> $row['extension'],
@@ -113,12 +116,17 @@ class ucp_attachments extends module
 					'POST_TIME'			=> $user->format_date($row['filetime'], $user->lang['DATE_FORMAT']),
 					'TOPIC_TITLE'		=> $row['topic_title'],
 
-				'S_ROW_COUNT'	=> $i,
+					'ATTACH_ID'			=> $row['attach_id'],
+					'POST_ID'			=> $row['post_id'],
+					'TOPIC_ID'			=> $row['topic_id'],
+				
+					'S_ROW_COUNT'		=> $row_count++,
 
 					'U_VIEW_ATTACHMENT'	=> $phpbb_root_path . 'download.' . $phpEx . $SID . '&amp;id=' . $row['attach_id'],
 					'U_VIEW_TOPIC'		=> $view_topic)
 				);
-			$i++;
+			} 
+			while ($row = $db->sql_fetchrow($result));
 		}
 		$db->sql_freeresult($result);
 

phpBB/includes/ucp/ucp_main.php

@@ -512,7 +512,7 @@ class ucp_main extends module
 				{
 					$drafts = (isset($_POST['d'])) ? implode(', ', array_map('intval', array_keys($_POST['d']))) : '';
 
-					if (!empty($drafts))
+					if ($drafts)
 					{
 						$sql = 'DELETE FROM ' . DRAFTS_TABLE . "
 							WHERE draft_id IN ($drafts) 
@@ -532,7 +532,7 @@ class ucp_main extends module
 					$draft_message = (isset($_POST['message'])) ? htmlspecialchars(trim(str_replace(array('\\\'', '\\"', '\\0', '\\\\'), array('\'', '"', '\0', '\\'), $_POST['message']))) : '';
 					$draft_message = preg_replace('#&(\#[0-9]+;)#', '&\1', $draft_message);
 
-					if ($draft_message != '' && $draft_subject != '')
+					if ($draft_message && $draft_subject)
 					{
 						$draft_row = array(
 							'draft_subject' => $draft_subject,
@@ -591,12 +591,7 @@ class ucp_main extends module
 				}
 				unset($topic_ids);
 				
-				if (sizeof($draftrows))
+				$template->assign_var('S_EDIT_DRAFT', $edit);
-				{
-					$template->assign_vars(array(
-						'S_DRAFT_ROWS' => true,
-						'S_EDIT_DRAFT' => $edit)
-					);
 
 				$row_count = 0;
 				foreach ($draftrows as $draft)
@@ -622,31 +617,31 @@ class ucp_main extends module
 					}
 						
 					$template_row = array(
-							'DRAFT_ID' => $draft['draft_id'],
 						'DATE'			=> $user->format_date($draft['save_time']),
 						'DRAFT_MESSAGE'	=> ($submit) ? $draft_message : $draft['draft_message'],
 						'DRAFT_SUBJECT'	=> ($submit) ? $draft_subject : $draft['draft_subject'],
-
 						'TITLE'			=> $title,
+
+						'DRAFT_ID'	=> $draft['draft_id'],
+						'FORUM_ID'	=> $draft['forum_id'],
+						'TOPIC_ID'	=> $draft['topic_id'],
+
 						'U_VIEW'		=> $view_url,
 						'U_VIEW_EDIT'	=> "ucp.$phpEx$SID&i=$id&mode=$mode&edit=" . $draft['draft_id'],
 						'U_INSERT'		=> $insert_url,
 
 						'S_ROW_COUNT'		=> $row_count++,
-							'S_HIDDEN_FIELDS' => $s_hidden_fields,
 						'S_LINK_TOPIC'		=> $link_topic,
-							'S_LINK_FORUM'	=> $link_forum
+						'S_LINK_FORUM'		=> $link_forum,
+						'S_HIDDEN_FIELDS'	=> $s_hidden_fields
 					);
 						
-						if ($edit)
+					($edit) ? $template->assign_vars($template_row) : $template->assign_block_vars('draftrow', $template_row);
+				}
+
+				if (!$edit)
 				{
-							$template->assign_vars($template_row);
+					$template->assign_vars('S_DRAFT_ROWS', $row_count);
-						}
-						else
-						{
-							$template->assign_block_vars('draftrow', $template_row);
-						}
-					}
 				}
 
 				break;

phpBB/styles/subSilver/template/ucp_attachments.html

@@ -13,7 +13,7 @@
 	</tr>
 </table>
 
-<!-- ELSEIF attachrow -->
+<!-- ELSEIF S_ATTACHMENT_ROWS -->
 
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
@@ -28,11 +28,7 @@
 
 	<!-- BEGIN attachrow -->
 
-	<!-- IF attach.S_ROW_COUNT is even -->
+		<!-- IF attachrow.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->
-	<tr class="row2">
-	<!-- ELSE -->
-	<tr class="row1">
-	<!-- ENDIF -->
 
 		<td class="gen" style="padding: 4px;" align="center" width="2%">&nbsp;{attachrow.ROW_NUMBER}&nbsp;</td>
 		<td style="padding: 4px;"><a class="gen" href="{attachrow.U_VIEW_ATTACHMENT}" target="file">{attachrow.FILENAME}</a><br /><span class="gensmall">{L_TOPIC}: <a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></span></td>
@@ -60,7 +56,10 @@
 
 <table class="tablebg" width="100%" cellspacing="1">
 	<tr>
-		<th>{L_UCP_NO_ATTACHMENTS}</th>
+		<th height="28">{L_UCP}</th>
+	</tr>
+	<tr class="row1">
+		<td height="25" align="center"><b class="genmed">{L_UCP_NO_ATTACHMENTS}</b></td>
 	</tr>
 </table>
 

phpBB/styles/subSilver/template/ucp_main_drafts.html

@@ -29,11 +29,7 @@
 
 	<!-- BEGIN draftrow -->
 
-	<!-- IF draftrow.S_ROW_COUNT is even -->
+		<!-- IF draftrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-	<tr class="row1">
-	<!-- ELSE -->
-	<tr class="row2">
-	<!-- ENDIF -->
 
 		<td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td>
 		<td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b><!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span><!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF --></td>
@@ -46,9 +42,11 @@
 	</tr>
 	<!-- END draftrow -->
 
+	<!-- IF S_DRAFT_ROWS -->
 	<tr>
 		<td class="cat" colspan="4" align="right"><input class="btnlite" type="submit" name="delete" value="{L_DELETE_MARKED}" />&nbsp;</td>
 	</tr>
+	<!-- ENDIF -->
 
 	<!-- ELSEIF S_EDIT_DRAFT -->
 	<tr>