aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot.php83
-rw-r--r--include/plugin.php14
-rw-r--r--index.php81
3 files changed, 87 insertions, 91 deletions
diff --git a/boot.php b/boot.php
index fc93879e7..6e90af0bc 100644
--- a/boot.php
+++ b/boot.php
@@ -1940,3 +1940,86 @@ function curPageURL() {
}
return $pageURL;
}
+
+function construct_page(&$a) {
+
+
+ /**
+ * Build the page - now that we have all the components
+ */
+
+
+ if($a->module != 'install') {
+ nav($a);
+ }
+
+ require_once(theme_include('theme_init.php'));
+
+ if(($p = theme_include(current_theme() . '.js')) != '')
+ head_add_js($p);
+
+ if(($p = theme_include('mod_' . $a->module . '.php')) != '')
+ require_once($p);
+
+ require_once('include/js_strings.php');
+
+ head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css');
+ head_add_css('mod_' . $a->module . '.css');
+ head_add_css('style.css');
+
+ head_add_js('mod_' . $a->module . '.js');
+
+
+ $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
+ if($interval < 10000)
+ $interval = 40000;
+
+ $a->page['title'] = $a->config['system']['sitename'];
+
+
+ $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
+ '$baseurl' => $a->get_baseurl(),
+ '$local_user' => local_user(),
+ '$generator' => FRIENDICA_PLATFORM . ' ' . FRIENDICA_VERSION,
+ '$update_interval' => $interval,
+ '$head_css' => head_get_css(),
+ '$head_js' => head_get_js(),
+ '$js_strings' => js_strings()
+ ));
+
+ $arr = $a->get_widgets();
+ if(count($arr)) {
+ foreach($arr as $x) {
+ if(! array_key_exists($x['location'],$a->page))
+ $a->page[$x['location']] = '';
+ $a->page[$x['location']] .= $x['html'];
+ }
+ }
+
+ if($a->is_mobile || $a->is_tablet) {
+ if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
+ $link = $a->get_baseurl() . '/toggle_mobile?f=&address=' . curPageURL();
+ }
+ else {
+ $link = $a->get_baseurl() . '/toggle_mobile?f=&off=1&address=' . curPageURL();
+ }
+ $a->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
+ '$toggle_link' => $link,
+ '$toggle_text' => t('toggle mobile')
+ ));
+ }
+
+ $page = $a->page;
+ $profile = $a->profile;
+
+ header("Content-type: text/html; charset=utf-8");
+
+ require_once(theme_include(
+ ((x($a->page,'template'))
+ ? $a->page['template']
+ : 'default' )
+ . '.php' )
+ );
+
+ return;
+} \ No newline at end of file
diff --git a/include/plugin.php b/include/plugin.php
index c13a0ff07..6a35a6187 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -4,14 +4,11 @@
// install and uninstall plugin
if (! function_exists('uninstall_plugin')){
function uninstall_plugin($plugin){
- logger("Addons: uninstalling " . $plugin);
+ logger("Addons: uninstalling " . $plugin, LOGGER_DEBUG);
q("DELETE FROM `addon` WHERE `name` = '%s' ",
dbesc($plugin)
);
- // define THISPLUGIN, make life easy to plugin devs :-)
- define("THISPLUGIN", 'addon/' . $plugin . '/' . $plugin . '.php');
-
@include_once('addon/' . $plugin . '/' . $plugin . '.php');
if(function_exists($plugin . '_uninstall')) {
$func = $plugin . '_uninstall';
@@ -23,11 +20,9 @@ if (! function_exists('install_plugin')){
function install_plugin($plugin) {
// silently fail if plugin was removed
- // define THISPLUGIN, make life easy to plugin devs :-)
- define("THISPLUGIN", 'addon/' . $plugin . '/' . $plugin . '.php');
-
if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
return false;
+
logger("Addons: installing " . $plugin);
$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
@include_once('addon/' . $plugin . '/' . $plugin . '.php');
@@ -35,7 +30,7 @@ function install_plugin($plugin) {
$func = $plugin . '_install';
$func();
- $plugin_admin = (function_exists($plugin."_plugin_admin")?1:0);
+ $plugin_admin = (function_exists($plugin . "_plugin_admin") ? 1 : 0);
$r = q("INSERT INTO `addon` (`name`, `installed`, `timestamp`, `plugin_admin`) VALUES ( '%s', 1, %d , %d ) ",
dbesc($plugin),
@@ -83,9 +78,6 @@ function reload_plugins() {
$fname = 'addon/' . $pl . '/' . $pl . '.php';
- // define THISPLUGIN, make life easy to plugin devs :-)
- define("THISPLUGIN", $fname);
-
if(file_exists($fname)) {
$t = @filemtime($fname);
foreach($installed as $i) {
diff --git a/index.php b/index.php
index f718850a8..d5739f39e 100644
--- a/index.php
+++ b/index.php
@@ -329,87 +329,8 @@ if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
call_hooks('page_end', $a->page['content']);
-/**
- *
- * Add the navigation (menu) template
- *
- */
-
-if($a->module != 'install') {
- nav($a);
-}
-
-/**
- * Build the page - now that we have all the components
- */
-
-
-require_once(theme_include('theme_init.php'));
-
-if(($p = theme_include(current_theme() . '.js')) != '')
- head_add_js($p);
-
-if(($p = theme_include('mod_' . $a->module . '.php')) != '')
- require_once($p);
-
-require_once('include/js_strings.php');
-
-head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css');
-head_add_css('mod_' . $a->module . '.css');
-head_add_css('style.css');
-
-head_add_js('mod_' . $a->module . '.js');
-
-
- $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
- if($interval < 10000)
- $interval = 40000;
-
- $a->page['title'] = $a->config['system']['sitename'];
-
-
- $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
- '$baseurl' => $a->get_baseurl(),
- '$local_user' => local_user(),
- '$generator' => FRIENDICA_PLATFORM . ' ' . FRIENDICA_VERSION,
- '$update_interval' => $interval,
- '$head_css' => head_get_css(),
- '$head_js' => head_get_js(),
- '$js_strings' => js_strings()
- ));
-
-$arr = $a->get_widgets();
-if(count($arr)) {
- foreach($arr as $x) {
- if(! array_key_exists($x['location'],$a->page))
- $a->page[$x['location']] = '';
- $a->page[$x['location']] .= $x['html'];
- }
-}
-
-if($a->is_mobile || $a->is_tablet) {
- if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
- $link = $a->get_baseurl() . '/toggle_mobile?f=&address=' . curPageURL();
- }
- else {
- $link = $a->get_baseurl() . '/toggle_mobile?f=&off=1&address=' . curPageURL();
- }
- $a->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
- '$toggle_link' => $link,
- '$toggle_text' => t('toggle mobile')
- ));
-}
-
-$page = $a->page;
-$profile = $a->profile;
-
-header("Content-type: text/html; charset=utf-8");
-require_once(theme_include(
- ((x($a->page,'template'))
- ? $a->page['template']
- : 'default' )
- . '.php' ));
+construct_page($a);
session_write_close();
exit;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:32:05 +0000