aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-10-30 13:25:37 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-10-30 13:25:37 -0700
commitfab63ca751beac91d12e06c194101cacd1f909e5 (patch)
tree524fc265d0dbc29db44146b6b26032ca815d605a /boot.php
parent768acb0a3faf2c2f2a523420710673aaacb64f76 (diff)
downloadvolse-hubzilla-fab63ca751beac91d12e06c194101cacd1f909e5.tar.gz
volse-hubzilla-fab63ca751beac91d12e06c194101cacd1f909e5.tar.bz2
volse-hubzilla-fab63ca751beac91d12e06c194101cacd1f909e5.zip
-Wall cleanup
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index b67a6cebb..6cac527eb 100644
--- a/boot.php
+++ b/boot.php
@@ -129,12 +129,16 @@ class App {
$this->pager= array();
$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'])) ? 'https' : 'http' );
- $this->hostname = $_SERVER['SERVER_NAME'];
+
+ if(x($_SERVER,'SERVER_NAME'))
+ $this->hostname = $_SERVER['SERVER_NAME'];
+
set_include_path("include/$this->hostname" . PATH_SEPARATOR . 'include' . PATH_SEPARATOR . '.' );
- if(substr($_SERVER['QUERY_STRING'],0,2) == "q=")
+ if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) == "q=")
$_SERVER['QUERY_STRING'] = substr($_SERVER['QUERY_STRING'],2);
- $this->cmd = trim($_GET['q'],'/');
+ if(x($_GET,'q'))
+ $this->cmd = trim($_GET['q'],'/');
$this->argv = explode('/',$this->cmd);
@@ -1226,6 +1230,7 @@ function allowed_email($email) {
if(! function_exists('format_like')) {
function format_like($cnt,$arr,$type,$id) {
+ $o = '';
if($cnt == 1)
$o .= $arr[0] . (($type === 'like') ? t(' likes this.') : t(' doesn\'t like this.')) . EOL ;
else {