1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-02 11:20:52 +02:00

Merge pull request #1 from Awilum/dev

Dev
This commit is contained in:
Евгений
2014-01-06 09:41:09 -08:00
3 changed files with 3 additions and 3 deletions

View File

@@ -49,7 +49,7 @@ class BackupAdmin extends Backend
if (Security::check(Request::get('token'))) { if (Security::check(Request::get('token'))) {
File::delete($backups_path . DS . Request::get('delete_file')); File::delete($backups_path . DS . Request::get('delete_file'));
Request::redirect(Option::get('siteurl').'admin/index.php?id=backup'); Request::redirect(Option::get('siteurl').'/admin/index.php?id=backup');
} else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); } } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); }
} }

View File

@@ -43,7 +43,7 @@ $().ready(function(){$('[name=create_backup]').click(function(){$(this).button('
<tr> <tr>
<td> <td>
<?php $name = strtotime(str_replace('-', '', basename($backup, '.zip'))); ?> <?php $name = strtotime(str_replace('-', '', basename($backup, '.zip'))); ?>
<?php echo Html::anchor(Date::format($name, 'F jS, Y - g:i A'), Option::get('siteurl').'admin/index.php?id=backup&download='.$backup.'&token='.Security::token()); ?> <?php echo Html::anchor(Date::format($name, 'F jS, Y - g:i A'), Option::get('siteurl').'/admin/index.php?id=backup&download='.$backup.'&token='.Security::token()); ?>
</td> </td>
<td><?php echo Number::byteFormat(filesize(ROOT . DS . 'backups' . DS . $backup)); ?></td> <td><?php echo Number::byteFormat(filesize(ROOT . DS . 'backups' . DS . $backup)); ?></td>
<td> <td>

View File

@@ -48,7 +48,7 @@
$pos = strpos($item['link'], 'http://'); $pos = strpos($item['link'], 'http://');
if ($pos === false) { if ($pos === false) {
$link = Option::get('siteurl').$item['link']; $link = Option::get('siteurl').'/'.$item['link'];
} else { } else {
$link = $item['link']; $link = $item['link'];
} }