From 15471f383528a17c7373a1ef61ddd7ffb59faf06 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 11 Jul 2016 10:33:39 +0200 Subject: [PATCH] add possibility to load custom page templates + none.php pagetemplate is part of core now --- include/acl_selectors.php | 4 +- include/plugin.php | 38 +++++++++++++++++++ index.php | 26 ++++++------- js/autocomplete.js | 2 +- view/{ => php}/default.php | 0 view/{ => php}/minimal.php | 0 view/{theme/frio/php/modes => php}/none.php | 0 view/theme/decaf-mobile/{ => php}/default.php | 0 view/theme/dispy/{ => php}/default.php | 0 view/theme/frio/default.php | 32 ---------------- view/theme/frio/php/{modes => }/default.php | 0 view/theme/frio/php/{modes => }/standard.php | 0 view/theme/frost-mobile/{ => php}/default.php | 0 view/theme/frost/{ => php}/default.php | 0 view/theme/smoothly/{ => php}/default.php | 0 15 files changed, 53 insertions(+), 49 deletions(-) rename view/{ => php}/default.php (100%) rename view/{ => php}/minimal.php (100%) rename view/{theme/frio/php/modes => php}/none.php (100%) rename view/theme/decaf-mobile/{ => php}/default.php (100%) rename view/theme/dispy/{ => php}/default.php (100%) delete mode 100644 view/theme/frio/default.php rename view/theme/frio/php/{modes => }/default.php (100%) rename view/theme/frio/php/{modes => }/standard.php (100%) rename view/theme/frost-mobile/{ => php}/default.php (100%) rename view/theme/frost/{ => php}/default.php (100%) rename view/theme/smoothly/{ => php}/default.php (100%) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index fc3df52327..76f0e0b796 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -399,7 +399,7 @@ function acl_lookup(&$a, $out_type = 'json') { $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 100); $search = (x($_REQUEST,'search') ? $_REQUEST['search'] : ""); $type = (x($_REQUEST,'type') ? $_REQUEST['type'] : ""); - $mode = (x($_REQUEST,'mode') ? $_REQUEST['mode'] : ""); + $mode = (x($_REQUEST,'smode') ? $_REQUEST['smode'] : ""); $conv_id = (x($_REQUEST,'conversation') ? $_REQUEST['conversation'] : null); // For use with jquery.textcomplete for private mail completion @@ -690,7 +690,7 @@ function navbar_complete(&$a) { $localsearch = get_config('system','poco_local_search'); $search = $prefix.notags(trim($_REQUEST['search'])); - $mode = $_REQUEST['mode']; + $mode = $_REQUEST['smode']; // don't search if search term has less than 2 characters if(! $search || mb_strlen($search) < 2) diff --git a/include/plugin.php b/include/plugin.php index 2cb94b3504..e2bd23ee2a 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -534,3 +534,41 @@ function upgrade_bool_message($bbcode = false) { $x = upgrade_link($bbcode); return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ; } + +/** + * @brief Get the full path to relevant theme files by filename + * + * This function search in the theme directory (and if not present in global theme directory) + * if there is a directory with the file extension and for a file with the given + * filename. + * + * @param string $file Filename + * @param string $root Full root path + * @return string Path to the file or empty string if the file isn't found + */ +function theme_include($file, $root = '') { + // Make sure $root ends with a slash / if it's not blank + if($root !== '' && $root[strlen($root)-1] !== '/') + $root = $root . '/'; + $theme_info = $a->theme_info; + if(array_key_exists('extends',$theme_info)) + $parent = $theme_info['extends']; + else + $parent = 'NOPATH'; + $theme = current_theme(); + $thname = $theme; + $ext = substr($file,strrpos($file,'.')+1); + $paths = array( + "{$root}view/theme/$thname/$ext/$file", + "{$root}view/theme/$parent/$ext/$file", + "{$root}view/$ext/$file", + ); + foreach($paths as $p) { + // strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php) + if(strpos($p,'NOPATH') !== false) + continue; + if(file_exists($p)) + return $p; + } + return ''; +} \ No newline at end of file diff --git a/index.php b/index.php index 7b41403351..6ce348eac5 100644 --- a/index.php +++ b/index.php @@ -500,21 +500,19 @@ $profile = $a->profile; header("X-Friendica-Version: ".FRIENDICA_VERSION); header("Content-type: text/html; charset=utf-8"); - -if (isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) { - //$page['content'] = substr($target->saveHTML(), 6, -8)."\n\n". - // '
'."\n\n"; - - require "view/minimal.php"; -} else { - $template = 'view/theme/' . current_theme() . '/' - . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php'; - - if(file_exists($template)) - require_once($template); - else - require_once(str_replace('theme/' . current_theme() . '/', '', $template)); +// We use $_GET["mode"] for special page templates. So we will check if we have +// to load another page template than the default one +// The page templates are located in /view/php/ or in the theme directory +if (isset($_GET["mode"])) { + $template = theme_include($_GET["mode"].'.php'); } +// If there is no page template use the default page template +if(!$template) { + $template = theme_include("default.php"); +} + +require_once($template); + session_write_close(); exit; diff --git a/js/autocomplete.js b/js/autocomplete.js index 8020478722..d0c770cc4b 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -41,7 +41,7 @@ function contact_search(term, callback, backend_url, type, mode) { postdata['conversation'] = conv_id[0]; if(mode !== null) - postdata['mode'] = mode; + postdata['smode'] = mode; $.ajax({ diff --git a/view/default.php b/view/php/default.php similarity index 100% rename from view/default.php rename to view/php/default.php diff --git a/view/minimal.php b/view/php/minimal.php similarity index 100% rename from view/minimal.php rename to view/php/minimal.php diff --git a/view/theme/frio/php/modes/none.php b/view/php/none.php similarity index 100% rename from view/theme/frio/php/modes/none.php rename to view/php/none.php diff --git a/view/theme/decaf-mobile/default.php b/view/theme/decaf-mobile/php/default.php similarity index 100% rename from view/theme/decaf-mobile/default.php rename to view/theme/decaf-mobile/php/default.php diff --git a/view/theme/dispy/default.php b/view/theme/dispy/php/default.php similarity index 100% rename from view/theme/dispy/default.php rename to view/theme/dispy/php/default.php diff --git a/view/theme/frio/default.php b/view/theme/frio/default.php deleted file mode 100644 index 0faa7d97bb..0000000000 --- a/view/theme/frio/default.php +++ /dev/null @@ -1,32 +0,0 @@ -argv[0]); - -// This is uncommented because we don't need it anymore. -// We try to to use links which resulting in $_GET["mode"] = "none" -//if($page_type === "none") { -// $_GET["mode"] = "none"; -//} - -if((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) { - - require "view/theme/frio/php/modes/none.php"; -} elseif($page_type === "standard_page") { - require "view/theme/frio/php/modes/standard.php"; -} else { - require "view/theme/frio/php/modes/default.php"; -} - diff --git a/view/theme/frio/php/modes/default.php b/view/theme/frio/php/default.php similarity index 100% rename from view/theme/frio/php/modes/default.php rename to view/theme/frio/php/default.php diff --git a/view/theme/frio/php/modes/standard.php b/view/theme/frio/php/standard.php similarity index 100% rename from view/theme/frio/php/modes/standard.php rename to view/theme/frio/php/standard.php diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/php/default.php similarity index 100% rename from view/theme/frost-mobile/default.php rename to view/theme/frost-mobile/php/default.php diff --git a/view/theme/frost/default.php b/view/theme/frost/php/default.php similarity index 100% rename from view/theme/frost/default.php rename to view/theme/frost/php/default.php diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/php/default.php similarity index 100% rename from view/theme/smoothly/default.php rename to view/theme/smoothly/php/default.php