ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity

Replaced the config base_url value with the base_url() function of the URL helper.

Browse source
This commit is contained in:
Alex Tselegidis 2016-03-07 21:19:55 +01:00
parent 79a77401d0
commit 0bb0171738
9 changed files with 59 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/application/controllers/appointments.php
View file

@ -90,8 +90,7 @@ class Appointments extends CI_Controller {
$view = array( $view = array(
'message_title' => $this->lang->line('appointment_not_found'), 'message_title' => $this->lang->line('appointment_not_found'),
'message_text' => $this->lang->line('appointment_does_not_exist_in_db'), 'message_text' => $this->lang->line('appointment_does_not_exist_in_db'),
'message_icon' => $this->config->item('base_url') 'message_icon' => base_url('assets/img/error.png')
. '/assets/img/error.png'
); );
$this->load->view('appointments/message', $view); $this->load->view('appointments/message', $view);
return; return;
@ -222,7 +221,7 @@ class Appointments extends CI_Controller {
$view = array( $view = array(
'message_title' => $this->lang->line('appointment_cancelled_title'), 'message_title' => $this->lang->line('appointment_cancelled_title'),
'message_text' => $this->lang->line('appointment_cancelled'), 'message_text' => $this->lang->line('appointment_cancelled'),
'message_icon' => $this->config->item('base_url') . '/assets/img/success.png' 'message_icon' => base_url('assets/img/success.png')
); );
if (isset($exceptions)) { if (isset($exceptions)) {

30
src/application/views/appointments/book.php
View file

@ -15,23 +15,23 @@
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css"> href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-ui/jquery-ui.min.css"> href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-qtip/jquery.qtip.min.css"> href="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.css'); ?>">
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/css/frontend.css"> href="<?php echo base_url('assets/css/frontend.css'); ?>">
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/css/general.css"> href="<?php echo base_url('assets/css/general.css'); ?>">
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -40,22 +40,22 @@
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script> src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-qtip/jquery.qtip.min.js"></script> src="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script> src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script> src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/js/frontend_book.js"></script> src="<?php echo base_url('assets/js/frontend_book.js'); ?>"></script>
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -63,10 +63,10 @@
// ------------------------------------------------------------ ?> // ------------------------------------------------------------ ?>
<link rel="icon" type="image/x-icon" <link rel="icon" type="image/x-icon"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico"> href="<?php echo base_url('assets/img/favicon.ico'); ?>">
<link rel="icon" sizes="192x192" <link rel="icon" sizes="192x192"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/logo.png"> href="<?php echo base_url('assets/img/logo.png'); ?>">
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -77,7 +77,7 @@
var GlobalVariables = { var GlobalVariables = {
availableServices : <?php echo json_encode($available_services); ?>, availableServices : <?php echo json_encode($available_services); ?>,
availableProviders : <?php echo json_encode($available_providers); ?>, availableProviders : <?php echo json_encode($available_providers); ?>,
baseUrl : <?php echo '"' . $this->config->item('base_url') . '"'; ?>, baseUrl : <?php echo json_encode($this->config->item('base_url')); ?>,
manageMode : <?php echo ($manage_mode) ? 'true' : 'false'; ?>, manageMode : <?php echo ($manage_mode) ? 'true' : 'false'; ?>,
dateFormat : <?php echo json_encode($date_format); ?>, dateFormat : <?php echo json_encode($date_format); ?>,
appointmentData : <?php echo json_encode($appointment_data); ?>, appointmentData : <?php echo json_encode($appointment_data); ?>,
@ -433,7 +433,7 @@
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script> src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
<?php google_analytics_script(); ?> <?php google_analytics_script(); ?>
</body> </body>

20
src/application/views/appointments/book_success.php
View file

@ -13,9 +13,9 @@
// ------------------------------------------------------------ ?> // ------------------------------------------------------------ ?>
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css"> href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/css/frontend.css"> href="<?php echo base_url('assets/css/frontend.css'); ?>">
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -23,10 +23,10 @@
// ------------------------------------------------------------ ?> // ------------------------------------------------------------ ?>
<link rel="icon" type="image/x-icon" <link rel="icon" type="image/x-icon"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico"> href="<?php echo base_url('assets/img/favicon.ico'); ?>">
<link rel="icon" sizes="192x192" <link rel="icon" sizes="192x192"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/logo.png"> href="<?php echo base_url('assets/img/logo.png'); ?>">
</head> </head>
<body> <body>
<div id="main" class="container"> <div id="main" class="container">
@ -38,7 +38,7 @@
col-lg-offset-2 col-lg-8"> col-lg-offset-2 col-lg-8">
<div class="col-xs-12 col-sm-2"> <div class="col-xs-12 col-sm-2">
<img id="success-icon" class="pull-right" src="<?php echo $this->config->item('base_url'); ?>/assets/img/success.png" /> <img id="success-icon" class="pull-right" src="<?php echo base_url('assets/img/success.png'); ?>" />
</div> </div>
<div class="col-xs-12 col-sm-10"> <div class="col-xs-12 col-sm-10">
<?php <?php
@ -81,13 +81,13 @@
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script> src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script> src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="https://apis.google.com/js/client.js"></script> src="https://apis.google.com/js/client.js"></script>
@ -114,11 +114,11 @@
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/js/frontend_book_success.js"></script> src="<?php echo base_url('assets/js/frontend_book_success.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script> src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
<?php google_analytics_script(); ?> <?php google_analytics_script(); ?>
</body> </body>

14
src/application/views/general/error404.php
View file

@ -15,7 +15,7 @@
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css"> href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -25,7 +25,7 @@
<link <link
rel="icon" rel="icon"
type="image/x-icon" type="image/x-icon"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico"> href="<?php echo base_url('assets/img/favicon.ico'); ?>">
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -43,16 +43,16 @@
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script> src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script> src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script> src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
<?php <?php
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -108,7 +108,7 @@
<br> <br>
<a href="<?php echo $this->config->item('base_url'); ?>" class="btn btn-primary btn-large"> <a href="<?php echo site_url(); ?>" class="btn btn-primary btn-large">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
<?php echo $this->lang->line('book_appointment_title'); ?> <?php echo $this->lang->line('book_appointment_title'); ?>
</a> </a>

4
src/application/views/general/test.php
View file

@ -1,4 +1,4 @@
<script type="text/javascript" src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> <script type="text/javascript" src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var passedTestsNumber = $('span').filter(function() { var passedTestsNumber = $('span').filter(function() {
@ -30,8 +30,6 @@
display: inline-block; display: inline-block;
margin-right: 21px; margin-right: 21px;
color: #DBFFA6; color: #DBFFA6;
/* color: #C0FFD9;
text-shadow: 0px 1px 1px #0D9E41;*/
} }
#test-results { #test-results {

14
src/application/views/user/forgot_password.php
View file

@ -10,13 +10,13 @@
<?php // INCLUDE JS FILES ?> <?php // INCLUDE JS FILES ?>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script> src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script> src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
<script type="text/javascript"> <script type="text/javascript">
var EALang = <?php echo json_encode($this->lang->language); ?>; var EALang = <?php echo json_encode($this->lang->language); ?>;
@ -26,13 +26,13 @@
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css"> href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<?php // SET FAVICON FOR PAGE ?> <?php // SET FAVICON FOR PAGE ?>
<link <link
rel="icon" rel="icon"
type="image/x-icon" type="image/x-icon"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico"> href="<?php echo base_url('assets/img/favicon.ico'); ?>">
<style> <style>
body { body {
@ -67,7 +67,7 @@
$(document).ready(function() { $(document).ready(function() {
var GlobalVariables = { var GlobalVariables = {
'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>, 'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
'baseUrl': <?php echo '"' . $base_url . '"'; ?>, 'baseUrl': <?php echo json_encode($base_url); ?>,
'AJAX_SUCCESS': 'SUCCESS', 'AJAX_SUCCESS': 'SUCCESS',
'AJAX_FAILURE': 'FAILURE' 'AJAX_FAILURE': 'FAILURE'
}; };
@ -144,6 +144,6 @@
</div> </div>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script> src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
</body> </body>
</html> </html>

18
src/application/views/user/login.php
View file

@ -11,29 +11,29 @@
<?php // INCLUDE JS FILES ?> <?php // INCLUDE JS FILES ?>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script> src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script> src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
<?php // INCLUDE CSS FILES ?> <?php // INCLUDE CSS FILES ?>
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css"> href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/css/general.css"> href="<?php echo base_url('assets/css/general.css'); ?>">
<?php // SET FAVICON FOR PAGE ?> <?php // SET FAVICON FOR PAGE ?>
<link <link
rel="icon" rel="icon"
type="image/x-icon" type="image/x-icon"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico"> href="<?php echo base_url('assets/img/favicon.ico'); ?>">
<style> <style>
body { body {
@ -63,8 +63,8 @@
<script type="text/javascript"> <script type="text/javascript">
var GlobalVariables = { var GlobalVariables = {
'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>, 'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
'baseUrl': <?php echo '"' . $base_url . '"'; ?>, 'baseUrl': <?php echo json_encode($base_url); ?>,
'destUrl': <?php echo '"' . $dest_url . '"'; ?>, 'destUrl': <?php echo json_encode($dest_url); ?>,
'AJAX_SUCCESS': 'SUCCESS', 'AJAX_SUCCESS': 'SUCCESS',
'AJAX_FAILURE': 'FAILURE' 'AJAX_FAILURE': 'FAILURE'
}; };
@ -151,6 +151,6 @@
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script> src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
</body> </body>
</html> </html>

8
src/application/views/user/logout.php
View file

@ -8,15 +8,15 @@
<title><?php echo $this->lang->line('log_out') . ' - ' . $company_name; ?></title> <title><?php echo $this->lang->line('log_out') . ' - ' . $company_name; ?></title>
<?php // SET FAVICON FOR PAGE ?> <?php // SET FAVICON FOR PAGE ?>
<link rel="icon" type="image/x-icon" href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico"> <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
<?php // INCLUDE JS FILES ?> <?php // INCLUDE JS FILES ?>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script> src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<script type="text/javascript"> <script type="text/javascript">
var EALang = <?php echo json_encode($this->lang->language); ?>; var EALang = <?php echo json_encode($this->lang->language); ?>;
@ -26,7 +26,7 @@
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css"> href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<style> <style>
body { body {

8
src/application/views/user/no_privileges.php
View file

@ -10,22 +10,22 @@
<?php // INCLUDE JS FILES ?> <?php // INCLUDE JS FILES ?>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script> src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
<script <script
type="text/javascript" type="text/javascript"
src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script> src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<?php // INCLUDE CSS FILES ?> <?php // INCLUDE CSS FILES ?>
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css"> href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<?php // SET FAVICON FOR PAGE ?> <?php // SET FAVICON FOR PAGE ?>
<link <link
rel="icon" rel="icon"
type="image/x-icon" type="image/x-icon"
href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico"> href="<?php echo base_url('assets/img/favicon.ico'); ?>">
<style> <style>
body { body {