update

src/admin/controllers/profile/password.php

@@ -1,30 +1,27 @@
 <?php
 
-require '../../application.php';
+if (isset($_POST['submit'])) {
+    require_once __DIR__ . '/../../application.php';
+    $FormData = array(
+        'old_password' => post('old_password'),
+        'new_password' => post('new_password'),
+        'hashed_password' => hash('sha256', post('new_password')),
+        'user_key' => $AdminInfo['admin_key'],
+        'user_password' => $AdminInfo['admin_password'],
+    );
 
-if (!isset($_POST['submit'])) {
-    exit('405 / Method Not Allowed');
-}
-
-$FormData = array(
-    'old_password' => post('old_password'),
-    'new_password' => post('new_password'),
-    'hashed_password' => hash('sha256', post('new_password')),
-    'user_key' => $AdminInfo['admin_key'],
-    'user_password' => $AdminInfo['admin_password'],
-);
-
-if (hash('sha256', $FormData['old_password']) == $FormData['user_password']) {
-    $result = $DB->update('admin', array('admin_password' => $FormData['hashed_password']), array('admin_key' => $FormData['user_key']));
-    if ($result) {
-        setMessage('Password changed successfully !');
-        unset($_SESSION['UIISC_ADMIN']);
-        redirect('admin/login');
+    if (hash('sha256', $FormData['old_password']) == $FormData['user_password']) {
+        $result = $DB->update('admin', array('admin_password' => $FormData['hashed_password']), array('admin_key' => $FormData['user_key']));
+        if ($result) {
+            setMessage('Password changed successfully !');
+            unset($_SESSION['UIISC_ADMIN']);
+            redirect('admin/login');
+        } else {
+            setMessage("Something went's wrong !", 'danger');
+            redirect('admin/settings');
+        }
     } else {
-        setMessage("Something went's wrong !", 'danger');
+        setMessage('Invalid user password !', 'danger');
         redirect('admin/settings');
     }
-} else {
-    setMessage('Invalid user password !', 'danger');
-    redirect('admin/settings');
 }

src/admin/views/footer.php

@@ -4,7 +4,7 @@
             <div class="navbar-inner navbar-content-center" style="padding-top:15px;">
                 <ul class="navbar-left list-inline text-center text-muted credit">
                     <li>
-                        <span class="co">&copy;&nbsp;2013-<?php echo date("Y"); ?>&nbsp;<a href="<?php echo $site_url; ?>" target="_blank"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
+                        <span class="co">&copy;&nbsp;<?php echo $SiteConfig['site_build_year']; ?>-<?php echo date("Y"); ?>&nbsp;<a href="<?php echo $site_url; ?>" target="_blank"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
                         <span class="co">&nbsp;Powered by <a href="https://uiisc.org" target="_blank">UIISC</a>&nbsp;</span>
                         <span class="co hidden-xs">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="_blank">iFastNet</a>&nbsp;</span>
                         <span class="hidden-xs">time: <?php echo get_execution_time();?>s</span>

src/admin/views/login/footer.php

@@ -4,13 +4,13 @@
             <div class="navbar-inner navbar-content-center" style="padding-top:15px;">
                 <ul class="navbar-left list-inline text-center text-muted credit">
                     <li>
-                        <span class="co">&copy;&nbsp;2013-<?php echo date("Y"); ?>&nbsp;<a href="<?php echo $site_url; ?>" target="_blank"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
+                        <span class="co">&copy;&nbsp;<?php echo $SiteConfig['site_build_year']; ?>-<?php echo date("Y"); ?>&nbsp;<a href="<?php echo $site_url; ?>" target="_blank"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
                         <span class="co">&nbsp;Powered by <a href="https://uiisc.org" target="_blank">UIISC</a>&nbsp;</span>
                     </li>
                 </ul>
                 <ul class="legal navbar-right list-inline text-center">
                     <li><a href="<?php echo $site_url; ?>" target="_blank"><?php echo $lang->I18N('home'); ?></a></li>
-                    <li><a href="<?php echo $site_url; ?>/about.php" target="_blank"><?php echo $lang->I18N('about'); ?></a></li>
+                    <li><a href="<?php echo setURL('about');?>" target="_blank"><?php echo $lang->I18N('about'); ?></a></li>
                     <li>
                         <a href="#" aria-hidden="true"><i id="theme-selector"></i></a>
                         <script type="text/javascript">

src/admin/views/navbar.php

@@ -45,8 +45,8 @@
                         <i class="caret"></i>
                     </a>
                     <ul class="dropdown-menu">
-                        <li class="disabled">
-                            <a href="#" class="text-center">
+                        <li>
+                            <a href="profile.php" class="text-center">
                                 <p><img class="img-rounded" src="<?php echo $AdminInfo['avatar']; ?>" height="80px" width="80px"></p>
                                 <!-- <i class="fa fa-user-circle fa-5x"></i> -->
                                 <div><?php echo $AdminInfo['admin_fname'] . " " . $AdminInfo['admin_lname']; ?></div>

src/admin/views/profile/edit.php

@@ -1,79 +1,53 @@
+<?php
+if (!defined('IN_CRONLITE')) {
+    exit;
+}
+?>
 
 <div class="content-wrapper">
-<div class="container-fluid">
-    <div class="card">
-        <div class="card-header d-flex justify-content-between align-items-center">
-            <h3 class="m-0"><?php echo $lang->I18N('Profile Edit'); ?></h3>
-            <a href="index.php" class="btn btn-danger btn-sm"><i class="fa fa-backward"></i> <?php echo $lang->I18N('Return'); ?></a>
-        </div>
-        <hr />
-        <div class="card-body">
+    <div class="container">
+        <ol class="breadcrumb page-breadcrumb">
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+            <li><a href="profile.php"><?php echo $lang->I18N('My Profile'); ?></a></li>
+            <li class="active"><?php echo $lang->I18N('Profile Edit'); ?></li>
+        </ol>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <div class="pull-right">
+                    <a href="profile.php" class="btn btn-primary btn-xs">
+                        <i class="fa fa-id-card"></i> <?php echo $lang->I18N('My Profile'); ?>
+                    </a>
+                </div>
+                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+            </div>
             <form action="controllers/profile/edit.php" method="post">
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
-                            <input type="text" name="fname" value="<?php echo $AdminInfo['admin_fname']; ?>" class="form-control" required>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
-                            <input type="text" name="lname" value="<?php echo $AdminInfo['admin_lname']; ?>" class="form-control" required>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Email Address</label>
-                            <input type="text" name="email" value="<?php echo $AdminInfo['admin_email']; ?>" class="form-control disabled" required readonly>
-                        </div>
-                    </div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <button name="submit" class="btn btn-primary">Update Profile</button>
-                            <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a>
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required"><?php echo $lang->I18N('First Name'); ?></label>
+                                <input type="text" name="fname" value="<?php echo $AdminInfo['admin_fname']; ?>" class="form-control" required>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required"><?php echo $lang->I18N('Last Name'); ?></label>
+                                <input type="text" name="lname" value="<?php echo $AdminInfo['admin_lname']; ?>" class="form-control" required>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required">Email Address</label>
+                                <input type="text" name="email" value="<?php echo $AdminInfo['admin_email']; ?>" class="form-control disabled" required readonly>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </form>
-            <div class="col-md-12"><hr></div>
-            <form action="controllers/profile/password.php" method="post" onsubmit="
-                    var password = document.getElementById('password').value;
-                    var cpassword = document.getElementById('cpassword').value;
-                    if(password != cpassword){
-                        alert('Password not match');
-                        return false;
-                    }
-                    return true;
-                ">
-                <div class="row">
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">New Password</label>
-                            <input type="password" name="new_password" id="password" placeholder="New password here..." class="form-control">
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Confirm Password</label>
-                            <input type="password" name="confirm_password" id="cpassword" placeholder="Confirm password here..." class="form-control">
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="mb-10 px-10">
-                            <label class="form-label required">Old Password</label>
-                            <input type="password" name="old_password" placeholder="Old password here..." class="form-control">
-                        </div>
-                    </div>
-                    <div class="col-md-12"><hr></div>
-                    <div class="col-md-12">
-                        <div class="mb-10 px-10">
-                            <input type="submit" name="submit" value="Change Password" class="btn btn-sm btn-primary text-white">
-                        </div>
-                    </div>
+                <div class="panel-footer">
+                    <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save Changes'); ?></button>
+                    <!-- <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a> -->
                 </div>
             </form>
         </div>
     </div>
 </div>
-</div>

src/admin/views/profile/password.php

@@ -0,0 +1,63 @@
+<?php
+if (!defined('IN_CRONLITE')) {
+    exit;
+}
+?>
+
+<div class="content-wrapper">
+    <div class="container">
+        <ol class="breadcrumb page-breadcrumb">
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+            <li><a href="profile.php"><?php echo $lang->I18N('My Profile'); ?></a></li>
+            <li class="active"><?php echo $lang->I18N('Change Password'); ?></li>
+        </ol>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <div class="pull-right">
+                    <a href="profile.php?action=edit" class="btn btn-primary btn-xs">
+                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('Profile Edit'); ?>
+                    </a>
+                    <a href="profile.php" class="btn btn-primary btn-xs">
+                        <i class="fa fa-id-card"></i> <?php echo $lang->I18N('My Profile'); ?>
+                    </a>
+                </div>
+                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
+            </div>
+            <form action="controllers/profile/password.php" method="post" onsubmit="
+                    var password = document.getElementById('password').value;
+                    var cpassword = document.getElementById('cpassword').value;
+                    if(password != cpassword){
+                        alert('Password not match');
+                        return false;
+                    }
+                    return true;
+                ">
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required"><?php echo $lang->I18N('New Password'); ?></label>
+                                <input type="password" name="new_password" id="password" placeholder="<?php echo $lang->I18N('Input New Password'); ?>" class="form-control">
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required"><?php echo $lang->I18N('Confirm Password'); ?></label>
+                                <input type="password" name="confirm_password" id="cpassword" placeholder="<?php echo $lang->I18N('Input Confirm Password'); ?>" class="form-control">
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required"><?php echo $lang->I18N('Old Password'); ?></label>
+                                <input type="password" name="old_password" placeholder="<?php echo $lang->I18N('Input Old Password'); ?>" class="form-control">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel-footer">
+                    <input type="submit" name="submit" value="<?php echo $lang->I18N('Save Changes'); ?>" class="btn btn-sm btn-primary text-white">
+                </div>
+            </form>
+        </div>
+    </div>
+</div>

src/admin/views/profile/view.php

@@ -1,75 +1,54 @@
+<?php
+if (!defined('IN_CRONLITE')) {
+    exit;
+}
+?>
 
 <div class="content-wrapper">
-<div class="container-fluid">
-    <div class="card">
-        <div class="card-header d-flex justify-content-between align-items-center">
-            <h3 class="m-0"><?php echo $lang->I18N('My Profile'); ?></h3>
-            <a href="index.php" class="btn btn-danger btn-sm"><i class="fa fa-backward"></i> <?php echo $lang->I18N('Return');?></a>
-        </div>
-        <hr />
-        <div class="card-body">
-            <div class="row">
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b><?php echo $lang->I18N('First Name'); ?>:</b> <?php echo $AdminInfo['admin_fname']; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b><?php echo $lang->I18N('Last Name'); ?>:</b> <?php echo $AdminInfo['admin_lname']; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b><?php echo $lang->I18N('Email Address'); ?>:</b> <?php echo $AdminInfo['admin_email']; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b><?php echo $lang->I18N('IP Address'); ?>:</b> <?php echo get_client_ip(); ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Shared IP:</b> <?php echo gethostbyname($_SERVER['HTTP_HOST']); ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Device Type:</b> <?php echo get_client_device(); ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Device OS:</b> <?php echo get_client_os(); ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Web Browser:</b> <?php echo get_client_browser(); ?></h6>
-                </div>
-                <div class="col-md-12"><hr></div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Site Name:</b> <?php echo $SiteConfig['site_name']; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Site Path:</b> <?php echo $SiteConfig['site_path']; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Site Email:</b> <?php echo $SiteConfig['site_email']; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Site Status:</b> <?php if ($SiteConfig['site_status'] == 1) {echo '<span class="badge badge-success">Live</span>';} elseif ($SiteConfig['site_status'] == 0) {echo '<span class="badge badge-secondary">Maintaince</span>';}?></h6>
-                </div>
-                <div class="col-md-12"><hr></div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Document Root:</b> <?php echo $_SERVER['DOCUMENT_ROOT'] ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>Server Protocol:</b> <?php echo HTTP_PROTOCOL; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>PHP Version:</b> <?php echo PHP_VERSION; ?></h6>
-                </div>
-                <div class="col-md-6">
-                    <h6 class="mb-0"><b>App Version:</b> <?php echo APP_VERSION; ?></h6>
-                </div>
+    <div class="container">
+        <ol class="breadcrumb page-breadcrumb">
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+            <li class="active"><?php echo $lang->I18N('My Profile'); ?></li>
+        </ol>
+
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <div class="pull-right">
+                    <a href="profile.php?action=edit" class="btn btn-primary btn-xs">
+                        <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
+                    </a>
+                    <a href="profile.php?action=password" class="btn btn-primary btn-xs">
+                        <i class="fa fa-user-shield"></i> <?php echo $lang->I18N('Change Password'); ?>
+                    </a>
+                </div>
+                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID:<?php echo $AdminInfo['admin_id']; ?></span>
             </div>
-        </div>
-        <hr />
-        <div class="card-footer">
-            <div class="row">
-                <div class="col-md-12">
-                    <a href="profile.php?action=edit" class="btn btn-primary">Update Profile</a>
-                    <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a>
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label"><?php echo $lang->I18N('First Name'); ?></label>
+                            <input type="text" name="fname" value="<?php echo $AdminInfo['admin_fname']; ?>" class="form-control" readonly>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label"><?php echo $lang->I18N('Last Name'); ?></label>
+                            <input type="text" name="lname" value="<?php echo $AdminInfo['admin_lname']; ?>" class="form-control" readonly>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-10 px-10">
+                            <label class="form-label"><?php echo $lang->I18N('Email Address'); ?></label>
+                            <input type="text" name="email" value="<?php echo $AdminInfo['admin_email']; ?>" class="form-control disabled" readonly>
+                        </div>
+                    </div>
                 </div>
             </div>
+            <div class="panel-footer">
+                <a href="profile.php?action=edit" class="btn btn-primary"><?php echo $lang->I18N('Update Profile'); ?></a>
+                <a href="https://www.gravatar.com/" target="_blank" class="btn btn-secondary">Update Image</a>
+            </div>
         </div>
     </div>
 </div>
-</div>

src/admin/views/settings/menu.php

@@ -1,11 +1,11 @@
-<a href="<?php echo setRouter('settings'); ?>" class="btn<?php if ($section == 'settings') echo ' btn-primary'; ?>">
+<a href="<?php echo setRouter('settings'); ?>" class="btn btn-sm<?php if ($section == 'settings') echo ' btn-primary'; ?>">
     <i class="fa fa-cog"></i> <?php echo $lang->I18N('System Settings'); ?>
 </a>
-<a href="<?php echo setRouter('settings', 'smtp'); ?>" class="btn<?php if ($section == 'smtp') echo ' btn-primary'; ?>">
+<a href="<?php echo setRouter('settings', 'smtp'); ?>" class="btn btn-sm<?php if ($section == 'smtp') echo ' btn-primary'; ?>">
     <i class="fa fa-inbox"></i></span>
     <?php echo $lang->I18N('SMTP Settings'); ?>
 </a>
-<a href="<?php echo setRouter('settings', 'sitepro'); ?>" class="btn<?php if ($section == 'sitepro') echo ' btn-primary'; ?>">
+<a href="<?php echo setRouter('settings', 'sitepro'); ?>" class="btn btn-sm<?php if ($section == 'sitepro') echo ' btn-primary'; ?>">
     <i class="fa fa-tools"></i></span>
     <?php echo $lang->I18N('SitePro Settings'); ?>
 </a>

src/admin/views/settings/view.php

@@ -21,7 +21,7 @@ if (!defined('IN_CRONLITE')) {
                         <i class="fa fa-home"></i> <?php echo $lang->I18N('Return'); ?>
                     </a>
                 </div>
-                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $lang->I18N('System Settings'); ?></span>
+                <span class="panel-title"><?php echo $lang->I18N('System Settings'); ?></span>
             </div>
             <div class="panel-body">
 

src/core/language/zh-CN/language.php

@@ -117,6 +117,7 @@ return array(
     'Settings'            => '设置',
     'Return'              => '返回',
     'Save'                => '保存',
+    'Save Changes'        => '保存更改',
     'Closed'              => '已关闭',
     'Opened'              => '已打开',
     'Subject'             => '主题',

src/install/function/Database.php

@@ -61,6 +61,7 @@ $sql = mysqli_query($connect, 'CREATE TABLE IF NOT EXISTS `uiisc_config` (
   `site_path` varchar(70) NOT NULL,
   `site_phone` varchar(30) NOT NULL,
   `site_email` varchar(50) NOT NULL,
+  `site_build_year` int(4) NOT NULL,
   `page_title` varchar(80) NOT NULL,
   `page_description` varchar(200) NOT NULL,
   `page_keywords` varchar(100) NOT NULL,

src/public/views/common/footer.php

@@ -9,7 +9,7 @@ if (!defined('IN_CRONLITE')) {
         <div class="navbar-inner navbar-content-center" style="padding-top:15px;">
             <ul class="navbar-left list-inline text-center text-muted credit">
                 <li>
-                    <span class="co">&copy;&nbsp;2013 - <?php echo date("Y"); ?>&nbsp;<a href="<?php echo setRouter('index');?>"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
+                    <span class="co">&copy;&nbsp;<?php echo $SiteConfig['site_build_year']; ?>-<?php echo date("Y"); ?>&nbsp;<a href="<?php echo SITEURL;?>"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
                     <span class="co">&nbsp;Powered by <a href="https://uiisc.org" target="_blank">UIISC</a>&nbsp;</span>
                     <span class="co">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="_blank">iFastNet</a>&nbsp;</span>
                     <span>time: <?php echo get_execution_time();?>s</span>

src/public/views/common/navbar.php

@@ -14,35 +14,35 @@ if (!defined('IN_CRONLITE')) {
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="<?php echo setRouter('index');?>"><?php echo $SiteConfig['site_brand']; ?></a>
+                <a class="navbar-brand" href="<?php echo SITEURL;?>"><?php echo $SiteConfig['site_brand']; ?></a>
             </div>
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a href="<?php echo setRouter('index');?>"><?php echo $lang->I18N('home'); ?></a></li>
-                    <li><a href="<?php echo setRouter('solution');?>"><?php echo $lang->I18N('solution'); ?></a></li>
-                    <li><a href="<?php echo setRouter('support');?>"><?php echo $lang->I18N('support'); ?></a></li>
+                    <li><a href="<?php echo SITEURL;?>"><?php echo $lang->I18N('home'); ?></a></li>
+                    <li><a href="<?php echo setURL('solution');?>"><?php echo $lang->I18N('solution'); ?></a></li>
+                    <li><a href="<?php echo setURL('support');?>"><?php echo $lang->I18N('support'); ?></a></li>
                     <li class="dropdown">
                         <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown"><?php echo $lang->I18N('more'); ?>&nbsp;<span class="caret"></span></a>
                         <ul class="dropdown-menu" role="menu">
-                            <li><a href="about.php"><?php echo $lang->I18N('aboutus'); ?></a></li>
-                            <li><a href="contact.php"><?php echo $lang->I18N('contact'); ?></a></li>
-                            <li><a href="help.php"><?php echo $lang->I18N('help'); ?></a></li>
-                            <li><a href="support.php"><?php echo $lang->I18N('support'); ?></a></li>
-                            <li><a href="<?php echo setRouter('forum'); ?>"><?php echo $lang->I18N('forum'); ?></a></li>
+                            <li><a href="<?php echo setURL('about');?>"><?php echo $lang->I18N('aboutus'); ?></a></li>
+                            <li><a href="<?php echo setURL('contact');?>"><?php echo $lang->I18N('contact'); ?></a></li>
+                            <li><a href="<?php echo setURL('help');?>"><?php echo $lang->I18N('help'); ?></a></li>
+                            <li><a href="<?php echo setURL('support');?>"><?php echo $lang->I18N('support'); ?></a></li>
+                            <li><a href="<?php echo setURL('forum'); ?>"><?php echo $lang->I18N('forum'); ?></a></li>
                             <li class="divider"></li>
-                            <li><a href="cancellation-refund.php"><?php echo $lang->I18N('cancellation_refund'); ?></a></li>
-                            <li><a href="payment-methods.php"><?php echo $lang->I18N('payment_methods'); ?></a></li>
+                            <li><a href="<?php echo setURL('cancellation-refund');?>"><?php echo $lang->I18N('cancellation_refund'); ?></a></li>
+                            <li><a href="<?php echo setURL('payment-methods');?>"><?php echo $lang->I18N('payment_methods'); ?></a></li>
                             <li class="divider"></li>
                             <li class="dropdown-header"><?php echo $lang->I18N('legal_information'); ?></li>
-                            <li><a href="legal.php?s=terms"><?php echo $lang->I18N('tos'); ?></a></li>
-                            <li><a href="legal.php?s=privacy"><?php echo $lang->I18N('privacy_policy'); ?></a></li>
+                            <li><a href="<?php echo setURL('legal', 'terms');?>"><?php echo $lang->I18N('tos'); ?></a></li>
+                            <li><a href="<?php echo setURL('legal', 'privacy');?>"><?php echo $lang->I18N('privacy_policy'); ?></a></li>
                         </ul>
                     </li>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a href="<?php echo setRouter('login');?>"><?php echo $lang->I18N('login'); ?></a></li>
-                    <li><a href="<?php echo setRouter('register');?>"><?php echo $lang->I18N('register'); ?></a></li>
-                    <li><a href="clientarea/index.php"><?php echo $lang->I18N('clientarea'); ?></a></li>
+                    <li><a href="<?php echo setURL('login');?>"><?php echo $lang->I18N('login'); ?></a></li>
+                    <li><a href="<?php echo setURL('register');?>"><?php echo $lang->I18N('register'); ?></a></li>
+                    <li><a href="<?php echo setURL('clientarea/index');?>"><?php echo $lang->I18N('clientarea'); ?></a></li>
                     <li>
                         <a href="#" aria-hidden="true"><i id="theme-selector"></i></a>
                         <script type="text/javascript">