- remove output buffering options from download.php (not needed anymore)

- optimized viewtopic.php a little bit
- removed the create_function (was consuming too much memory) from viewtopic
- check for manually added convert[.exe] program name to imagemagick path in admin_attachments
- reduced filesize checking for imagemagick program (some installations require less than 20k)
- added checked="checked" for "not selected" topic icon
- moved parse_text_display function from functions_posting.php to functions.php (see comment above function)
- check for user_id != ANONYMOUS in page_footer for displaying the administration link (there seems to be a problem checking for global options)
- rewrote attachment thumbnail functions - utilize GD2 functions if available, more uptodate checks...
- changed final thumbnail size calculation
- define S_ROW_COUNT within template class itself
- added SID to template vars in page_header
- added ability to view topic/forum within admin_viewlogs
- added optional acl checking to make_jumpbox, no need to duplicate the function for this small need
- added custom body file for confirm_box


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

phpBB/adm/admin_attachments.php

@@ -481,6 +481,9 @@ if ($mode == 'attach')
 		$new['img_imagick'] = search_imagemagick();
 	}
 
+	// We strip eventually manual added convert program, we only want the patch
+	$new['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $new['img_imagick']);
+
 	$select_size_mode = size_select('size', $size);
 	$select_quota_size_mode = size_select('quota_size', $quota_size);
 	$select_pm_size_mode = size_select('pm_size', $pm_size);
@@ -1467,7 +1470,7 @@ function search_imagemagick()
 
 		foreach ($locations as $location)
 		{
-			if (file_exists($location . 'convert' . $exe) && @is_readable($location . 'convert' . $exe) && @filesize($location . 'convert' . $exe) > 80000)
+			if (file_exists($location . 'convert' . $exe) && @is_readable($location . 'convert' . $exe) && @filesize($location . 'convert' . $exe) > 10000)
 			{
 				$imagick = str_replace('\\', '/', $location);
 				continue;

phpBB/adm/admin_forums.php

@@ -227,7 +227,7 @@ switch ($mode)
 			include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 
 			// Split text rules (we saved the status and bbcode codes here)
-			if (!strstr($forum_rules_flags, ':') && is_numeric($forum_rules_flags))
+			if (strpos($forum_rules_flags, ':') === false && is_numeric($forum_rules_flags))
 			{
 				// text not parsed yet... a hard time for us...
 				$forum_rules_flags = 0;

phpBB/adm/admin_viewlogs.php

@@ -152,13 +152,31 @@ if ($log_count)
 	for($i = 0; $i < sizeof($log_data); $i++)
 	{
 		$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
+		
 ?>
 	<tr>
 		<td class="<?php echo $row_class; ?>" nowrap="nowrap"><?php echo $log_data[$i]['username']; ?></td>
 		<td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><?php echo $log_data[$i]['ip']; ?></td>
 		<td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><?php echo $user->format_date($log_data[$i]['time']); ?></td>
-		<td class="<?php echo $row_class; ?>"><?php echo $log_data[$i]['action']; ?></td>
+		<td class="<?php echo $row_class; ?>"><?php 
+			echo $log_data[$i]['action']; 
+
+			$data = array();
+				
+			foreach (array('viewtopic', 'viewlogs', 'viewforum') as $check)
+			{
+				if ($log_data[$i][$check])
+				{
+					$data[] = '<a href="' . $log_data[$i][$check] . '">' . $user->lang['LOGVIEW_' . strtoupper($check)] . '</a>';
+				}
+			}
+
+			if (sizeof($data))
+			{
+				echo '<br />&#187; <span class="gensmall">[ ' . implode(' | ', $data) . ' ]</span>';
+			}
+?>
+		</td>
 		<td class="<?php echo $row_class; ?>" align="center" nowrap="nowrap"><input type="checkbox" name="mark[]" value="<?php echo $log_data[$i]['id']; ?>" /></td>
 	</tr>
 <?php