diff options
| -rw-r--r-- | boot.php | 11 | ||||
| -rw-r--r-- | include/auth.php | 23 | ||||
| -rw-r--r-- | include/dba.php | 4 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 2 | ||||
| -rw-r--r-- | mod/ping.php | 2 | ||||
| -rw-r--r-- | mod/profile.php | 3 | ||||
| -rw-r--r-- | util/typo.php | 5 |
8 files changed, 32 insertions, 20 deletions
@@ -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 { diff --git a/include/auth.php b/include/auth.php index a54b24f08..4813bb45b 100644 --- a/include/auth.php +++ b/include/auth.php @@ -2,7 +2,7 @@ // login/logout -if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] === 'login'))) { +if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] === 'login'))) { if($_POST['auth-params'] === 'logout' || $a->module === 'logout') { @@ -53,16 +53,19 @@ if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] === 'login'))) { } else { - unset($_SESSION['authenticated']); - unset($_SESSION['uid']); - unset($_SESSION['visitor_id']); - unset($_SESSION['administrator']); - unset($_SESSION['cid']); - unset($_SESSION['theme']); - unset($_SESSION['my_url']); - unset($_SESSION['page_flags']); + if(isset($_SESSION)) { + unset($_SESSION['authenticated']); + unset($_SESSION['uid']); + unset($_SESSION['visitor_id']); + unset($_SESSION['administrator']); + unset($_SESSION['cid']); + unset($_SESSION['theme']); + unset($_SESSION['my_url']); + unset($_SESSION['page_flags']); + } - $encrypted = hash('whirlpool',trim($_POST['password'])); + if(x($_POST,'password')) + $encrypted = hash('whirlpool',trim($_POST['password'])); if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') { diff --git a/include/dba.php b/include/dba.php index 133b596ef..9d0896a35 100644 --- a/include/dba.php +++ b/include/dba.php @@ -36,8 +36,8 @@ class dba { $mesg = ''; - if($this->db->mysqli->errno) - $debug_text .= $this->db->mysqli->error . EOL; + if($this->db->errno) + $debug_text .= $this->db->error . EOL; if($result === false) $mesg = 'false'; @@ -12,7 +12,7 @@ $install = ((file_exists('.htconfig.php')) ? false : true); @include(".htconfig.php"); -if(x($lang)) +if(isset($lang) && strlen($lang)) load_translation_table($lang); require_once("dba.php"); diff --git a/mod/network.php b/mod/network.php index 426ad196c..cbd8b6bc3 100644 --- a/mod/network.php +++ b/mod/network.php @@ -173,7 +173,7 @@ function network_content(&$a, $update = 0) { $comment = ''; $template = $tpl; $commentww = ''; - + $owner_url = $owner_photo = $owner_name = ''; $profile_url = $item['url']; $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; diff --git a/mod/ping.php b/mod/ping.php index 731562cd1..0831e57bf 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -25,7 +25,7 @@ function ping_init(&$a) { ); $intro = $r[0]['total']; - $myurl = $a->get_baseurl() . '/profile/' . $user['nickname'] ; + $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; $r = q("SELECT COUNT(*) AS `total` FROM `mail` WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", intval(local_user()), diff --git a/mod/profile.php b/mod/profile.php index 7c01501d6..3ab77a094 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -85,7 +85,7 @@ function profile_content(&$a, $update = 0) { $groups = array(); $tab = 'posts'; - + $o = ''; if($update) { // Ensure we've got a profile owner if updating. @@ -256,7 +256,6 @@ function profile_content(&$a, $update = 0) { ); - $cmnt_tpl = load_view_file('view/comment_item.tpl'); $like_tpl = load_view_file('view/like.tpl'); diff --git a/util/typo.php b/util/typo.php index e3141a46e..67fa7dc90 100644 --- a/util/typo.php +++ b/util/typo.php @@ -5,6 +5,11 @@ include 'boot.php'; + error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE); + ini_set('display_errors', '1'); + ini_set('log_errors','0'); + + $a = new App(); $files = glob('mod/*.php'); |