diff options
Diffstat (limited to 'app/helpers.php')
| -rw-r--r-- | app/helpers.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers.php b/app/helpers.php index f25db0f0..b53e59e7 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -8,7 +8,7 @@ namespace Helper; */ use Core\Security; use Core\Template; -use Core\Tool; +use Core\Request; use Parsedown; /** @@ -142,7 +142,7 @@ function markdown($text, array $link = array('controller' => 'task', 'action' => */ function get_current_base_url() { - $url = Tool::isHTTPS() ? 'https://' : 'http://'; + $url = Request::isHTTPS() ? 'https://' : 'http://'; $url .= $_SERVER['SERVER_NAME']; $url .= $_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443 ? '' : ':'.$_SERVER['SERVER_PORT']; $url .= dirname($_SERVER['PHP_SELF']) !== '/' ? dirname($_SERVER['PHP_SELF']).'/' : '/'; @@ -618,8 +618,8 @@ function paginate(array $pagination) { extract($pagination); - $html = '<div id="pagination">'; - $html .= '<span id="pagination-previous">'; + $html = '<div class="pagination">'; + $html .= '<span class="pagination-previous">'; if ($pagination['offset'] > 0) { $offset = $pagination['offset'] - $limit; @@ -630,7 +630,7 @@ function paginate(array $pagination) } $html .= '</span>'; - $html .= '<span id="pagination-next">'; + $html .= '<span class="pagination-next">'; if (($total - $pagination['offset']) > $limit) { $offset = $pagination['offset'] + $limit; |