From 13698d8726d7fbc5076aadbbda834b9fd1166776 Mon Sep 17 00:00:00 2001
From: Thijs Lemmens <thijs.lemmens@xenit.eu>
Date: Sat, 5 Mar 2016 21:09:40 +0100
Subject: [PATCH] Use the site_url function instead of the index.php link

---
 src/application/views/backend/header.php       | 12 ++++++------
 src/application/views/general/installation.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 src/application/views/backend/header.php
 mode change 100644 => 100755 src/application/views/general/installation.php

diff --git a/src/application/views/backend/header.php b/src/application/views/backend/header.php
old mode 100644
new mode 100755
index fbb4fc49..e441f276
--- a/src/application/views/backend/header.php
+++ b/src/application/views/backend/header.php
@@ -81,7 +81,7 @@
               // ------------------------------------------------------ ?>
         <?php $hidden = ($privileges[PRIV_APPOINTMENTS]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_APPOINTMENTS) ? 'active' : ''; ?>
-        <a href="<?php echo $base_url; ?>/index.php/backend" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
+        <a href="<?php echo site_url('backend'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
                 title="<?php echo $this->lang->line('manage_appointment_record_hint'); ?>">
             <?php echo $this->lang->line('calendar'); ?>
         </a>
@@ -90,7 +90,7 @@
               // ------------------------------------------------------ ?>
         <?php $hidden = ($privileges[PRIV_CUSTOMERS]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_CUSTOMERS) ? 'active' : ''; ?>
-        <a href="<?php echo $base_url; ?>/index.php/backend/customers" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
+        <a href="<?php echo site_url('backend/customers'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
                 title="<?php echo $this->lang->line('manage_customers_hint'); ?>">
             <?php echo $this->lang->line('customers'); ?>
         </a>
@@ -99,7 +99,7 @@
               // ------------------------------------------------------ ?>
         <?php $hidden = ($privileges[PRIV_SERVICES]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_SERVICES) ? 'active' : ''; ?>
-        <a href="<?php echo $base_url; ?>/index.php/backend/services" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
+        <a href="<?php echo site_url('backend/services'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
                 title="<?php echo $this->lang->line('manage_services_hint'); ?>">
             <?php echo $this->lang->line('services'); ?>
         </a>
@@ -108,7 +108,7 @@
               // ------------------------------------------------------ ?>
         <?php $hidden = ($privileges[PRIV_USERS]['view'] ==  TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_USERS) ? 'active' : ''; ?>
-        <a href="<?php echo $base_url; ?>/index.php/backend/users" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
+        <a href="<?php echo site_url('backend/users'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
                 title="<?php echo $this->lang->line('manage_users_hint'); ?>">
             <?php echo $this->lang->line('users'); ?>
         </a>
@@ -118,14 +118,14 @@
         <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE
                 || $privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_SYSTEM_SETTINGS) ? 'active' : ''; ?>
-        <a href="<?php echo $base_url; ?>/index.php/backend/settings" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
+        <a href="<?php echo site_url('backend/settings'); ?>" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
                 title="<?php echo $this->lang->line('settings_hint'); ?>">
             <?php echo $this->lang->line('settings'); ?>
         </a>
 
         <?php // LOGOUT MENU ITEM
               // ------------------------------------------------------ ?>
-        <a href="<?php echo $base_url; ?>/index.php/user/logout" class="menu-item"
+        <a href="<?php echo site_url('user/logout') ?>" class="menu-item"
                 title="<?php echo $this->lang->line('log_out_hint'); ?>">
             <?php echo $this->lang->line('log_out'); ?>
         </a>
diff --git a/src/application/views/general/installation.php b/src/application/views/general/installation.php
old mode 100644
new mode 100755
index a70c0284..10199977
--- a/src/application/views/general/installation.php
+++ b/src/application/views/general/installation.php
@@ -72,7 +72,7 @@
             <p>
                 This page will help you set the main settings of your Easy!Appointments installation.
                 You will be able to edit these settings and many more in the backend session of your
-                system. Remember to use the <strong class="text-primary"><?php echo $base_url; ?>/index.php/backend</strong>
+                system. Remember to use the <strong class="text-primary"><?php echo site_url('backend'); ?>/strong>
                 url to connect to the backend section of Easy!Appointments.
 
                 If you face any problems during the usage of Easy!Appointments you can always check