From 767245e9ff05a1d54787711f68f0ce5ff3d1e26f Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 28 Mar 2012 11:42:04 +0200 Subject: [PATCH 1/4] viewsrc: return only body if page is requested via ajax --- boot.php | 4 ++++ mod/viewsrc.php | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 3dcb32dfa7..e0ab98bde5 100755 --- a/boot.php +++ b/boot.php @@ -563,6 +563,10 @@ function absurl($path) { return $path; } +function is_ajax() { + return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'); +} + // Primarily involved with database upgrade, but also sets the // base url for use in cmdline programs which don't have diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 94847ec7b9..3fa4eaed53 100755 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -25,7 +25,12 @@ function viewsrc_content(&$a) { ); if(count($r)) - $o .= str_replace("\n",'
',$r[0]['body']); + if(is_ajax()) { + echo str_replace("\n",'
',$r[0]['body']); + killme(); + } else { + $o .= str_replace("\n",'
',$r[0]['body']); + } return $o; } From 3d5e711780391fece27af1aaf915b81aca7536fe Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:20:13 -0400 Subject: [PATCH 3/4] WITH is going on? Signed-off-by: Simon L'nu --- view/theme/dispy-dark/theme.php | 3 ++- view/theme/dispy/theme.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 372757752a..f06a97a5f1 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -157,7 +157,8 @@ function dispydark_community_info() { } // use our 'default.php' instead of the system-wide one -$a->page['template'] = "theme/dispy-dark/default"; +$theme_name = 'dispy-dark'; +//$a->page['template'] = "theme/dispy-dark/default"; // aside on profile page if ($a->argv[0] === "profile") { diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 190872d01e..15e54f7e21 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -157,7 +157,8 @@ function dispy_community_info() { } // use our 'default.php' instead of the system-wide one -$a->page['template'] = "theme/dispy-dark/default"; +$theme_name = 'dispy'; +//$a->page['template'] = "theme/dispy/default"; // aside on profile page if ($a->argv[0] === "profile") { From 4a75ea2f42c44318fa018a0753c54e0a7ce42188 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:47:38 -0400 Subject: [PATCH 4/4] really fix it this time... Signed-off-by: Simon L'nu --- view/theme/dispy-dark/theme.php | 8 ++------ view/theme/dispy/theme.php | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index f06a97a5f1..cebe9eb4fc 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -91,13 +91,13 @@ $(document).ready(function() { $('.floaterflip').css({ backgroundPosition: '-210px -60px' }); - $('.search-box').slideDown('fast'); + $('.search-box').slideUp('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); - $('.search-box').slideUp('fast'); + $('.search-box').slideDown('fast'); } }; // our trigger for the toolbar button @@ -156,10 +156,6 @@ function dispydark_community_info() { $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// use our 'default.php' instead of the system-wide one -$theme_name = 'dispy-dark'; -//$a->page['template'] = "theme/dispy-dark/default"; - // aside on profile page if ($a->argv[0] === "profile") { dispydark_community_info(); diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 15e54f7e21..9789fd0fa3 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -91,13 +91,13 @@ $(document).ready(function() { $('.floaterflip').css({ backgroundPosition: '-210px -60px' }); - $('.search-box').slideDown('fast'); + $('.search-box').slideUp('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); - $('.search-box').slideUp('fast'); + $('.search-box').slideDown('fast'); } }; // our trigger for the toolbar button @@ -156,10 +156,6 @@ function dispy_community_info() { $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// use our 'default.php' instead of the system-wide one -$theme_name = 'dispy'; -//$a->page['template'] = "theme/dispy/default"; - // aside on profile page if ($a->argv[0] === "profile") { dispy_community_info();