[Phpbbproject-svn] SF.net SVN: phpbbproject: [272] trunk/phpbb3/root

[<lor...@us...>]

Revision: 272
          http://phpbbproject.svn.sourceforge.net/phpbbproject/?rev=272&view=rev
Author:   lord_le_brand
Date:     2008-04-27 07:01:00 -0700 (Sun, 27 Apr 2008)

Log Message:
-----------
Added constant PROJECT_BASE_URL to easily integrate into website

Modified Paths:
--------------
    trunk/phpbb3/root/includes/project/project_main.php
    trunk/phpbb3/root/includes/project/project_project.php
    trunk/phpbb3/root/includes/project/project_trackers.php
    trunk/phpbb3/root/project.php

Modified: trunk/phpbb3/root/includes/project/project_main.php
===================================================================
--- trunk/phpbb3/root/includes/project/project_main.php	2008-04-26 10:41:49 UTC (rev 271)
+++ trunk/phpbb3/root/includes/project/project_main.php	2008-04-27 14:01:00 UTC (rev 272)
@@ -49,7 +49,7 @@
 				{
 					$newest_project_id = $config['newest_project_id'];
 					$newest_project_title = $config['newest_project_title'];
-					$newest_project_link = '<a href="' . append_sid("{$phpbb_root_path}project.$phpEx", "i=project&amp;mode=view_info&amp;pr=$newest_project_id") . '">' . htmlspecialchars($newest_project_title) . '</a>';
+					$newest_project_link = '<a href="' . append_sid(PROJECT_BASE_URL, "i=project&amp;mode=view_info&amp;pr=$newest_project_id") . '">' . htmlspecialchars($newest_project_title) . '</a>';
 
 					$template->assign_vars(array(
 						'TOTAL_PROJECTS' => sprintf($user->lang['PROJECT_TOTAL_PROJECTS'], $config['project_num_projects']),
@@ -86,7 +86,7 @@
 							'DOWNLOADS' => $top_ten[$i]['project_downloads'],
 
 							'U_VIEW_TOPIC' => ($config['project_autopost_enable'] && $top_ten[$i]['topic_id']) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t={$top_ten[$i]['topic_id']}") : '',
-							'U_VIEW_PROJECT' => append_sid("{$phpbb_root_path}project.$phpEx", "i=project&amp;mode=view_info&amp;pr={$top_ten[$i]['project_id']}"),
+							'U_VIEW_PROJECT' => append_sid(PROJECT_BASE_URL, "i=project&amp;mode=view_info&amp;pr={$top_ten[$i]['project_id']}"),
 						));
 					}
 
@@ -172,8 +172,8 @@
 
 							'S_LAST_UPDATE'		=> ($last_update_id) ? true : false,
 
-							'U_LAST_UPDATE'		=> append_sid("{$phpbb_root_path}project.$phpEx", "i=project&amp;mode=view_info&amp;pr=$last_update_id"),
-							'U_CAT_URL'			=> append_sid("{$phpbb_root_path}project.$phpEx", "i=main&amp;mode=viewcat&amp;c={$categories[$i]['category_id']}"),
+							'U_LAST_UPDATE'		=> append_sid(PROJECT_BASE_URL, "i=project&amp;mode=view_info&amp;pr=$last_update_id"),
+							'U_CAT_URL'			=> append_sid(PROJECT_BASE_URL, "i=main&amp;mode=viewcat&amp;c={$categories[$i]['category_id']}"),
 						));
 
 						// If sub-categories should be displayed, and they are available, display them
@@ -196,7 +196,7 @@
 									'TITLE' => htmlspecialchars($sub_categories[$j]['category_title']),
 									'DESCRIPTION' => htmlspecialchars($sub_categories[$j]['category_description']),
 
-									'U_CAT_URL' => append_sid("{$phpbb_root_path}project.$phpEx", "i=main&amp;mode=viewcat&amp;c={$sub_categories[$j]['category_id']}"),
+									'U_CAT_URL' => append_sid(PROJECT_BASE_URL, "i=main&amp;mode=viewcat&amp;c={$sub_categories[$j]['category_id']}"),
 								));
 							}
 						}
@@ -290,7 +290,7 @@
 
 							'S_ROW_COUNT' => $i,
 
-							'U_VIEW_PROJECT' => append_sid("{$phpbb_root_path}project.$phpEx", "i=project&amp;mode=view_info&amp;pr={$projects[$i]['project_id']}"),
+							'U_VIEW_PROJECT' => append_sid(PROJECT_BASE_URL, "i=project&amp;mode=view_info&amp;pr={$projects[$i]['project_id']}"),
 							'U_VIEW_TOPIC' => ($config['project_autopost_enable']) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t={$projects[$i]['topic_id']}") : '',
 						));
 					}
@@ -409,12 +409,12 @@
 								trigger_error($user->lang['PROJECT_CREATE_FAILURE']);
 							}
 
-							$project_link	= '<a href="' . append_sid("{$phpbb_root_path}project.$phpEx", "i=project&amp;c={$data['project_category']}&amp;pr={$return_ary['project_id']}") . '">';
+							$project_link	= '<a href="' . append_sid(PROJECT_BASE_URL, "i=project&amp;c={$data['project_category']}&amp;pr={$return_ary['project_id']}") . '">';
 							$topic_link		= (isset($return_ary['topic_id'])) ? '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t={$return_ary['topic_id']}") . '">' : '';
 							$message		= $user->lang['PROJECT_CREATE_SUCCESS'];
 							$message		.= '<br /><br />' . sprintf($user->lang['PROJECT_VIEW_PROJECT'], $project_link, '</a>');
 							$message		.= (isset($return_ary['topic_id'])) ? '<br />' . sprintf($user->lang['PROJECT_VIEW_TOPIC'], $topic_link, '</a>') : '';
-							$message		.= '<br /><br />' . sprintf($user->lang['PROJECT_BACK_OVERVIEW'], '<a href="' . append_sid("{$phpbb_root_path}project.$phpEx", 'i=main') . '">', '</a>');
+							$message		.= '<br /><br />' . sprintf($user->lang['PROJECT_BACK_OVERVIEW'], '<a href="' . append_sid(PROJECT_BASE_URL, 'i=main') . '">', '</a>');
 
 							trigger_error($message);
 						}

Modified: trunk/phpbb3/root/includes/project/project_project.php
===================================================================
--- trunk/phpbb3/root/includes/project/project_project.php	2008-04-26 10:41:49 UTC (rev 271)
+++ trunk/phpbb3/root/includes/project/project_project.php	2008-04-27 14:01:00 UTC (rev 272)
@@ -58,7 +58,7 @@
 					'L_BACK_TO_CATEGORY'	=> sprintf($user->lang['PROJECT_BACK_TO_CATEGORY'], $project_info['category_title']),
 					'PROJECT_TITLE'			=> $project_info['project_title'],
 
-					'U_CATEGORY'			=> append_sid("{$phpbb_root_path}project.$phpEx", "i=main&amp;mode=viewcat&amp;c={$project_info['category_id']}&amp;pr=$project_id"),
+					'U_CATEGORY'			=> append_sid(PROJECT_BASE_URL, "i=main&amp;mode=viewcat&amp;c={$project_info['category_id']}&amp;pr=$project_id"),
 				));
 
 				$this->tpl_name = 'project_view_info';

Modified: trunk/phpbb3/root/includes/project/project_trackers.php
===================================================================
--- trunk/phpbb3/root/includes/project/project_trackers.php	2008-04-26 10:41:49 UTC (rev 271)
+++ trunk/phpbb3/root/includes/project/project_trackers.php	2008-04-27 14:01:00 UTC (rev 272)
@@ -3,7 +3,7 @@
  * phpBB Project
  *
  * @package phpbbproject
- * @version $Id:$
+ * @version $Id$
  * @copyright (c) 2008 phpBB Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  */
@@ -31,6 +31,10 @@
 		global $phpbb_root_path, $phpEx;
 		global $project_id, $category_id;
 
+		$tracker_id			= request_var('tid', 0);
+		$tracker_category	= request_var('tcat', 0);
+		$ticket_id			= request_var('ticket', 0);
+
 		switch ($mode)
 		{
 			default:
@@ -58,7 +62,7 @@
 						'TRACKER_TICKETS'		=> $trackers[$i]['tracker_tickets'],
 						'TRACKER_CATEGORIES'	=> $trackers[$i]['tracker_categories'],
 
-						'U_TRACKER'				=> append_sid("{$phpbb_root_path}project.$phpEx", "i=trackers&amp;mode=tickets&amp;tid={$trackers[$i]['tracker_id']}"),
+						'U_TRACKER'				=> append_sid(PROJECT_BASE_URL, "i=trackers&amp;mode=tickets&amp;tid={$trackers[$i]['tracker_id']}"),
 					));
 				}
 
@@ -66,13 +70,11 @@
 
 			case 'tickets':
 
-				$tracker_id = request_var('tid', 0);
-				$tracker_category = request_var('tcat', 0);
-
 				// Just redirect if $tracker_id is 0
 				if (!$tracker_id)
 				{
-					redirect(append_sid("{$phpbb_root_path}project.$phpEx", "i=trackers&amp;mode=overview"));
+					$url_extra = _module_trackers_url('tickets', array());
+					redirect(append_sid(PROJECT_BASE_URL, "i=trackers&amp;mode=overview"));
 				}
 
 				if ($tracker_category)
@@ -115,7 +117,7 @@
 						'TICKET_AUTHOR'		=> get_username_string('full', $tickets[$i]['ticket_author'], project_get_author_name($tickets[$i]['ticket_author'])),
 						'TICKET_TIME'		=> $user->format_date($tickets[$i]['ticket_time']),
 
-						'U_VIEW_TICKET'		=> append_sid("{$phpbb_root_path}project.$phpEx", "i=trackers&amp;view_ticket&amp;tid=$tracker_id&amp;ticket={$trackers[$i]['ticket_id']}"),
+						'U_VIEW_TICKET'		=> append_sid(PROJECT_BASE_URL, "i=trackers&amp;mode=view_ticket&amp;tid=$tracker_id&amp;ticket={$trackers[$i]['ticket_id']}"),
 					));
 				}
 

Modified: trunk/phpbb3/root/project.php
===================================================================
--- trunk/phpbb3/root/project.php	2008-04-26 10:41:49 UTC (rev 271)
+++ trunk/phpbb3/root/project.php	2008-04-27 14:01:00 UTC (rev 272)
@@ -21,6 +21,8 @@
 require("{$phpbb_root_path}includes/sources_project/extensions.$phpEx");
 require("{$phpbb_root_path}includes/sources_project/functions_project.$phpEx");
 
+define('PROJECT_BASE_URL', "{$phpbb_root_path}project.$phpEx");
+
 // phpBB Project Auth extension
 //unset($auth);
 //$auth = new project_auth();
@@ -92,7 +94,7 @@
 $module->load_active();
 
 // Assign data to the template engine for the list of modules
-$module->assign_tpl_vars(append_sid("{$phpbb_root_path}project.$phpEx"));
+$module->assign_tpl_vars(append_sid(PROJECT_BASE_URL));
 
 $template->assign_var('META', '<link href="' . $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/theme/phpbbproject.css" rel="stylesheet" media="screen, projection" />');
 
@@ -126,4 +128,20 @@
 	return $return;
 }
 
+function _module_trackers_url($mode, $module_row)
+{
+	global $category_id, $project_id;
+
+	$tracker_id			= request_var('tid', 0);
+	$tracker_category	= request_var('tcat', 0);
+	$ticket_id			= request_var('ticket', 0);
+
+	$return = ($category_id) ? "&amp;c=$category_id" : '';
+	$return .= ($project_id) ? "&amp;pr=$project_id" : '';
+	$return .= ($tracker_id) ? "&amp;tid=$tracker_id" : '';
+	$return .= ($tracker_category) ? "&amp;tcat=$tracker_category" : '';
+	$return .= ($ticket_id) ? "&amp;ticket=$ticket_id" : '';
+
+}
+
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.