Coding Standards
A few updates for coding standards
This commit is contained in:
Adam Magness
parent
5888cce08e
commit
d9e9cbe753
12 changed files with 357 additions and 249 deletions
106
index.php
106
index.php
|
|
@ -20,7 +20,7 @@ require_once 'boot.php';
|
|||
if (empty($a)) {
|
||||
$a = new App(__DIR__);
|
||||
}
|
||||
BaseObject::set_app($a);
|
||||
BaseObject::setApp($a);
|
||||
|
||||
// We assume that the index.php is called by a frontend process
|
||||
// The value is set to "true" by default in boot.php
|
||||
|
|
@ -40,9 +40,7 @@ if (!$install) {
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* Try to open the database;
|
||||
*
|
||||
*/
|
||||
|
||||
require_once "include/dba.php";
|
||||
|
|
@ -64,9 +62,10 @@ if (!$install) {
|
|||
die("System is currently unavailable. Please try again later");
|
||||
}
|
||||
|
||||
if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http") &&
|
||||
(intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
|
||||
(substr(System::baseUrl(), 0, 8) == "https://")) {
|
||||
if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http")
|
||||
&& (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
|
||||
&& (substr(System::baseUrl(), 0, 8) == "https://")
|
||||
) {
|
||||
header("HTTP/1.1 302 Moved Temporarily");
|
||||
header("Location: " . System::baseUrl() . "/" . $a->query_string);
|
||||
exit();
|
||||
|
|
@ -84,14 +83,12 @@ $lang = get_browser_language();
|
|||
load_translation_table($lang);
|
||||
|
||||
/**
|
||||
*
|
||||
* Important stuff we always need to do.
|
||||
*
|
||||
* 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
|
||||
* order was critical to everything working properly
|
||||
*
|
||||
*/
|
||||
|
||||
// Exclude the backend processes from the session management
|
||||
|
|
@ -107,7 +104,7 @@ if (!$a->is_backend()) {
|
|||
* Language was set earlier, but we can over-ride it in the session.
|
||||
* We have to do it here because the session was just now opened.
|
||||
*/
|
||||
if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
|
||||
if (x($_SESSION, 'authenticated') && !x($_SESSION, 'language')) {
|
||||
// we didn't loaded user data yet, but we need user language
|
||||
$r = dba::select('user', array('language'), array('uid' => $_SESSION['uid']), array('limit' => 1));
|
||||
$_SESSION['language'] = $lang;
|
||||
|
|
@ -116,18 +113,19 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
|
|||
}
|
||||
}
|
||||
|
||||
if ((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
|
||||
if ((x($_SESSION, 'language')) && ($_SESSION['language'] !== $lang)) {
|
||||
$lang = $_SESSION['language'];
|
||||
load_translation_table($lang);
|
||||
}
|
||||
|
||||
if ((x($_GET,'zrl')) && (!$install && !$maintenance)) {
|
||||
if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
|
||||
// Only continue when the given profile link seems valid
|
||||
// Valid profile links contain a path with "/profile/" and no query parameters
|
||||
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
|
||||
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
|
||||
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "")
|
||||
&& strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")
|
||||
) {
|
||||
$_SESSION['my_url'] = $_GET['zrl'];
|
||||
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
|
||||
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is', '', $a->query_string);
|
||||
zrl_init($a);
|
||||
} else {
|
||||
// Someone came with an invalid parameter, maybe as a DDoS attempt
|
||||
|
|
@ -140,23 +138,21 @@ if ((x($_GET,'zrl')) && (!$install && !$maintenance)) {
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* 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
|
||||
* link header.
|
||||
*
|
||||
* What we really need to do is output the raw headers ourselves so we can keep them separate.
|
||||
*
|
||||
*/
|
||||
|
||||
// header('Link: <' . System::baseUrl() . '/amcd>; rel="acct-mgmt";');
|
||||
|
||||
if (x($_COOKIE["Friendica"]) || (x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) {
|
||||
require("include/auth.php");
|
||||
if (x($_COOKIE["Friendica"]) || (x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || ($a->module === 'login')) {
|
||||
require "include/auth.php";
|
||||
}
|
||||
|
||||
if (! x($_SESSION,'authenticated')) {
|
||||
if (! x($_SESSION, 'authenticated')) {
|
||||
header('X-Account-Management-Status: none');
|
||||
}
|
||||
|
||||
|
|
@ -165,16 +161,16 @@ $a->page['htmlhead'] = '';
|
|||
$a->page['end'] = '';
|
||||
|
||||
|
||||
if (! x($_SESSION,'sysmsg')) {
|
||||
if (! x($_SESSION, 'sysmsg')) {
|
||||
$_SESSION['sysmsg'] = array();
|
||||
}
|
||||
|
||||
if (! x($_SESSION,'sysmsg_info')) {
|
||||
if (! x($_SESSION, 'sysmsg_info')) {
|
||||
$_SESSION['sysmsg_info'] = array();
|
||||
}
|
||||
|
||||
// Array for informations about last received items
|
||||
if (! x($_SESSION,'last_updated')) {
|
||||
if (! x($_SESSION, 'last_updated')) {
|
||||
$_SESSION['last_updated'] = array();
|
||||
}
|
||||
/*
|
||||
|
|
@ -198,7 +194,7 @@ if ($install && $a->module!="view") {
|
|||
nav_set_selected('nothing');
|
||||
|
||||
//Don't populate apps_menu if apps are private
|
||||
$privateapps = Config::get('config','private_addons');
|
||||
$privateapps = Config::get('config', 'private_addons');
|
||||
if ((local_user()) || (! $privateapps === "1")) {
|
||||
$arr = array('app_menu' => $a->apps);
|
||||
|
||||
|
|
@ -208,7 +204,6 @@ if ((local_user()) || (! $privateapps === "1")) {
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* We have already parsed the server path into $a->argc and $a->argv
|
||||
*
|
||||
* $a->argv[0] is our module name. We will load the file mod/{$a->argv[0]}.php
|
||||
|
|
@ -229,10 +224,8 @@ if ((local_user()) || (! $privateapps === "1")) {
|
|||
if (strlen($a->module)) {
|
||||
|
||||
/**
|
||||
*
|
||||
* We will always have a module name.
|
||||
* First see if we have a plugin which is masquerading as a module.
|
||||
*
|
||||
*/
|
||||
|
||||
// Compatibility with the Android Diaspora client
|
||||
|
|
@ -245,14 +238,14 @@ if (strlen($a->module)) {
|
|||
$a->module = "login";
|
||||
}
|
||||
|
||||
$privateapps = Config::get('config','private_addons');
|
||||
$privateapps = Config::get('config', 'private_addons');
|
||||
|
||||
if (is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
|
||||
if (is_array($a->plugins) && in_array($a->module, $a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
|
||||
//Check if module is an app and if public access to apps is allowed or not
|
||||
if ((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
|
||||
info( t("You must be logged in to use addons. "));
|
||||
info(t("You must be logged in to use addons. "));
|
||||
} else {
|
||||
include_once("addon/{$a->module}/{$a->module}.php");
|
||||
include_once "addon/{$a->module}/{$a->module}.php";
|
||||
if (function_exists($a->module . '_module')) {
|
||||
$a->module_loaded = true;
|
||||
}
|
||||
|
|
@ -264,12 +257,11 @@ if (strlen($a->module)) {
|
|||
*/
|
||||
|
||||
if ((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
|
||||
include_once("mod/{$a->module}.php");
|
||||
include_once "mod/{$a->module}.php";
|
||||
$a->module_loaded = true;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* 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'.
|
||||
|
|
@ -278,17 +270,15 @@ if (strlen($a->module)) {
|
|||
* this will often succeed and eventually do the right thing.
|
||||
*
|
||||
* Otherwise we are going to emit a 404 not found.
|
||||
*
|
||||
*/
|
||||
|
||||
if (! $a->module_loaded) {
|
||||
|
||||
// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
|
||||
if ((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
|
||||
if ((x($_SERVER, 'QUERY_STRING')) && preg_match('/{[0-9]}/', $_SERVER['QUERY_STRING']) !== 0) {
|
||||
killme();
|
||||
}
|
||||
|
||||
if ((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
|
||||
if ((x($_SERVER, 'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
|
||||
logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
|
||||
goaway(System::baseUrl() . $_SERVER['REQUEST_URI']);
|
||||
}
|
||||
|
|
@ -296,29 +286,31 @@ if (strlen($a->module)) {
|
|||
logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
|
||||
header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
|
||||
$tpl = get_markup_template("404.tpl");
|
||||
$a->page['content'] = replace_macros($tpl, array(
|
||||
'$message' => t('Page not found.' )
|
||||
));
|
||||
$a->page['content'] = replace_macros(
|
||||
$tpl,
|
||||
array(
|
||||
'$message' => t('Page not found.'))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* load current theme info
|
||||
* Load current theme info
|
||||
*/
|
||||
$theme_info_file = "view/theme/".current_theme()."/theme.php";
|
||||
if (file_exists($theme_info_file)){
|
||||
require_once($theme_info_file);
|
||||
if (file_exists($theme_info_file)) {
|
||||
require_once $theme_info_file;
|
||||
}
|
||||
|
||||
|
||||
/* initialise content region */
|
||||
|
||||
if (! x($a->page,'content')) {
|
||||
if (! x($a->page, 'content')) {
|
||||
$a->page['content'] = '';
|
||||
}
|
||||
|
||||
if (!$install && !$maintenance) {
|
||||
call_hooks('page_content_top',$a->page['content']);
|
||||
call_hooks('page_content_top', $a->page['content']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -335,21 +327,22 @@ if ($a->module_loaded) {
|
|||
$func($a);
|
||||
}
|
||||
|
||||
if (function_exists(str_replace('-','_',current_theme()) . '_init')) {
|
||||
$func = str_replace('-','_',current_theme()) . '_init';
|
||||
if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
|
||||
$func = str_replace('-', '_', current_theme()) . '_init';
|
||||
$func($a);
|
||||
}
|
||||
|
||||
if (($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
|
||||
&& (function_exists($a->module . '_post'))
|
||||
&& (! x($_POST,'auth-params'))) {
|
||||
&& (! x($_POST, 'auth-params'))
|
||||
) {
|
||||
call_hooks($a->module . '_mod_post', $_POST);
|
||||
$func = $a->module . '_post';
|
||||
$func($a);
|
||||
}
|
||||
|
||||
if ((! $a->error) && (function_exists($a->module . '_afterpost'))) {
|
||||
call_hooks($a->module . '_mod_afterpost',$placeholder);
|
||||
call_hooks($a->module . '_mod_afterpost', $placeholder);
|
||||
$func = $a->module . '_afterpost';
|
||||
$func($a);
|
||||
}
|
||||
|
|
@ -364,8 +357,8 @@ if ($a->module_loaded) {
|
|||
$a->page['content'] .= $arr['content'];
|
||||
}
|
||||
|
||||
if (function_exists(str_replace('-','_',current_theme()) . '_content_loaded')) {
|
||||
$func = str_replace('-','_',current_theme()) . '_content_loaded';
|
||||
if (function_exists(str_replace('-', '_', current_theme()) . '_content_loaded')) {
|
||||
$func = str_replace('-', '_', current_theme()) . '_content_loaded';
|
||||
$func($a);
|
||||
}
|
||||
}
|
||||
|
|
@ -427,10 +420,12 @@ if ($a->is_mobile || $a->is_tablet) {
|
|||
} else {
|
||||
$link = 'toggle_mobile?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')
|
||||
));
|
||||
$a->page['footer'] = replace_macros(
|
||||
get_markup_template("toggle_mobile_footer.tpl"),
|
||||
array(
|
||||
'$toggle_link' => $link,
|
||||
'$toggle_text' => t('toggle mobile'))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -443,7 +438,7 @@ if (!$a->theme['stylesheet']) {
|
|||
$stylesheet = $a->theme['stylesheet'];
|
||||
}
|
||||
|
||||
$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
|
||||
$a->page['htmlhead'] = str_replace('{{$stylesheet}}', $stylesheet, $a->page['htmlhead']);
|
||||
//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
|
||||
|
||||
if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) {
|
||||
|
|
@ -470,7 +465,6 @@ if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "mini
|
|||
}
|
||||
|
||||
if (isset($_GET["mode"]) && ($_GET["mode"] == "raw")) {
|
||||
|
||||
header("Content-type: text/html; charset=utf-8");
|
||||
|
||||
echo substr($target->saveHTML(), 6, -8);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue