load_config('config');
load_config('system');
+ if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND
+ (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
+ (substr($a->get_baseurl(), 0, 8) == "https://")) {
+ header("HTTP/1.1 302 Moved Temporarily");
+ header("location: ".$a->get_baseurl()."/".$a->query_string);
+ }
+
require_once("include/session.php");
load_hooks();
call_hooks('init_1');
*
* The order of these may be important so use caution if you think they're all
* intertwingled with no logical order and decide to sort it out. Some of the
- * dependencies have changed, but at least at one time in the recent past - the
+ * dependencies have changed, but at least at one time in the recent past - the
* order was critical to everything working properly
*
*/
*
* For Mozilla auth manager - still needs sorting, and this might conflict with LRDD header.
* Apache/PHP lumps the Link: headers into one - and other services might not be able to parse it
- * this way. There's a PHP flag to link the headers because by default this will over-write any other
+ * this way. There's a PHP flag to link the headers because by default this will over-write any other
* link header.
*
* What we really need to do is output the raw headers ourselves so we can keep them separate.
$_SESSION['sysmsg_info'] = array();
/*
- * check_config() is responsible for running update scripts. These automatically
+ * check_config() is responsible for running update scripts. These automatically
* update the DB schema whenever we push a new one out. It also checks to see if
- * any plugins have been added or removed and reacts accordingly.
+ * any plugins have been added or removed and reacts accordingly.
*/
-if($install)
+// in install mode, any url loads install module
+// but we need "view" module for stylesheet
+if($install && $a->module!="view")
$a->module = 'install';
-elseif($maintenance)
+elseif($maintenance && $a->module!="view")
$a->module = 'maintenance';
else {
check_url($a);
* and use it for handling our URL request.
* The module file contains a few functions that we call in various circumstances
* and in the following order:
- *
+ *
* "module"_init
* "module"_post (only called if there are $_POST variables)
* "module"_afterpost
* "module"_content - the string return of this function contains our page body
*
- * Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do
+ * Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do
* so within the module init and/or post functions and then invoke killme() to terminate
* further processing.
*/
if ($a->module == "stream")
$a->module = "network";
+ // Compatibility with the Firefox App
+ if (($a->module == "users") AND ($a->cmd == "users/sign_in"))
+ $a->module = "login";
+
$privateapps = get_config('config','private_addons');
if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
*
* The URL provided does not resolve to a valid module.
*
- * On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'.
- * We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic -
+ * On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'.
+ * We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic -
* we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page
* this will often succeed and eventually do the right thing.
*
* Report anything which needs to be communicated in the notification area (before the main body)
*
*/
-
+
/*if(x($_SESSION,'sysmsg')) {
$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
. ((x($a->page,'content')) ? $a->page['content'] : '');
$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
-if (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal")) {
+if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal"))) {
$doc = new DOMDocument();
$target = new DOMDocument();
}
}
-if ($_GET["mode"] == "raw") {
+if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
header("Content-type: text/html; charset=utf-8");
exit;
} elseif (get_pconfig(local_user(),'system','infinite_scroll')
- AND ($_GET["q"] == "network") AND ($_GET["mode"] != "minimal")) {
+ AND ($a->module == "network") AND ($_GET["mode"] != "minimal")) {
if (is_string($_GET["page"]))
$pageno = $_GET["page"];
else
});
function loadcontent() {
- //$("div.loader").show();
+ if (lockLoadContent) return;
+ lockLoadContent = true;
+
+ $("#scroll-loader").fadeIn('normal');
num+=1;
console.log('Loading page ' + num);
$.get('/network?mode=raw$reload_uri&page=' + num, function(data) {
- $(data).insertBefore('#conversation-end');
+ $("#scroll-loader").hide();
+ if ($(data).length > 0) {
+ $(data).insertBefore('#conversation-end');
+ lockLoadContent = false;
+ } else {
+ $("#scroll-end").fadeIn('normal');
+ }
});
-
- //$("div.loader").fadeOut('normal');
}
var num = $pageno;
+var lockLoadContent = false;
$(window).scroll(function(e){
if ($(document).height() != $(window).height()) {
// First method that is expected to work - but has problems with Chrome
- if ($(window).scrollTop() == $(document).height() - $(window).height())
+ if ($(window).scrollTop() > ($(document).height() - $(window).height() * 1.5))
loadcontent();
} else {
// This method works with Chrome - but seems to be much slower in Firefox
- if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height()))
+ if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height() * 1.5))
loadcontent();
}
});
header("Content-type: text/html; charset=utf-8");
-if ($_GET["mode"] == "minimal") {
+if (isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
//$page['content'] = substr($target->saveHTML(), 6, -8)."\n\n".
// '<div id="conversation-end"></div>'."\n\n";
require "view/minimal.php";
} else {
- $template = 'view/theme/' . current_theme() . '/'
+ $template = 'view/theme/' . current_theme() . '/'
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
if(file_exists($template))