Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Feature/better front controller #263

Open
wants to merge 28 commits into
base: master/elche
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
72c322a
Update front.ctrl.php
shaoshiva Jan 28, 2015
b8918bd
Removed 404 redirect (bad practise) + fix syntax error
shaoshiva Jan 29, 2015
a0e1099
Code reorganization
shaoshiva Feb 3, 2015
8aa77cc
Merge remote-tracking branch 'origin/master/elche' into feature/bette…
shaoshiva Feb 3, 2015
3ba3c27
Code style
shaoshiva Feb 3, 2015
490b105
Update front.ctrl.php
shaoshiva Jun 11, 2015
380f74d
Complete refactor of the front controller (not tested)
shaoshiva Jun 11, 2015
7cf6704
Code organization and enhancement
shaoshiva Jun 23, 2015
f8a08d2
Refactor methods & code reorganization
shaoshiva Jun 23, 2015
aa46db6
Getters for meta title/description/keywords
shaoshiva Jun 23, 2015
18e1f8f
Update front.ctrl.php
shaoshiva Jun 23, 2015
3cdb85a
Update front.ctrl.php
shaoshiva Jun 24, 2015
895a2ad
Update front.ctrl.php
shaoshiva Jun 24, 2015
16e17de
Renamed parseContent() to prepareHtmlContent()
shaoshiva Jun 24, 2015
bc75101
Code style
shaoshiva Jun 27, 2015
8a02f71
Base routing
shaoshiva Jun 28, 2015
193e9db
Typo
shaoshiva Jul 20, 2015
5d43c00
Code style and refactor
shaoshiva Sep 18, 2015
c192d6a
Code style
shaoshiva Sep 18, 2015
606ad2d
Bugfix on enhanced URL match
shaoshiva Nov 25, 2015
2190d5e
Fix merge conflicts
shaoshiva Sep 2, 2016
296a0ce
Fix some code errors + Moves exceptions in separate files
shaoshiva Sep 2, 2016
4e5513a
Adds license to exceptions files
shaoshiva Sep 2, 2016
ccafa89
Temporary routing system
shaoshiva Sep 2, 2016
2b1bf33
Bugfixes
shaoshiva Sep 3, 2016
d1eb751
Fix Exception_FrontContentNotFound class extends
shaoshiva Sep 6, 2016
212ad10
Fix Exception_FrontContentNotFound phpDoc
shaoshiva Sep 6, 2016
71b01b1
Fix Exception_FrontContentError class extends
shaoshiva Sep 6, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions framework/applications/noviusos_page/classes/model/page.model.php
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,32 @@ public function url($params = array())
return $url;
}

/**
* Gets the meta title
*
* @return bool|string
*/
public function getMetaTitle() {
return !$this->page_meta_noindex ? $this->page_meta_title : null;
}

/**
* Gets the meta description
*
* @return bool|string
*/
public function getMetaDescription() {
return !$this->page_meta_noindex ? $this->page_meta_description : null;
}

/**
* Gets the meta keywords
*
* @return bool|string
*/
public function getMetaKeywords() {
return !$this->page_meta_noindex ? $this->page_meta_keywords : null;
}

/**
* Delete the cache for this page
Expand Down
4 changes: 3 additions & 1 deletion framework/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
'Cache_Storage_File' => FUEL_EXTEND_PATH.'cache'.DIRECTORY_SEPARATOR.'storage'.DIRECTORY_SEPARATOR.'file.php',
'Date' => FUEL_EXTEND_PATH.'date.php',
'Debug' => FUEL_EXTEND_PATH.'debug.php',
'Event_Instance' => FUEL_EXTEND_PATH.'event/instance.php',
'Event_Instance' => FUEL_EXTEND_PATH.'event'.DIRECTORY_SEPARATOR.'instance.php',
'Email' => FUEL_EXTEND_PATH.'email.php',
'Email_Driver' => FUEL_EXTEND_PATH.'email'.DIRECTORY_SEPARATOR.'driver.php',
'Fuel' => FUEL_EXTEND_PATH.'fuel.php',
Expand Down Expand Up @@ -90,6 +90,8 @@
'Nos\Orm\Model' => FUEL_EXTEND_PATH.'orm'.DIRECTORY_SEPARATOR.'model.php',
'Nos\Orm\Query' => FUEL_EXTEND_PATH.'orm'.DIRECTORY_SEPARATOR.'query.php',
'Nos\Tasks\Migrate' => FUEL_EXTEND_PATH.'tasks'.DIRECTORY_SEPARATOR.'migrate.php',
'Nos\FrontIgnoreTemplateException' => NOSPATH.'classes'.DIRECTORY_SEPARATOR.'exception'.DIRECTORY_SEPARATOR.'frontignoretemplate.php',
'Nos\NotFoundException' => NOSPATH.'classes'.DIRECTORY_SEPARATOR.'exception'.DIRECTORY_SEPARATOR.'notfound.php',
)
);

Expand Down
Loading