diff options
Diffstat (limited to '')
| -rw-r--r-- | src/web/_controller/_comments.php | 4 | ||||
| -rw-r--r-- | src/web/_controller/_meta.php | 4 | ||||
| -rw-r--r-- | src/web/_controller/blog.php | 1 | ||||
| -rw-r--r-- | src/web/_controller/bucket.php | 1 | ||||
| -rw-r--r-- | src/web/_controller/error.php | 3 | ||||
| -rw-r--r-- | src/web/_controller/home.php | 10 | ||||
| -rw-r--r-- | src/web/_controller/projects.php | 1 |
7 files changed, 21 insertions, 3 deletions
diff --git a/src/web/_controller/_comments.php b/src/web/_controller/_comments.php index 3b8fe35..c81ae9d 100644 --- a/src/web/_controller/_comments.php +++ b/src/web/_controller/_comments.php @@ -5,6 +5,7 @@ class _comments_controller extends Controller { function __construct() { $this->comments_model = $this->load_model('_comments'); + $this->load_lang('common'); } public function comments(string $page, string $ref): void { @@ -12,7 +13,8 @@ class _comments_controller extends Controller { $this->view('comments', array( 'comments' => $data, 'ref' => $ref, - 'page' => $page + 'page' => $page, + 'ip', $this->comments_model->get_ip(), )); } diff --git a/src/web/_controller/_meta.php b/src/web/_controller/_meta.php index 9ea3f47..ac9f682 100644 --- a/src/web/_controller/_meta.php +++ b/src/web/_controller/_meta.php @@ -1,6 +1,10 @@ <?php /* Copyright (c) 2024 Freya Murphy */ class _meta_controller extends Controller { + function __construct() { + $this->load_lang('common'); + } + public function robots(): void { header("Content-Type: text/plain"); diff --git a/src/web/_controller/blog.php b/src/web/_controller/blog.php index 2ea45df..9cb93e5 100644 --- a/src/web/_controller/blog.php +++ b/src/web/_controller/blog.php @@ -8,6 +8,7 @@ class Blog_controller extends Controller { { $this->blog_model = $this->load_model('blog'); $this->comments_controller = $this->load_controller('_comments'); + $this->load_lang('common', 'blog'); } public function index(): void diff --git a/src/web/_controller/bucket.php b/src/web/_controller/bucket.php index e14f9b6..460f862 100644 --- a/src/web/_controller/bucket.php +++ b/src/web/_controller/bucket.php @@ -6,6 +6,7 @@ class Bucket_controller extends Controller { function __construct() { $this->bucket_model = $this->load_model('bucket'); + $this->load_lang('common', 'bucket'); } public function index(): void diff --git a/src/web/_controller/error.php b/src/web/_controller/error.php index 9efbb7e..ed89a89 100644 --- a/src/web/_controller/error.php +++ b/src/web/_controller/error.php @@ -6,6 +6,7 @@ class Error_controller extends Controller { function __construct() { $this->error_model = $this->load_model('error'); + $this->load_lang('common', 'error'); } public function code(int $code): void @@ -18,7 +19,7 @@ class Error_controller extends Controller { parent::index(); $this->load_lang('error'); - $data = $this->error_model->get_data($code); + $data = $this->error_model->get_error_data($code); $this->view('header', $data); $this->view('error/main', $data); $this->view('footer', $data); diff --git a/src/web/_controller/home.php b/src/web/_controller/home.php index 89e67e8..28ccd1e 100644 --- a/src/web/_controller/home.php +++ b/src/web/_controller/home.php @@ -1,11 +1,19 @@ <?php /* Copyright (c) 2024 Freya Murphy */ class Home_controller extends Controller { + private $home_model; + + function __construct() + { + $this->home_model = $this->load_model('home'); + $this->load_lang('common', 'home'); + } + public function index(): void { parent::index(); - $data = Model::get_base_data(); + $data = $this->home_model->get_data(); $this->view('header', $data); $this->view('home/main', $data); $this->view('footer', $data); diff --git a/src/web/_controller/projects.php b/src/web/_controller/projects.php index fea4664..35274b5 100644 --- a/src/web/_controller/projects.php +++ b/src/web/_controller/projects.php @@ -6,6 +6,7 @@ class Projects_controller extends Controller { function __construct() { $this->projects_model = $this->load_model('projects'); + $this->load_lang('common', 'projects'); } public function index(): void |