Index: .htaccess
===================================================================
--- .htaccess	(revision 146)
+++ .htaccess	(working copy)
@@ -1 +1,12 @@
 AddDefaultCharset utf-8
+
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+  RewriteBase /projectpier
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !^/index\.php
+  RewriteRule (.*.gif|.*.png|.*.jpg|.*.pdf|.*.js|.*.css) $1 [L]
+  RewriteRule ^([0-9]+)/([a-zA-z]+)/([a-zA-z]+)?/?([0-9]+)?/?$ index.php?c=$2&a=$3&active_project=$1&id=$4 [QSA]
+  RewriteRule ^([a-zA-z]+)/([a-zA-z]+)?/?([0-9]+)?/?$ index.php?c=$1&a=$2&id=$3 [QSA]
+</IfModule>
Index: application/controllers/AccountController.class.php
===================================================================
--- application/controllers/AccountController.class.php	(revision 146)
+++ application/controllers/AccountController.class.php	(working copy)
@@ -48,7 +48,7 @@
       $company = $user->getCompany();
       if (!($company instanceof Company)) {
         flash_error(lang('company dnx'));
-        $this->redirectToReferer(get_url('administration'));
+        $this->redirectToReferer(get_url('administration', null, null, null, false));
       } // if
       
       if (!$user->canUpdateProfile(logged_user())) {
@@ -206,18 +206,18 @@
       $user = Users::findById(get_id());
       if (!($user instanceof User)) {
         flash_error(lang('user dnx'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       if (!$user->canUpdatePermissions(logged_user())) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $company = $user->getCompany();
       if (!($company instanceof Company)) {
         flash_error(lang('company dnx'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $projects = $company->getProjects();
Index: application/controllers/CommentController.class.php
===================================================================
--- application/controllers/CommentController.class.php	(revision 146)
+++ application/controllers/CommentController.class.php	(working copy)
@@ -111,7 +111,7 @@
     function edit() {
       $this->setTemplate('add_comment');
       
-      $redirect_to = active_project() instanceof Project ? active_project()->getOverviewUrl() : get_url('dashboard');
+      $redirect_to = active_project() instanceof Project ? active_project()->getOverviewUrl() : get_url('dashboard', null, null, null, false);
       
       $comment = Comments::findById(get_id());
       if (!($comment instanceof Comment)) {
@@ -181,7 +181,7 @@
     * @return null
     */
     function delete() {
-      $redirect_to = active_project() instanceof Project ? active_project()->getOverviewUrl() : get_url('dashboard');
+      $redirect_to = active_project() instanceof Project ? active_project()->getOverviewUrl() : get_url('dashboard', null, null, null, false);
       
       $comment = Comments::findById(get_id());
       if (!($comment instanceof Comment)) {
Index: application/controllers/CompanyController.class.php
===================================================================
--- application/controllers/CompanyController.class.php	(revision 146)
+++ application/controllers/CompanyController.class.php	(working copy)
@@ -309,12 +309,12 @@
       $company = Companies::findById(get_id());
       if (!($company instanceof Company)) {
         flash_error(lang('company dnx'));
-        $this->redirectToReferer(get_url('administration'));
+        $this->redirectToReferer(get_url('administration', null, null, null, false));
       } // if
       
       if ($company->isOwner()) {
         flash_error(lang('error owner company has all permissions'));
-        $this->redirectToReferer(get_url('administration'));
+        $this->redirectToReferer(get_url('administration', null, null, null, false));
       } // if
       
       $projects = Projects::getAll(Projects::ORDER_BY_NAME);
@@ -379,7 +379,7 @@
       $company = Companies::findById(get_id());
       if (!($company instanceof Company)) {
         flash_error(lang('company dnx'));
-        $this->redirectToReferer(get_url('administration', 'clients'));
+        $this->redirectToReferer(get_url('administration', 'clients', null, null, false));
       } // if
       
       tpl_assign('company', $company);
@@ -442,7 +442,7 @@
       $company = Companies::findById(get_id());
       if (!($company instanceof Company)) {
         flash_error(lang('company dnx'));
-        $this->redirectToReferer(get_url('administration', 'clients'));
+        $this->redirectToReferer(get_url('administration', 'clients', null, null, false));
       } // if
       
       try {
Index: application/controllers/ConfigController.class.php
===================================================================
--- application/controllers/ConfigController.class.php	(revision 146)
+++ application/controllers/ConfigController.class.php	(working copy)
@@ -35,12 +35,12 @@
       $category = ConfigCategories::findById(get_id());
       if (!($category instanceof ConfigCategory)) {
         flash_error(lang('config category dnx'));
-        $this->redirectToReferer(get_url('administration'));
+        $this->redirectToReferer(get_url('administration', null, null, null, false));
       } // if
       
       if ($category->isEmpty()) {
         flash_error(lang('config category is empty'));
-        $this->redirectToReferer(get_url('administration'));
+        $this->redirectToReferer(get_url('administration', null, null, null, false));
       } // if
       
       $options = $category->getOptions(false);
Index: application/controllers/FilesController.class.php
===================================================================
--- application/controllers/FilesController.class.php	(revision 146)
+++ application/controllers/FilesController.class.php	(working copy)
@@ -705,7 +705,7 @@
       $object = get_object_by_manager_and_id($object_id, $manager_class);
       if (!($object instanceof ProjectDataObject)) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $already_attached_files = $object->getAttachedFiles();
@@ -791,13 +791,13 @@
       $object = get_object_by_manager_and_id($object_id, $manager_class);
       if (!($object instanceof ProjectDataObject)) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $file = ProjectFiles::findById($file_id);
       if (!($file instanceof ProjectFile)) {
         flash_error(lang('file dnx'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $attached_file = AttachedFiles::findById(array(
@@ -808,7 +808,7 @@
       
       if (!($attached_file instanceof AttachedFile)) {
         flash_error(lang('file not attached to object'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       try {
Index: application/controllers/ProjectController.class.php
===================================================================
--- application/controllers/ProjectController.class.php	(revision 146)
+++ application/controllers/ProjectController.class.php	(working copy)
@@ -233,7 +233,7 @@
       
       if (!Project::canAdd(logged_user())) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $project = new Project();
@@ -342,7 +342,7 @@
       
       if (!$project->canEdit(logged_user())) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('administration', 'projects'));
+        $this->redirectToReferer(get_url('administration', 'projects', null, null, false));
       } // if
       
       $project_data = array_var($_POST, 'project');
@@ -393,7 +393,7 @@
       
       if (!$project->canDelete(logged_user())) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('administration', 'projects'));
+        $this->redirectToReferer(get_url('administration', 'projects', null, null, false));
       } // if
 
       $delete_data = array_var($_POST, 'deleteProject');
@@ -454,7 +454,7 @@
       
       if (!$project->canChangeStatus(logged_user())) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('administration', 'projects'));
+        $this->redirectToReferer(get_url('administration', 'projects', null, null, false));
       } // if
       
       try {
@@ -474,7 +474,7 @@
         flash_error(lang('error complete project'));
       } // try
       
-      $this->redirectToReferer(get_url('administration', 'projects'));
+      $this->redirectToReferer(get_url('administration', 'projects', null, null, false));
     } // complete
     
     /**
@@ -492,7 +492,7 @@
       
       if (!$project->canChangeStatus(logged_user())) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('administration', 'projects'));
+        $this->redirectToReferer(get_url('administration', 'projects', null, null, false));
       } // if
       
       try {
@@ -512,7 +512,7 @@
         flash_error(lang('error open project'));
       } // try
       
-      $this->redirectToReferer(get_url('administration', 'projects'));
+      $this->redirectToReferer(get_url('administration', 'projects', null, null, false));
     } // open
     
     /**
Index: application/controllers/UserController.class.php
===================================================================
--- application/controllers/UserController.class.php	(revision 146)
+++ application/controllers/UserController.class.php	(working copy)
@@ -49,7 +49,7 @@
       
       if (!User::canAdd(logged_user(), $company)) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $user = new User();
@@ -157,7 +157,7 @@
       
       if (!$user->canDelete(logged_user())) {
         flash_error(lang('no access permissions'));
-        $this->redirectToReferer(get_url('dashboard'));
+        $this->redirectToReferer(get_url('dashboard', null, null, null, false));
       } // if
       
       $delete_data = array_var($_POST, 'deleteUser');
Index: application/functions.php
===================================================================
--- application/functions.php	(revision 146)
+++ application/functions.php	(working copy)
@@ -96,20 +96,40 @@
   function get_url($controller_name = null, $action_name = null, $params = null, $anchor = null, $include_project_id = true) {
     $controller = trim($controller_name) ? $controller_name : DEFAULT_CONTROLLER;
     $action = trim($action_name) ? $action_name : DEFAULT_ACTION;
-    if (!is_array($params) && !is_null($params)) {
+    if (!is_null($params) && !is_array($params)) {
       $params = array('id' => $params);
     } // if
     
-    $url_params = array('c=' . $controller, 'a=' . $action);
+    $url_params = array();
+    $clean_url_params = array();
     
     if ($include_project_id) {
-      if (function_exists('active_project') && (active_project() instanceof Project)) {
-        if (!(is_array($params) && isset($params['active_project']))) {
-          $url_params[] = 'active_project=' . active_project()->getId();
-        } // if
-      } // if
-    } // if
+      if (is_array($params) && isset($params['active_project'])) {
+        $active_project = $params['active_project'];
+        unset($params['active_project']);
+      } elseif (function_exists('active_project') && (active_project() instanceof Project)) {
+        $active_project = active_project()->getId();
+      }
+      if (trim($active_project) <> '') {
+        if (!CLEAN_URL) {
+          $url_params[] = 'active_project=' . $active_project;
+        } else {
+          $clean_url_params[] = $active_project;
+        }
+      }
+    }
     
+    if (!CLEAN_URL) {
+      array_push($url_params, 'c=' . $controller, 'a=' . $action);
+    } else {
+      array_push($clean_url_params, $controller, $action);
+      if (isset($params['id']) && trim($params['id'] <> '')) {
+        $id = $params['id'];
+        unset($params['id']);
+        $clean_url_params[] = $id;
+      }
+    }
+            
     if (is_array($params)) {
       foreach ($params as $param_name => $param_value) {
         if (is_bool($param_value)) {
@@ -124,7 +144,11 @@
       $anchor = '#' . $anchor;
     } // if
     
-    return with_slash(ROOT_URL) . 'index.php?' . implode('&amp;', $url_params) . $anchor;
+    if (!CLEAN_URL) {
+      return with_slash(ROOT_URL).'index.php?'.implode('&amp;', $url_params).$anchor;
+    } else {
+      return with_slash(ROOT_URL).implode('/', $clean_url_params).'/'.(count($url_params) ? '?'.implode('&amp;', $url_params) : '').$anchor;
+    }
   } // get_url
   
   // ---------------------------------------------------
Index: application/helpers/application.php
===================================================================
--- application/helpers/application.php	(revision 146)
+++ application/helpers/application.php	(working copy)
@@ -33,7 +33,7 @@
     
     $system_notices = array();
     if (config_option('upgrade_check_enabled', false) && config_option('upgrade_last_check_new_version', false)) {
-      $system_notices[] = lang('new ProjectPier version available', get_url('administration', 'upgrade'));
+      $system_notices[] = lang('new ProjectPier version available', get_url('administration', 'upgrade', null, null, false));
     }
     
     if (count($system_notices)) {
Index: application/helpers/company_website.php
===================================================================
--- application/helpers/company_website.php	(revision 146)
+++ application/helpers/company_website.php	(working copy)
@@ -12,7 +12,7 @@
   * @return null
   */
   function dashboard_crumbs() {
-    add_bread_crumb(lang('dashboard'), get_url('dashboard'));
+    add_bread_crumb(lang('dashboard'), get_url('dashboard', null, null, null, false));
     
     $args = func_get_args();
     if (!count($args)) {
@@ -38,17 +38,17 @@
     add_tabbed_navigation_item(new TabbedNavigationItem(
       DASHBOARD_TAB_OVERVIEW, 
       lang('overview'), 
-      get_url('dashboard', 'index')
+      get_url('dashboard', 'index', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       DASHBOARD_TAB_MY_PROJECTS,
       lang('my projects'),
-      get_url('dashboard', 'my_projects')
+      get_url('dashboard', 'my_projects', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       DASHBOARD_TAB_MY_TASKS,
       lang('my tasks'),
-      get_url('dashboard', 'my_tasks')
+      get_url('dashboard', 'my_tasks', null, null, false)
     ));
     
     tabbed_navigation_set_selected($selected);
@@ -66,8 +66,8 @@
   * @return null
   */
   function administration_crumbs() {
-    add_bread_crumb(lang('dashboard'), get_url('dashboard'));
-    add_bread_crumb(lang('administration'), get_url('administration'));
+    add_bread_crumb(lang('dashboard'), get_url('dashboard', null, null, null, false));
+    add_bread_crumb(lang('administration'), get_url('administration', null, null, null, false));
     
     $args = func_get_args();
     if (!count($args)) {
@@ -98,42 +98,42 @@
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_ADMINISTRATION, 
       lang('index'), 
-      get_url('administration', 'index')
+      get_url('administration', 'index', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_COMPANY, 
       lang('company'), 
-      get_url('administration', 'company')
+      get_url('administration', 'company', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_MEMBERS,
       lang('members'),
-      get_url('administration', 'members')
+      get_url('administration', 'members', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_CLIENTS,
       lang('clients'),
-      get_url('administration', 'clients')
+      get_url('administration', 'clients', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_PROJECTS,
       lang('projects'),
-      get_url('administration', 'projects')
+      get_url('administration', 'projects', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_CONFIGURATION,
       lang('configuration'),
-      get_url('administration', 'configuration')
+      get_url('administration', 'configuration', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_TOOLS,
       lang('administration tools'),
-      get_url('administration', 'tools')
+      get_url('administration', 'tools', null, null, false)
     ));
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ADMINISTRATION_TAB_UPGRADE,
       lang('upgrade'),
-      get_url('administration', 'upgrade')
+      get_url('administration', 'upgrade', null, null, false)
     ));
     tabbed_navigation_set_selected($selected);
   } // administration_tabbed_navigation
@@ -150,8 +150,8 @@
   * @return null
   */
   function account_crumbs() {
-    add_bread_crumb(lang('dashboard'), get_url('dashboard'));
-    add_bread_crumb(lang('account'), get_url('account'));
+    add_bread_crumb(lang('dashboard'), get_url('dashboard', null, null, null, false));
+    add_bread_crumb(lang('account'), get_url('account', null, null, null, false));
     
     $args = func_get_args();
     if (!count($args)) {
@@ -175,7 +175,7 @@
     add_tabbed_navigation_item(new TabbedNavigationItem(
       ACCOUNT_TAB_MY_ACCOUNT, 
       lang('my account'), 
-      get_url('account', 'index')
+      get_url('account', 'index', null, null, false)
     ));
     tabbed_navigation_set_selected($selected);
   } // account_tabbed_navigation
Index: application/helpers/project_website.php
===================================================================
--- application/helpers/project_website.php	(revision 146)
+++ application/helpers/project_website.php	(working copy)
@@ -8,7 +8,7 @@
   */
   function project_crumbs() {
     
-    add_bread_crumb(lang('dashboard'), get_url('dashboard'));
+    add_bread_crumb(lang('dashboard'), get_url('dashboard', null, null, null, false));
     add_bread_crumb(active_project()->getName(), active_project()->getOverviewUrl());
     
     $args = func_get_args();
Index: application/layouts/account.php
===================================================================
--- application/layouts/account.php	(revision 146)
+++ application/layouts/account.php	(working copy)
@@ -20,7 +20,7 @@
       <!-- header -->
       <div id="headerWrapper">
         <div id="header">
-          <h1><a href="<?php echo get_url('account') ?>"><?php echo lang('my account') ?></a></h1>
+          <h1><a href="<?php echo get_url('account', null, null, null, false) ?>"><?php echo lang('my account') ?></a></h1>
           <div id="userboxWrapper"><?php echo render_user_box(logged_user()) ?></div>
         </div>
       </div>
Index: application/layouts/administration.php
===================================================================
--- application/layouts/administration.php	(revision 146)
+++ application/layouts/administration.php	(working copy)
@@ -21,7 +21,7 @@
       <!-- header -->
       <div id="headerWrapper">
         <div id="header">
-          <h1><a href="<?php echo get_url('administration') ?>"><?php echo lang('administration') ?></a></h1>
+          <h1><a href="<?php echo get_url('administration', null, null, null, false) ?>"><?php echo lang('administration') ?></a></h1>
           <div id="userboxWrapper"><?php echo render_user_box(logged_user()) ?></div>
         </div>
       </div>
Index: application/layouts/dashboard.php
===================================================================
--- application/layouts/dashboard.php	(revision 146)
+++ application/layouts/dashboard.php	(working copy)
@@ -20,7 +20,7 @@
       <!-- header -->
       <div id="headerWrapper">
         <div id="header">
-          <h1><a href="<?php echo get_url('dashboard', 'index') ?>"><?php echo clean(config_option('site_name', PRODUCT_NAME)) ?></a></h1>
+          <h1><a href="<?php echo get_url('dashboard', 'index', null, null, false) ?>"><?php echo clean(config_option('site_name', PRODUCT_NAME)) ?></a></h1>
           <div id="userboxWrapper"><?php echo render_user_box(logged_user()) ?></div>
         </div>
       </div>
Index: application/layouts/project_website.php
===================================================================
--- application/layouts/project_website.php	(revision 146)
+++ application/layouts/project_website.php	(working copy)
@@ -68,9 +68,6 @@
     'onblur' => 'if (value == \'\') value = \'' . $search_field_default_value . '\'');
 ?>
                 <?php echo input_field('search_for', array_var($_GET, 'search_for', $search_field_default_value), $search_field_attrs) ?><button type="submit"><?php echo lang('search button caption') ?></button>
-                <input type="hidden" name="c" value="project" />
-                <input type="hidden" name="a" value="search" />
-                <input type="hidden" name="active_project" value="<?php echo active_project()->getId() ?>" />
               </div>
             </form>
           </div>
Index: application/models/companies/Company.class.php
===================================================================
--- application/models/companies/Company.class.php	(revision 146)
+++ application/models/companies/Company.class.php	(working copy)
@@ -349,7 +349,7 @@
     * @return null
     */
     function getCardUrl() {
-      return get_url('company', 'card', $this->getId());
+      return get_url('company', 'card', $this->getId(), null, false);
     } // getCardUrl
     
     /**
@@ -361,9 +361,9 @@
     */
     function getViewUrl() {
       if ($this->getId() == owner_company()->getId()) {
-        return get_url('administration', 'company');
+        return get_url('administration', 'company', null, null, false);
       } else {
-        return get_url('company', 'view_client', $this->getId());
+        return get_url('company', 'view_client', $this->getId(), null, false);
       } // if
     } // getViewUrl
     
@@ -375,7 +375,7 @@
     * @return null
     */
     function getEditUrl() {
-      return $this->isOwner() ? get_url('company', 'edit') : get_url('company', 'edit_client', $this->getId());
+      return $this->isOwner() ? get_url('company', 'edit', null, null, false) : get_url('company', 'edit_client', $this->getId(), null, false);
     } // getEditUrl
     
     /**
@@ -386,7 +386,7 @@
     * @return string
     */
     function getDeleteClientUrl() {
-      return get_url('company', 'delete_client', $this->getId());
+      return get_url('company', 'delete_client', $this->getId(), null, false);
     } // getDeleteClientUrl
     
     /**
@@ -396,7 +396,7 @@
     * @return string
     */
     function getUpdatePermissionsUrl() {
-      return get_url('company', 'update_permissions', $this->getId());
+      return get_url('company', 'update_permissions', $this->getId(), null, false);
     } // getUpdatePermissionsUrl
     
     /**
@@ -407,7 +407,7 @@
     * @return string
     */
     function getAddUserUrl() {
-      return get_url('user', 'add', array('company_id' => $this->getId()));
+      return get_url('user', 'add', array('company_id' => $this->getId()), null, false);
     } // getAddUserUrl
     
     /**
@@ -418,7 +418,7 @@
     * @return string
     */
     function getEditLogoUrl() {
-      return get_url('company', 'edit_logo', $this->getId());
+      return get_url('company', 'edit_logo', $this->getId(), null, false);
     } // getEditLogoUrl
     
     /**
@@ -429,7 +429,7 @@
     * @return string
     */
     function getDeleteLogoUrl() {
-      return get_url('company', 'delete_logo', $this->getId());
+      return get_url('company', 'delete_logo', $this->getId(), null, false);
     } // getDeleteLogoUrl
     
     // ---------------------------------------------------
Index: application/models/config_categories/ConfigCategory.class.php
===================================================================
--- application/models/config_categories/ConfigCategory.class.php	(revision 146)
+++ application/models/config_categories/ConfigCategory.class.php	(working copy)
@@ -89,7 +89,7 @@
     * @return null
     */
     function getUpdateUrl() {
-      return get_url('config', 'update_category', $this->getId());
+      return get_url('config', 'update_category', $this->getId(), null, false);
     } // getUpdateUrl
     
   } // ConfigCategory 
Index: application/models/projects/Project.class.php
===================================================================
--- application/models/projects/Project.class.php	(revision 146)
+++ application/models/projects/Project.class.php	(working copy)
@@ -1175,7 +1175,7 @@
         ); // array
         return get_url('project', 'search', $params);
       } else {
-        return ROOT_URL . '/index.php';
+        return get_url('project', 'search');
       } // if
     } // getSearchUrl
     
Index: application/models/users/User.class.php
===================================================================
--- application/models/users/User.class.php	(revision 146)
+++ application/models/users/User.class.php	(working copy)
@@ -793,7 +793,7 @@
     * @return string
     */
     function getAccountUrl() {
-      return get_url('account', 'index');
+      return get_url('account', 'index', null, null, false);
     } // getAccountUrl
     
     /**
@@ -804,7 +804,7 @@
     * @return null
     */
     function getCardUrl() {
-      return get_url('user', 'card', $this->getId());
+      return get_url('user', 'card', $this->getId(), null, false);
     } // getCardUrl
     
     /**
@@ -815,7 +815,7 @@
     * @return string
     */
     function getEditUrl() {
-      return get_url('user', 'edit', $this->getId());
+      return get_url('user', 'edit', $this->getId(), null, false);
     } // getEditUrl
     
     /**
@@ -826,7 +826,7 @@
     * @return string
     */
     function getDeleteUrl() {
-      return get_url('user', 'delete', $this->getId());
+      return get_url('user', 'delete', $this->getId(), null, false);
     } // getDeleteUrl
     
     /**
@@ -841,7 +841,7 @@
         $attributes['redirect_to'] = str_replace('&amp;', '&', trim($redirect_to));
       } // if
       
-      return get_url('account', 'edit_profile', $attributes);
+      return get_url('account', 'edit_profile', $attributes, null, false);
     } // getEditProfileUrl
     
     /**
@@ -856,7 +856,7 @@
         $attributes['redirect_to'] = str_replace('&amp;', '&', trim($redirect_to));
       } // if
       
-      return get_url('account', 'edit_password', $attributes);
+      return get_url('account', 'edit_password', $attributes, null, false);
     } // getEditPasswordUrl
     
     /**
@@ -871,7 +871,7 @@
         $attributes['redirect_to'] = str_replace('&amp;', '&', trim($redirect_to));
       } // if
       
-      return get_url('account', 'update_permissions', $attributes);
+      return get_url('account', 'update_permissions', $attributes, null, false);
     } // getUpdatePermissionsUrl
     
     /**
@@ -886,7 +886,7 @@
         $attributes['redirect_to'] = str_replace('&amp;', '&', trim($redirect_to));
       } // if
       
-      return get_url('account', 'edit_avatar', $attributes);
+      return get_url('account', 'edit_avatar', $attributes, null, false);
     } // getUpdateAvatarUrl
     
     /**
@@ -901,7 +901,7 @@
         $attributes['redirect_to'] = str_replace('&amp;', '&', trim($redirect_to));
       } // if
       
-      return get_url('account', 'delete_avatar', $attributes);
+      return get_url('account', 'delete_avatar', $attributes, null, false);
     } // getDeleteAvatarUrl
     
     /**
Index: application/views/access/complete_installation.php
===================================================================
--- application/views/access/complete_installation.php	(revision 146)
+++ application/views/access/complete_installation.php	(working copy)
@@ -1,5 +1,5 @@
 <?php set_page_title(lang('complete installation')) ?>
-<form action="<?php echo get_url('access', 'complete_installation') ?>" method="post">
+<form action="<?php echo get_url('access', 'complete_installation', null, null, false) ?>" method="post">
 <?php tpl_display(get_template_path('form_errors')) ?>
 
   <p><?php echo lang('complete installation desc') ?></p>
Index: application/views/access/forgot_password.php
===================================================================
--- application/views/access/forgot_password.php	(revision 146)
+++ application/views/access/forgot_password.php	(working copy)
@@ -1,10 +1,10 @@
 <?php set_page_title(lang('forgot password')) ?>
-<form action="<?php echo get_url('access', 'forgot_password') ?>" method="post">
+<form action="<?php echo get_url('access', 'forgot_password', null, null, false) ?>" method="post">
 <?php tpl_display(get_template_path('form_errors')) ?>
   <div>
     <?php echo label_tag(lang('email address'), 'forgotPasswordEmail')  ?>
     <?php echo text_field('your_email', $your_email, array('class' => 'long', 'id' => 'forgotPasswordEmail')) ?>
   </div>
   <input type="hidden" name="submited" value="submited" />
-  <div id="forgotPasswordSubmit"><?php echo submit_button(lang('email me my password')) ?><span>(<a href="<?php echo get_url('access', 'login') ?>"><?php echo lang('login') ?></a>)</span></div>
+  <div id="forgotPasswordSubmit"><?php echo submit_button(lang('email me my password')) ?><span>(<a href="<?php echo get_url('access', 'login', null, null, false) ?>"><?php echo lang('login') ?></a>)</span></div>
 </form>
Index: application/views/access/login.php
===================================================================
--- application/views/access/login.php	(revision 146)
+++ application/views/access/login.php	(working copy)
@@ -1,5 +1,5 @@
 <?php set_page_title(lang('login')) ?>
-<form action="<?php echo get_url('access', 'login') ?>" method="post">
+<form action="<?php echo get_url('access', 'login', null, null, false) ?>" method="post">
 
 <?php tpl_display(get_template_path('form_errors')) ?>
 
@@ -25,6 +25,6 @@
 <?php } // foreach ?>
 <?php } // if ?>
   
-  <div id="loginSubmit"><?php echo submit_button(lang('login')) ?><span>(<a href="<?php echo get_url('access', 'forgot_password') ?>"><?php echo lang('forgot password') ?>?</a>)</span></div>
-  <!-- <p><a href="<?php echo get_url('access', 'forgot_password') ?>"><?php echo lang('forgot password') ?></a></p> -->
+  <div id="loginSubmit"><?php echo submit_button(lang('login')) ?><span>(<a href="<?php echo get_url('access', 'forgot_password', null, null, false) ?>"><?php echo lang('forgot password') ?>?</a>)</span></div>
+  <!-- <p><a href="<?php echo get_url('access', 'forgot_password', null, null, false) ?>"><?php echo lang('forgot password') ?></a></p> -->
 </form>
Index: application/views/account/edit_avatar.php
===================================================================
--- application/views/account/edit_avatar.php	(revision 146)
+++ application/views/account/edit_avatar.php	(working copy)
@@ -15,7 +15,7 @@
     } else {
       administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
       administration_crumbs(array(
-        array(lang('clients'), get_url('administration', 'clients')),
+        array(lang('clients'), get_url('administration', 'clients', null, null, false)),
         array($user->getCompany()->getName(), $user->getCompany()->getViewUrl()),
         array($user->getDisplayName(), $user->getCardUrl()),
         array(lang('update avatar'))
Index: application/views/account/edit_password.php
===================================================================
--- application/views/account/edit_password.php	(revision 146)
+++ application/views/account/edit_password.php	(working copy)
@@ -15,7 +15,7 @@
     } else {
       administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
       administration_crumbs(array(
-        array(lang('clients'), get_url('administration', 'clients')),
+        array(lang('clients'), get_url('administration', 'clients', null, null, false)),
         array($user->getCompany()->getName(), $user->getCompany()->getViewUrl()),
         array($user->getDisplayName(), $user->getCardUrl()),
         array(lang('change password'))
Index: application/views/account/edit_profile.php
===================================================================
--- application/views/account/edit_profile.php	(revision 146)
+++ application/views/account/edit_profile.php	(working copy)
@@ -15,7 +15,7 @@
     } else {
       administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
       administration_crumbs(array(
-        array(lang('clients'), get_url('administration', 'clients')),
+        array(lang('clients'), get_url('administration', 'clients', null, null, false)),
         array($company->getName(), $company->getViewUrl()),
         array($user->getDisplayName(), $user->getCardUrl()),
         array(lang('update profile'))
Index: application/views/account/update_permissions.php
===================================================================
--- application/views/account/update_permissions.php	(revision 146)
+++ application/views/account/update_permissions.php	(working copy)
@@ -11,7 +11,7 @@
   } else {
     administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
     administration_crumbs(array(
-      array(lang('clients'), get_url('administration', 'clients')),
+      array(lang('clients'), get_url('administration', 'clients', null, null, false)),
       array($user->getCompany()->getName(), $user->getCompany()->getViewUrl()),
       array($user->getDisplayName(), $user->getCardUrl()),
       array(lang('update permissions'))
Index: application/views/administration/clients.php
===================================================================
--- application/views/administration/clients.php	(revision 146)
+++ application/views/administration/clients.php	(working copy)
@@ -6,7 +6,7 @@
   administration_crumbs(lang('clients'));
   
   if (owner_company()->canAddClient(logged_user())) {
-    add_page_action(lang('add client'), get_url('company', 'add_client'));
+    add_page_action(lang('add client'), get_url('company', 'add_client', null, null, false));
   } // if
 
 ?>
Index: application/views/administration/index.php
===================================================================
--- application/views/administration/index.php	(revision 146)
+++ application/views/administration/index.php	(working copy)
@@ -11,12 +11,12 @@
   <div class="content">
     <?php echo lang('welcome to administration info') ?>
     <ul>
-      <li><a href="<?php echo get_url('administration', 'company') ?>"><?php echo lang('company') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'members') ?>"><?php echo lang('members') ?></a> (<a href="<?php echo owner_company()->getAddUserUrl() ?>"><?php echo lang('add user') ?></a>)</li>
-      <li><a href="<?php echo get_url('administration', 'clients') ?>"><?php echo lang('clients') ?></a> (<a href="<?php echo get_url('company', 'add_client') ?>"><?php echo lang('add client') ?></a>)</li>
-      <li><a href="<?php echo get_url('administration', 'projects') ?>"><?php echo lang('projects') ?></a> (<a href="<?php echo get_url('project', 'add') ?>"><?php echo lang('add project') ?></a>)</li>
-      <li><a href="<?php echo get_url('administration', 'configuration') ?>"><?php echo lang('configuration') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'upgrade') ?>"><?php echo lang('upgrade') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'company', null, null, false) ?>"><?php echo lang('company') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'members', null, null, false) ?>"><?php echo lang('members') ?></a> (<a href="<?php echo owner_company()->getAddUserUrl() ?>"><?php echo lang('add user') ?></a>)</li>
+      <li><a href="<?php echo get_url('administration', 'clients', null, null, false) ?>"><?php echo lang('clients') ?></a> (<a href="<?php echo get_url('company', 'add_client', null, null, false) ?>"><?php echo lang('add client') ?></a>)</li>
+      <li><a href="<?php echo get_url('administration', 'projects', null, null, false) ?>"><?php echo lang('projects') ?></a> (<a href="<?php echo get_url('project', 'add', null, null, false) ?>"><?php echo lang('add project') ?></a>)</li>
+      <li><a href="<?php echo get_url('administration', 'configuration', null, null, false) ?>"><?php echo lang('configuration') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'upgrade', null, null, false) ?>"><?php echo lang('upgrade') ?></a></li>
     </ul>
   </div>
 </div>
Index: application/views/administration/projects.php
===================================================================
--- application/views/administration/projects.php	(revision 146)
+++ application/views/administration/projects.php	(working copy)
@@ -6,7 +6,7 @@
   administration_crumbs(lang('projects'));
   
   if (Project::canAdd(logged_user())) {
-    add_page_action(lang('add project'), get_url('project', 'add'));
+    add_page_action(lang('add project'), get_url('project', 'add', null, null, false));
   } // if
 
 ?>
Index: application/views/administration/tool_mass_mailer.php
===================================================================
--- application/views/administration/tool_mass_mailer.php	(revision 146)
+++ application/views/administration/tool_mass_mailer.php	(working copy)
@@ -2,7 +2,7 @@
   set_page_title($tool->getDisplayName());
   administration_tabbed_navigation(ADMINISTRATION_TAB_TOOLS);
   administration_crumbs(array(
-    array(lang('administration tools'), get_url('administration', 'tools')),
+    array(lang('administration tools'), get_url('administration', 'tools', null, null, false)),
     array($tool->getDisplayName())
   ));
   add_stylesheet_to_page('admin/massmailer.css');
Index: application/views/administration/tool_test_email.php
===================================================================
--- application/views/administration/tool_test_email.php	(revision 146)
+++ application/views/administration/tool_test_email.php	(working copy)
@@ -2,7 +2,7 @@
   set_page_title($tool->getDisplayName());
   administration_tabbed_navigation(ADMINISTRATION_TAB_TOOLS);
   administration_crumbs(array(
-    array(lang('administration tools'), get_url('administration', 'tools')),
+    array(lang('administration tools'), get_url('administration', 'tools', null, null, false)),
     array($tool->getDisplayName())
   ));
 ?>
Index: application/views/application/user_box.php
===================================================================
--- application/views/application/user_box.php	(revision 146)
+++ application/views/application/user_box.php	(working copy)
@@ -1,12 +1,12 @@
 <div id="userbox">
-  <?php echo lang('welcome back', clean($_userbox_user->getDisplayName())) ?> (<a href="<?php echo get_url('access', 'logout') ?>" onclick="return confirm('<?php echo lang('confirm logout') ?>')"><?php echo lang('logout') ?></a>),
+  <?php echo lang('welcome back', clean($_userbox_user->getDisplayName())) ?> (<a href="<?php echo get_url('access', 'logout', null, null, false) ?>" onclick="return confirm('<?php echo lang('confirm logout') ?>')"><?php echo lang('logout') ?></a>),
   <ul>
     <li><a href="<?php echo logged_user()->getAccountUrl() ?>"><?php echo lang('account') ?></a> <?php echo render_icon('bullet_drop_down.gif', '', array('id' => 'account_more_icon', 'class' => 'PopupMenuWidgetAttachTo', 'title' => lang('enable javascript'))) ?></li>
 <?php if (isset($_userbox_projects) && is_array($_userbox_projects) && count($_userbox_projects)) { ?>
-    <li><a href="<?php echo get_url('dashboard', 'my_projects') ?>"><?php echo lang('projects') ?></a> <?php echo render_icon('bullet_drop_down.gif', '', array('id' => 'projects_more_icon', 'class' => 'PopupMenuWidgetAttachTo', 'title' => lang('enable javascript'))) ?></li>
+    <li><a href="<?php echo get_url('dashboard', 'my_projects', null, null, false) ?>"><?php echo lang('projects') ?></a> <?php echo render_icon('bullet_drop_down.gif', '', array('id' => 'projects_more_icon', 'class' => 'PopupMenuWidgetAttachTo', 'title' => lang('enable javascript'))) ?></li>
 <?php } // if ?>
 <?php if (logged_user()->isAdministrator()) { ?>
-    <li><a href="<?php echo get_url('administration') ?>"><?php echo lang('administration') ?></a> <?php echo render_icon('bullet_drop_down.gif', '', array('id' => 'administration_more_icon', 'class' => 'PopupMenuWidgetAttachTo', 'title' => lang('enable javascript'))) ?></li>
+    <li><a href="<?php echo get_url('administration', null, null, null, false) ?>"><?php echo lang('administration') ?></a> <?php echo render_icon('bullet_drop_down.gif', '', array('id' => 'administration_more_icon', 'class' => 'PopupMenuWidgetAttachTo', 'title' => lang('enable javascript'))) ?></li>
 <?php } // if ?>
   </ul>
   
@@ -19,8 +19,8 @@
     </ul>
     <p><?php echo lang('more') ?>:</p>
     <ul>
-      <li><a href="<?php echo get_url('dashboard', 'my_projects') ?>"><?php echo lang('my projects') ?></a></li>
-      <li><a href="<?php echo get_url('dashboard', 'my_tasks') ?>"><?php echo lang('my tasks') ?></a></li>
+      <li><a href="<?php echo get_url('dashboard', 'my_projects', null, null, false) ?>"><?php echo lang('my projects') ?></a></li>
+      <li><a href="<?php echo get_url('dashboard', 'my_tasks', null, null, false) ?>"><?php echo lang('my tasks') ?></a></li>
     </ul>
   </div>
   <script type="text/javascript">
@@ -47,13 +47,13 @@
   <div class="PopupMenuWidgetDiv" id="administration_more_menu">
     <p><?php echo lang('administration') ?>:</p>
     <ul>
-      <li><a href="<?php echo get_url('administration', 'company') ?>"><?php echo lang('company') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'members') ?>"><?php echo lang('members') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'clients') ?>"><?php echo lang('clients') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'projects') ?>"><?php echo lang('projects') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'configuration') ?>"><?php echo lang('configuration') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'tools') ?>"><?php echo lang('administration tools') ?></a></li>
-      <li><a href="<?php echo get_url('administration', 'upgrade') ?>"><?php echo lang('upgrade') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'company', null, null, false) ?>"><?php echo lang('company') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'members', null, null, false) ?>"><?php echo lang('members') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'clients', null, null, false) ?>"><?php echo lang('clients') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'projects', null, null, false) ?>"><?php echo lang('projects') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'configuration', null, null, false) ?>"><?php echo lang('configuration') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'tools', null, null, false) ?>"><?php echo lang('administration tools') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'upgrade', null, null, false) ?>"><?php echo lang('upgrade') ?></a></li>
     </ul>
   </div>
   <script type="text/javascript">
Index: application/views/company/add_company.php
===================================================================
--- application/views/company/add_company.php	(revision 146)
+++ application/views/company/add_company.php	(working copy)
@@ -4,21 +4,21 @@
     set_page_title(lang('edit company'));
     administration_tabbed_navigation(ADMINISTRATION_TAB_COMPANY);
     administration_crumbs(array(
-      array(lang('company'), get_url('administration', 'company')),
+      array(lang('company'), get_url('administration', 'company', null, null, false)),
       array(lang('edit company'))
     ));
   } else {
     set_page_title($company->isNew() ? lang('add client') : lang('edit client'));
     administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
     administration_crumbs(array(
-      array(lang('clients'), get_url('administration', 'clients')),
+      array(lang('clients'), get_url('administration', 'clients', null, null, false)),
       array($company->isNew() ? lang('add client') : lang('edit client'))
     ));
   } // if
 
 ?>
 <?php if ($company->isNew()) { ?>
-<form action="<?php echo get_url('company', 'add_client') ?>" method="post">
+<form action="<?php echo get_url('company', 'add_client', null, null, false) ?>" method="post">
 <?php } else { ?>
 <form action="<?php echo $company->getEditUrl() ?>" method="post">
 <?php } // if ?>
Index: application/views/company/del_company.php
===================================================================
--- application/views/company/del_company.php	(revision 146)
+++ application/views/company/del_company.php	(working copy)
@@ -20,5 +20,5 @@
     <?php echo password_field('deleteCompany[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
   </div>
     
-  <?php echo submit_button(lang('delete client')) ?> <a href="<?php echo get_url('administration','clients') ?>"><?php echo lang('cancel') ?></a>
+  <?php echo submit_button(lang('delete client')) ?> <a href="<?php echo get_url('administration','clients', null, null, false) ?>"><?php echo lang('cancel') ?></a>
 </form>
Index: application/views/company/edit_logo.php
===================================================================
--- application/views/company/edit_logo.php	(revision 146)
+++ application/views/company/edit_logo.php	(working copy)
@@ -4,13 +4,13 @@
   if ($company->isOwner()) {
     administration_tabbed_navigation(ADMINISTRATION_TAB_COMPANY);
     administration_crumbs(array(
-      array(lang('company'), get_url('administration', 'company')),
+      array(lang('company'), get_url('administration', 'company', null, null, false)),
       array(lang('edit company logo'))
     ));
   } else {
     administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
     administration_crumbs(array(
-      array(lang('clients'), get_url('administration', 'clients')),
+      array(lang('clients'), get_url('administration', 'clients', null, null, false)),
       array($company->getName(), $company->getViewUrl()),
       array(lang('edit company logo'))
     ));
Index: application/views/company/update_permissions.php
===================================================================
--- application/views/company/update_permissions.php	(revision 146)
+++ application/views/company/update_permissions.php	(working copy)
@@ -3,7 +3,7 @@
   set_page_title(lang('update permissions'));
   administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
   administration_crumbs(array(
-    array(lang('clients'), get_url('administration', 'clients')),
+    array(lang('clients'), get_url('administration', 'clients', null, null, false)),
     array($company->getName(), $company->getViewUrl()),
     array(lang('update permissions'))
   ));
Index: application/views/company/view_company.php
===================================================================
--- application/views/company/view_company.php	(revision 146)
+++ application/views/company/view_company.php	(working copy)
@@ -7,7 +7,7 @@
   } else {
     administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
     administration_crumbs(array(
-      array(lang('clients'), get_url('administration', 'clients')),
+      array(lang('clients'), get_url('administration', 'clients', null, null, false)),
       array($company->getName())
     ));
   } // if
Index: application/views/config/update_category.php
===================================================================
--- application/views/config/update_category.php	(revision 146)
+++ application/views/config/update_category.php	(working copy)
@@ -2,7 +2,7 @@
   set_page_title($category->getDisplayName());
   administration_tabbed_navigation(ADMINISTRATION_TAB_CONFIGURATION);
   administration_crumbs(array(
-    array(lang('configuration'), get_url('administration', 'configuration')),
+    array(lang('configuration'), get_url('administration', 'configuration', null, null, false)),
     array($category->getDisplayName())
   ));
   add_stylesheet_to_page('admin/config.css');
Index: application/views/dashboard/index.php
===================================================================
--- application/views/dashboard/index.php	(revision 146)
+++ application/views/dashboard/index.php	(working copy)
@@ -6,7 +6,7 @@
   dashboard_crumbs(lang('overview'));
   
   if (Project::canAdd(logged_user())) {
-    add_page_action(lang('add project'), get_url('project', 'add'));
+    add_page_action(lang('add project'), get_url('project', 'add', null, null, false));
   } // if
   
   add_stylesheet_to_page('project/project_log.css');
@@ -20,10 +20,10 @@
   
 <?php if (owner_company()->isInfoUpdated()) { ?>
   <div class="header"><del><?php echo lang('new account step1') ?></del></div>
-  <div class="content"><del><?php echo lang('new account step1 info', get_url('company', 'edit')) ?></del></div>
+  <div class="content"><del><?php echo lang('new account step1 info', get_url('company', 'edit', null, null, false)) ?></del></div>
 <?php } else { ?>
   <div class="header"><?php echo lang('new account step1') ?></div>
-  <div class="content"><?php echo lang('new account step1 info', get_url('company', 'edit')) ?></div>
+  <div class="content"><?php echo lang('new account step1 info', get_url('company', 'edit', null, null, false)) ?></div>
 <?php } // if ?>
   
 <?php if (owner_company()->countUsers() > 1) { ?>
@@ -36,21 +36,21 @@
   
 <?php if (owner_company()->countClientCompanies() > 0) { ?>
   <div class="header"><del><?php echo lang('new account step3') ?></del></div>
-  <div class="content"><del><?php echo lang('new account step3 info', get_url('company', 'add_client')) ?></del></div>
+  <div class="content"><del><?php echo lang('new account step3 info', get_url('company', 'add_client', null, null, false)) ?></del></div>
 <?php } else { ?>
   <div class="header"><?php echo lang('new account step3') ?></div>
-  <div class="content"><?php echo lang('new account step3 info', get_url('company', 'add_client')) ?></div>
+  <div class="content"><?php echo lang('new account step3 info', get_url('company', 'add_client', null, null, false)) ?></div>
 <?php } // if ?>
   
 <?php if (owner_company()->countProjects() > 0) { ?>
   <div class="header"><del><?php echo lang('new account step4') ?></del></div>
-  <div class="content"><del><?php echo lang('new account step4 info', get_url('project', 'add')) ?></del></div>
+  <div class="content"><del><?php echo lang('new account step4 info', get_url('project', 'add', null, null, false)) ?></del></div>
 <?php } else { ?>
   <div class="header"><?php echo lang('new account step4') ?></div>
-  <div class="content"><?php echo lang('new account step4 info', get_url('project', 'add')) ?></div>
+  <div class="content"><?php echo lang('new account step4 info', get_url('project', 'add', null, null, false)) ?></div>
 <?php } // if?>
   
-  <p><a href="<?php echo get_url('company', 'hide_welcome_info') ?>"><?php echo lang('hide welcome info') ?></a></p>
+  <p><a href="<?php echo get_url('company', 'hide_welcome_info', null, null, false) ?>"><?php echo lang('hide welcome info') ?></a></p>
   
 </div>
 <?php } // if ?>
Index: application/views/dashboard/index_sidebar.php
===================================================================
--- application/views/dashboard/index_sidebar.php	(revision 146)
+++ application/views/dashboard/index_sidebar.php	(working copy)
@@ -23,7 +23,7 @@
       <li><a href="<?php echo $my_project->getOverviewUrl() ?>"><?php echo clean($my_project->getName()) ?></a></li>
 <?php } // foreach ?>
     </ul>
-    <p><a href="<?php echo get_url('dashboard', 'my_projects') ?>">&raquo; <?php echo lang('my projects') ?></a></p>
+    <p><a href="<?php echo get_url('dashboard', 'my_projects', null, null, false) ?>">&raquo; <?php echo lang('my projects') ?></a></p>
   </div>
 </div>
 <?php } // if ?>
Index: application/views/dashboard/my_projects.php
===================================================================
--- application/views/dashboard/my_projects.php	(revision 146)
+++ application/views/dashboard/my_projects.php	(working copy)
@@ -5,7 +5,7 @@
   dashboard_crumbs(lang('my projects'));
   
   if (Project::canAdd(logged_user())) {
-    add_page_action(lang('add project'), get_url('project', 'add'));
+    add_page_action(lang('add project'), get_url('project', 'add', null, null, false));
   } // if
 
 ?>
Index: application/views/project/add_project.php
===================================================================
--- application/views/project/add_project.php	(revision 146)
+++ application/views/project/add_project.php	(working copy)
@@ -4,21 +4,21 @@
     set_page_title(lang('add project'));
     administration_tabbed_navigation(ADMINISTRATION_TAB_PROJECTS);
     administration_crumbs(array(
-      array(lang('projects'), get_url('administration', 'projects')),
+      array(lang('projects'), get_url('administration', 'projects', null, null, false)),
       array(lang('add project'))
     ));
   } else {
     set_page_title(lang('edit project'));
     administration_tabbed_navigation(ADMINISTRATION_TAB_PROJECTS);
     administration_crumbs(array(
-      array(lang('projects'), get_url('administration', 'projects')),
+      array(lang('projects'), get_url('administration', 'projects', null, null, false)),
       array(lang('edit project'))
     ));
   } // if
   
 ?>
 <?php if ($project->isNew()) { ?>
-<form action="<?php echo get_url('project', 'add') ?>" method="post">
+<form action="<?php echo get_url('project', 'add', null, null, false) ?>" method="post">
 <?php } else { ?>
 <form action="<?php echo $project->getEditUrl() ?>" method="post">
 <?php } // if ?>
Index: application/views/project/del_project.php
===================================================================
--- application/views/project/del_project.php	(revision 146)
+++ application/views/project/del_project.php	(working copy)
@@ -20,5 +20,5 @@
     <?php echo password_field('deleteProject[password]', null, array('id' => 'loginPassword', 'class' => 'medium')) ?>
   </div>
 
-  <?php echo submit_button(lang('delete project')) ?> <a href="<?php echo get_url('administration','projects') ?>"><?php echo lang('cancel') ?></a>
+  <?php echo submit_button(lang('delete project')) ?> <a href="<?php echo get_url('administration','projects', null, null, false) ?>"><?php echo lang('cancel') ?></a>
 </form>
Index: application/views/project/search.php
===================================================================
--- application/views/project/search.php	(revision 146)
+++ application/views/project/search.php	(working copy)
@@ -9,9 +9,6 @@
 <div id="searchForm">
   <form action="<?php echo active_project()->getSearchUrl() ?>" method="get">
     <?php echo input_field('search_for', array_var($_GET, 'search_for')) ?>
-    <input type="hidden" name="c" value="project" />
-    <input type="hidden" name="a" value="search" />
-    <input type="hidden" name="active_project" value="<?php echo active_project()->getId() ?>" />
     <?php echo submit_button(lang('search')) ?>
   </form>
 </div>
Index: application/views/user/add_user.php
===================================================================
--- application/views/user/add_user.php	(revision 146)
+++ application/views/user/add_user.php	(working copy)
@@ -10,7 +10,7 @@
   } else {
     administration_tabbed_navigation(ADMINISTRATION_TAB_CLIENTS);
     administration_crumbs(array(
-      array(lang('clients'), get_url('administration', 'clients')),
+      array(lang('clients'), get_url('administration', 'clients', null, null, false)),
       array($company->getName(), $company->getViewUrl()),
       array($user->isNew() ? lang('add user') : lang('edit user'))
     ));
Index: init.php
===================================================================
--- init.php	(revision 146)
+++ init.php	(working copy)
@@ -49,7 +49,13 @@
   // If script is not installed config.php will return false. Othervise it will
   // return NULL. If we get false redirect to install folder
   if (!include_once(ROOT . '/config/config.php')) {
-    print "ProjectPier is not installed. Please redirect your browser to <b><a href=\"./". PUBLIC_FOLDER . "/install\">" . PUBLIC_FOLDER . "/install</a></b> folder and follow installation procedure";
+    if ((strtolower($_SERVER['HTTPS']) == 'on') || ($_SERVER['SERVER_PORT'] == 443)) {
+      $protocol = 'https://';
+    } else {
+      $protocol = 'http://';
+    } // if
+
+    print "ProjectPier is not installed. Please redirect your browser to <b><a href=\"".$protocol.$_SERVER['HTTP_HOST'].substr($_SERVER[PHP_SELF], 0, -9). PUBLIC_FOLDER . "/install/index.php\">" . PUBLIC_FOLDER . "/install</a></b> folder and follow installation procedure";
     die();
   } // if
   
Index: public/install/console.php
===================================================================
--- public/install/console.php	(revision 146)
+++ public/install/console.php	(working copy)
@@ -14,7 +14,8 @@
   $installation->setDatabaseName((string) trim(array_var($argv, 5)));
   $installation->setTablePrefix((string) trim(array_var($argv, 6)));
   $installation->setAbsoluteUrl((string) trim(array_var($argv, 7)));
-  
+  $installation->setCleanUrl((string) trim(array_var($argv, 8)));
+    
   $installation->execute();
 
 ?>
Index: public/install/installation/acInstallation.class.php
===================================================================
--- public/install/installation/acInstallation.class.php	(revision 146)
+++ public/install/installation/acInstallation.class.php	(working copy)
@@ -1,4 +1,4 @@
-<?php
+<?php
 
   final class acInstallation {
     
@@ -64,6 +64,13 @@
     * @var string
     */
     private $absolute_url;
+    
+    /**
+     * Clean URL
+     * 
+     * @var boolean
+     */
+    private $clean_url;
   
     /**
     * Constructor
@@ -83,14 +90,15 @@
     * @return boolean
     */
     function execute() {
-      $database_type   = $this->getDatabaseType();
-      $database_host   = $this->getDatabaseHost();
-      $database_user   = $this->getDatabaseUsername();
-      $database_pass   = $this->getDatabasePassword();
-      $database_name   = $this->getDatabaseName();
-      $database_prefix = $this->getTablePrefix();
-      $absolute_url    = $this->getAbsoluteUrl();
-      $installkey      = sha1(date('l dS \of F Y h:i:s A').$_SERVER['REMOTE_ADDR'].rand(10000,99999));
+      $database_type    = $this->getDatabaseType();
+      $database_host    = $this->getDatabaseHost();
+      $database_user    = $this->getDatabaseUsername();
+      $database_pass    = $this->getDatabasePassword();
+      $database_name    = $this->getDatabaseName();
+      $database_prefix  = $this->getTablePrefix();
+      $absolute_url     = $this->getAbsoluteUrl();
+      $clean_url        = $this->getCleanUrl();
+      $installkey       = sha1(date('l dS \of F Y h:i:s A').$_SERVER['REMOTE_ADDR'].rand(10000,99999));
       
       $connected = false;
       if ($this->database_connection = @mysql_connect($database_host, $database_user, $database_pass)) {
@@ -114,24 +122,23 @@
       } // if
       
       $constants = array(
-        'DB_ADAPTER'           => $database_type,
-        'DB_HOST'              => $database_host,
-        'DB_USER'              => $database_user,
-        'DB_PASS'              => $database_pass,
-        'DB_NAME'              => $database_name,
-        'DB_PERSIST'           => true,
-        'TABLE_PREFIX'         => $database_prefix,
-        'ROOT_URL'             => $absolute_url,
-        'DEFAULT_LOCALIZATION' => 'en_us',
-        'DEBUG'                => false,
-        'PRODUCT_VERSION'      => require INSTALLATION_PATH . '/version.php',
-        'SHOW_MESSAGE_BODY'    => true,
-        'SHOW_COMMENT_BODY'    => true,
-        'SHOW_MILESTONE_BODY'  => true,
-        'TOKEN_COOKIE_NAME'    => $installkey,
-
+        'DB_ADAPTER'            => $database_type,
+        'DB_HOST'               => $database_host,
+        'DB_USER'               => $database_user,
+        'DB_PASS'               => $database_pass,
+        'DB_NAME'               => $database_name,
+        'DB_PERSIST'            => true,
+        'TABLE_PREFIX'          => $database_prefix,
+        'ROOT_URL'              => $absolute_url,
+        'DEFAULT_LOCALIZATION'  => 'en_us',
+        'DEBUG'                 => false,
+        'PRODUCT_VERSION'       => require INSTALLATION_PATH . '/version.php',
+        'SHOW_MESSAGE_BODY'     => true,
+        'SHOW_COMMENT_BODY'     => true,
+        'SHOW_MILESTONE_BODY'   => true,
+        'TOKEN_COOKIE_NAME'     => $installkey,
+        'CLEAN_URL'             => $clean_url,
       ); // array
-      
       tpl_assign('table_prefix', $database_prefix);
       tpl_assign('absolute_url', $absolute_url);
       
@@ -175,8 +182,13 @@
         return $this->breakExecution('Failed to write config data into config file');
       } // if
       
+      if ($this->writeHtaccessFile($constants)) {
+        $this->printMessage('.htaccess file has been successfully written');
+      } else {
+        return $this->breakExecution('Failed to write config data into .htaccess file');
+      }
       return true;
-    } // excute
+    } // execute
     
     // ---------------------------------------------------
     //  Util methods
@@ -210,6 +222,17 @@
     } // writeConfigFile
     
     /**
+     * Write RewriteBase in .htaccess file
+     * @access public
+     * @param array($constants)
+     * @return boolean
+     */
+    function writeHtaccessFile($constants) {
+      tpl_assign('config_file_constants', $constants);
+      return file_put_contents(INSTALLATION_PATH.'.htaccess', tpl_fetch(get_template_path('htaccess.php')));
+    }
+    
+    /**
     * This function will return true if server we are connected on has InnoDB support
     *
     * @param void
@@ -448,6 +471,26 @@
       $this->absolute_url = $value;
     } // setAbsoluteUrl
   
+    /**
+    * Get clean_url
+    * 
+    * @param null
+    * @return boolean
+    */
+    function getCleanUrl() {
+      return $this->clean_url;
+    } // getCleanUrl
+    
+    /**
+     * Set clean_url
+     * 
+     * @param boolean $value
+     * @return null
+     */
+    function setCleanUrl($value) {
+      $this->clean_url = ($value?true:false);
+    } //setCleanUrl
+  
   } // acInstallation
 
 ?>
Index: public/install/installation/steps/ChecksStep.class.php
===================================================================
--- public/install/installation/steps/ChecksStep.class.php	(revision 146)
+++ public/install/installation/steps/ChecksStep.class.php	(working copy)
@@ -60,7 +60,7 @@
       if (version_compare(PHP_VERSION, '5.0.2', 'ge')) {
         $this->addToChecklist('PHP version is ' . PHP_VERSION, true);
       } else {
-        $this->addToChecklist('You PHP version is ' . PHP_VERSION . '. PHP 5.0.2 or newer is required', false);
+        $this->addToChecklist('Your PHP version is ' . PHP_VERSION . '. PHP 5.0.2 or newer is required', false);
         $all_ok = false;
       } // if
       
Index: public/install/installation/steps/FinishStep.class.php
===================================================================
--- public/install/installation/steps/FinishStep.class.php	(revision 146)
+++ public/install/installation/steps/FinishStep.class.php	(working copy)
@@ -48,6 +48,7 @@
       $installation->setDatabaseName((string) trim($this->getFromStorage('database_name')));
       $installation->setTablePrefix((string) trim($this->getFromStorage('database_prefix')));
       $installation->setAbsoluteUrl((string) trim($this->getFromStorage('absolute_url')));
+      $installation->setCleanUrl($this->getFromStorage('clean_url'));
       
       ob_start();
       if ($installation->execute()) {
Index: public/install/installation/steps/SystemConfigStep.class.php
===================================================================
--- public/install/installation/steps/SystemConfigStep.class.php	(revision 146)
+++ public/install/installation/steps/SystemConfigStep.class.php	(working copy)
@@ -60,19 +60,23 @@
           'database_name'   => $this->getFromStorage('database_name'),
           'database_prefix' => $this->getFromStorage('database_prefix'),
           'absolute_url'    => $this->getFromStorage('absolute_url'),
+          'clean_url'       => $this->getFromStorage('clean_url'),
         ); // array
       } // if
+      $mod_rewrite_loaded = in_array('mod_rewrite', apache_get_modules());
       tpl_assign('installation_url', $installation_url);
       tpl_assign('config_form_data', $config_form_data);
+      tpl_assign('mod_rewrite_loaded', $mod_rewrite_loaded);
       
       if ($this->isSubmited()) {
-        $database_type   = (string) array_var($config_form_data, 'database_type');
-        $database_host   = (string) array_var($config_form_data, 'database_host');
-        $database_user   = (string) array_var($config_form_data, 'database_user');
-        $database_pass   = (string) array_var($config_form_data, 'database_pass');
-        $database_name   = (string) array_var($config_form_data, 'database_name');
-        $database_prefix = (string) array_var($config_form_data, 'database_prefix');
-        $absolute_url    = (string) array_var($config_form_data, 'absolute_url');
+        $database_type    = (string) array_var($config_form_data, 'database_type');
+        $database_host    = (string) array_var($config_form_data, 'database_host');
+        $database_user    = (string) array_var($config_form_data, 'database_user');
+        $database_pass    = (string) array_var($config_form_data, 'database_pass');
+        $database_name    = (string) array_var($config_form_data, 'database_name');
+        $database_prefix  = (string) array_var($config_form_data, 'database_prefix');
+        $absolute_url     = (string) array_var($config_form_data, 'absolute_url');
+        $clean_url        = (string) array_var($config_form_data, 'clean_url');
         
         $connected = false;
         if ($this->database_connection = @mysql_connect($database_host, $database_user, $database_pass)) {
@@ -87,6 +91,7 @@
           $this->addToStorage('database_name', $database_name);
           $this->addToStorage('database_prefix', $database_prefix);
           $this->addToStorage('absolute_url', $absolute_url);
+          $this->addToStorage('clean_url', ($clean_url == "on"?true:false));
           return true;
         } else {
           $this->addError('Failed to connect to database with data you provided');
@@ -95,7 +100,7 @@
       
       $this->setContentFromTemplate('system_config_form.php');
       return false;
-    } // excute
+    } // execute
     
     /**
     * Add error message to all messages and break the execution
Index: public/install/installation/templates/config_file.php
===================================================================
--- public/install/installation/templates/config_file.php	(revision 146)
+++ public/install/installation/templates/config_file.php	(working copy)
@@ -1,7 +1,7 @@
 <?php echo '<?php' ?>
 
 <?php foreach ($config_file_constants as $config_file_constant_key => $config_file_constant_value) { ?>
-  define('<?php echo $config_file_constant_key ?>', <?php echo var_export($config_file_constant_value) ?>); 
+  define('<?php echo $config_file_constant_key ?>', <?php echo var_export($config_file_constant_value) ?>);
 <?php } // foreach ?>
   return true;
 <?php echo '?>' ?>
Index: public/install/installation/templates/htaccess.php
===================================================================
--- public/install/installation/templates/htaccess.php	(revision 0)
+++ public/install/installation/templates/htaccess.php	(revision 0)
@@ -0,0 +1,12 @@
+AddDefaultCharset utf-8
+
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+  RewriteBase <?php echo substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/public")). "\n"; ?>
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !^/index\.php
+  RewriteRule (.*.gif|.*.png|.*.jpg|.*.pdf|.*.js|.*.css) $1 [L]
+  RewriteRule ^([0-9]+)/([a-zA-z]+)/([a-zA-z]+)?/?([0-9]+)?/?$ index.php?c=$2&a=$3&active_project=$1&id=$4 [QSA]
+  RewriteRule ^([a-zA-z]+)/([a-zA-z]+)?/?([0-9]+)?/?$ index.php?c=$1&a=$2&id=$3 [QSA]
+</IfModule>
Index: public/install/installation/templates/layout.php
===================================================================
--- public/install/installation/templates/layout.php	(revision 146)
+++ public/install/installation/templates/layout.php	(working copy)
@@ -20,7 +20,7 @@
     </form>
     <div id="footer">
     <ul>
-      <li><a href="http://www.projectpier.org/" target="_blank">ProjectPier</a> is provided free of charge under the <a href="http://www.projectpier.org/licence/" target="_blank">Honest Public License.</a></li>
+      <li><a href="http://www.projectpier.org/" target="_blank">ProjectPier</a> is provided free of charge under the <a href="http://www.projectpier.org/manual/tour/license" target="_blank">Honest Public License.</a></li>
       <li>If you have problems, check the <a href="http://www.projectpier.org/forum/" target="_blank">support forum</a></ul>
     </ul>  
     </div>
Index: public/install/installation/templates/system_config_form.php
===================================================================
--- public/install/installation/templates/system_config_form.php	(revision 146)
+++ public/install/installation/templates/system_config_form.php	(working copy)
@@ -48,4 +48,8 @@
     <td class="optionLabel"><label for="configFormAbsoluteUrl">Absolute script URL:</label></td>
     <td><input type="text" name="config_form[absolute_url]" id="configFormAbsoluteUrl" value="<?php echo array_var($config_form_data, 'absolute_url', $installation_url) ?>" /></td>
   </tr>
+  <tr>
+    <td class="optionLabel"><label for="configFormCleanUrl">Clean URLs:</label></td>
+    <td><input type="checkbox" name="config_form[clean_url]" id="configFormCleanUrl" <?php echo ((array_var($config_form_data, 'clean_url') == "on")?"checked":""); ?><?php if (!$mod_rewrite_loaded) echo "disabled/><br><small>The Apache module mod_rewrite needs to be loaded for this option.</small>"; ?></td>
+  </tr>
 </table>