Mercurial > SimpleWebPresenter
changeset 53:2e6ba7259281
Merge
| author | Tom Fredrik "BFG" Klaussen <bfg@blenning.no> |
|---|---|
| date | Thu, 11 Oct 2012 00:54:54 +0200 |
| parents | 3898353ed1d8 (current diff) 2cfea6e84694 (diff) |
| children | f938b292f046 |
| files | accept-language.inc common-functions.inc sitemap.php |
| diffstat | 10 files changed, 49 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Doxyfile Thu Oct 11 00:48:46 2012 +0200 +++ b/Doxyfile Thu Oct 11 00:54:54 2012 +0200 @@ -38,7 +38,7 @@ # for a project that appears at the top of each page and should give viewer # a quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = +PROJECT_BRIEF = "An extremely simple CMS" # With the PROJECT_LOGO tag one can specify an logo or icon that is # included in the documentation. The maximum height of the logo should not
--- a/accept-language.inc Thu Oct 11 00:48:46 2012 +0200 +++ b/accept-language.inc Thu Oct 11 00:54:54 2012 +0200 @@ -1,7 +1,23 @@ <?php +<<<<<<< local class Language { function acceptedLanguages() { $langs = array(); +======= +/** + * @file + * Functionality for determining language use + */ + +/** + * Extracts the accepted languages from the GET query, sorted by + * preference(q-value). + * + * @return associative array of language codes with q value + */ +function acceptedLanguages() { + $langs = array(); +>>>>>>> other if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { // break up string into pieces (languages and q factors)
--- a/common-functions.inc Thu Oct 11 00:48:46 2012 +0200 +++ b/common-functions.inc Thu Oct 11 00:54:54 2012 +0200 @@ -1,4 +1,8 @@ <?php +/** + * @file + * Functionality which doesn't belong anywhere else + */ include_once 'CacheTimeCheck.inc'; $baseDir = dirname(__FILE__);
--- a/constants.inc Thu Oct 11 00:48:46 2012 +0200 +++ b/constants.inc Thu Oct 11 00:54:54 2012 +0200 @@ -1,4 +1,8 @@ <?php +/** + * @file + * Definitions of constants + */ define(VERBOSITY_NONE, 0); define(VERBOSITY_ERROR, 1); define(VERBOSITY_WARNING, 10);
--- a/filters.inc Thu Oct 11 00:48:46 2012 +0200 +++ b/filters.inc Thu Oct 11 00:54:54 2012 +0200 @@ -1,4 +1,8 @@ <?php +/** + * @file + * Filters which may be used from xml + */ function activeNav($input, $options) { $name = $options->getName();
--- a/flag.php Thu Oct 11 00:48:46 2012 +0200 +++ b/flag.php Thu Oct 11 00:54:54 2012 +0200 @@ -1,4 +1,8 @@ <?php +/** + * @file + * Displays a flag, in an active or disabled state, depending on parameters + */ define(DEBUG,0); include_once 'CacheTimeCheck.inc';
--- a/index.php Thu Oct 11 00:48:46 2012 +0200 +++ b/index.php Thu Oct 11 00:54:54 2012 +0200 @@ -1,4 +1,8 @@ <?php +/** + * @file + * Main access point for webpages + */ include_once 'constants.inc'; $cacheable = true;
--- a/inputParser.inc Thu Oct 11 00:48:46 2012 +0200 +++ b/inputParser.inc Thu Oct 11 00:54:54 2012 +0200 @@ -1,4 +1,8 @@ <?php +/** + * @file + * Functionality for translating an XML document into a webpage + */ function getParam($param) { $param_type=$param->getAttribute("type");