From e02b3442cd7cf838ae3c1d65c9213f6f9d88dfc0 Mon Sep 17 00:00:00 2001
From: Eike Foken <kontakt@eikefoken.de>
Date: Thu, 8 Sep 2011 15:42:13 +0200
Subject: [PATCH] Fix project links in header

---
 application/core/MY_Config.php |  3 ++-
 application/views/header.php   | 19 +++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/application/core/MY_Config.php b/application/core/MY_Config.php
index 7d0ebfb..bdcbbf8 100644
--- a/application/core/MY_Config.php
+++ b/application/core/MY_Config.php
@@ -43,7 +43,8 @@ class MY_Config extends CI_Config {
 	 */
 	public function site_url($uri = '', $relative = true) {
 		$url = parent::site_url($uri);
-		return $relative ? parse_url($url, PHP_URL_PATH) : $url;
+		$parts = parse_url($url);
+		return $relative ? $parts['path'] . (isset($parts['query']) ? '?' . $parts['query'] : '') : $url;
 	}
 }
 
diff --git a/application/views/header.php b/application/views/header.php
index 138e017..060fbe2 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -33,21 +33,18 @@
 		<?=_('Current project:');?>&nbsp;
 		<select name="activeProject">
 <?php
-
 	// get the active project, if there is one
 	if ($this->input->get('active_project'))
 		$active_project = $this->project->getById($this->input->get('active_project'));
 	else
 		$active_project = false;
 
-	$projects = $this->project->getAll();
-
 	if(!$active_project):
 ?>
 			<option disabled="disabled" selected="selected"><strong><?=_('Select a project');?></strong></option>
 <?php
 	endif;
-	foreach ($projects as $project):
+	foreach ($this->project->getAll() as $project):
 ?>
 			<option title="<?=$project['name']?>" value="<?=site_url('projects/detail/' . $project['id']) . '?active_project=' . $project['id'];?>"<?=($active_project == $project['id']) ? ' selected' : '';?>><?=$project['mediumname'];?></option>
 <?php
@@ -55,7 +52,7 @@
 ?>
 		</select>
 	</div>
-	<div class="menu"><?= _('Hello,') ?> <a href="<?=base_url();?>"><?=$this->user->profile()->firstname;?> <?=$this->user->profile()->lastname;?></a>! | <?=lang_select('assets/images');?> | <a href="#"><?=_('Help');?></a> | <?=anchor('auth/settings', _('Settings'));?> | <?=anchor('auth/logout', _('Logout'));?></div>
+	<div class="menu"><?=_('Hello,');?> <a href="<?=site_url('users/' . $this->user->profile()->id);?>"><?=$this->user->profile()->firstname;?> <?=$this->user->profile()->lastname;?></a>! | <?=lang_select('assets/images');?> | <a href="#"><?=_('Help');?></a> | <?=anchor('auth/settings', _('Settings'));?> | <?=anchor('auth/logout', _('Logout'));?></div>
 </div>
 
 <div id="wrapper">
@@ -101,7 +98,7 @@
 		</div>
 
 		<div class="title">
-			<h2><a href="<?=site_url('projects');?>" title="<?=_('Show all projects');?>"><?=_('Projects');?></a></h2>
+			<h2><?=_('Projects');?></h2>
 		</div>
 		<div class="navigation">
 			<ul>
@@ -109,10 +106,9 @@
 					<a href="javascript:void(0);"><?=_('My projects');?></a>
 					<ul>
 <?php
-	$projects = $this->project->getOwn();
-	foreach ($projects as $project):
+	foreach ($this->project->getOwn() as $project):
 ?>
-						<li><a href="<?=site_url('projects/detail/' . $project['id']);?>"><?=$project['mediumname'];?></a></li>
+						<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
 <?php
 	endforeach;
 ?>
@@ -128,10 +124,9 @@
 					<a href="javascript:void(0);"><?=_('Public projects');?></a>
 					<ul>
 <?php
-	$projects = $this->project->getPublic();
-	foreach ($projects as $project):
+	foreach ($this->project->getPublic() as $project):
 ?>
-						<li><a href="<?=site_url('projects/detail/' . $project['id']);?>"><?=$project['mediumname'];?></a></li>
+						<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
 <?php
 	endforeach;
 ?>