mirror of
https://github.com/monstra-cms/monstra.git
synced 2025-08-06 13:16:54 +02:00
Site Url without trailing slashes
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
|
||||
$pos = strpos($item['link'], 'http://');
|
||||
if ($pos === false) {
|
||||
$link = Option::get('siteurl').$item['link'];
|
||||
$link = Option::get('siteurl').'/'.$item['link'];
|
||||
} else {
|
||||
$link = $item['link'];
|
||||
}
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<?php foreach ($users as $user) { ?>
|
||||
<tr>
|
||||
<td>
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo $user['id']; ?>"><?php echo $user['login']; ?></a>
|
||||
<a href="<?php echo Site::url(); ?>/users/<?php echo $user['id']; ?>"><?php echo $user['login']; ?></a>
|
||||
</td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
@@ -13,8 +13,8 @@
|
||||
</table>
|
||||
<br>
|
||||
<?php if (Users::isLoged()) { ?>
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo $user['id']; ?>/edit"><?php echo __('Edit profile', 'users'); ?></a> /
|
||||
<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
|
||||
<a href="<?php echo Site::url(); ?>users/logout"><?php echo __('Log Out', 'users'); ?></a>
|
||||
<a href="<?php echo Site::url(); ?>/users/<?php echo $user['id']; ?>/edit"><?php echo __('Edit profile', 'users'); ?></a> /
|
||||
<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>/admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
|
||||
<a href="<?php echo Site::url(); ?>/users/logout"><?php echo __('Log Out', 'users'); ?></a>
|
||||
<?php } ?>
|
||||
<?php } else { echo __('This users doesnt exists', 'users'); } ?>
|
||||
|
@@ -1,13 +1,13 @@
|
||||
<div style="float:right">
|
||||
<?php if (Session::get('user_id')) { ?>
|
||||
<?php echo __('Welcome', 'users'); ?>,
|
||||
<a href="<?php echo Site::url(); ?>users/<?php echo Session::get('user_id'); ?>"><?php echo Session::get('user_login'); ?></a> /
|
||||
<a href="<?php echo Site::url(); ?>/users/<?php echo Session::get('user_id'); ?>"><?php echo Session::get('user_login'); ?></a> /
|
||||
<?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?>
|
||||
<a href="<?php echo Site::url(); ?>admin"><?php echo __('Administration', 'system'); ?></a> /
|
||||
<a href="<?php echo Site::url(); ?>/admin"><?php echo __('Administration', 'system'); ?></a> /
|
||||
<?php } ?>
|
||||
<a href="<?php echo Site::url(); ?>users/logout"><?php echo __('Log Out', 'users'); ?></a>
|
||||
<a href="<?php echo Site::url(); ?>/users/logout"><?php echo __('Log Out', 'users'); ?></a>
|
||||
<?php } else { ?>
|
||||
<a href="<?php echo Site::url(); ?>users/login"><?php echo __('Log In', 'users'); ?></a> /
|
||||
<a href="<?php echo Site::url(); ?>users/registration"><?php echo __('Registration', 'users'); ?></a>
|
||||
<a href="<?php echo Site::url(); ?>/users/login"><?php echo __('Log In', 'users'); ?></a> /
|
||||
<a href="<?php echo Site::url(); ?>/users/registration"><?php echo __('Registration', 'users'); ?></a>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user