Browse Source

-Wall cleanup

pull/1/head
Mike Macgirvin 10 years ago
parent
commit
fab63ca751
8 changed files with 32 additions and 20 deletions
  1. +8
    -3
      boot.php
  2. +13
    -10
      include/auth.php
  3. +2
    -2
      include/dba.php
  4. +1
    -1
      index.php
  5. +1
    -1
      mod/network.php
  6. +1
    -1
      mod/ping.php
  7. +1
    -2
      mod/profile.php
  8. +5
    -0
      util/typo.php

+ 8
- 3
boot.php View File

@ -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 {

+ 13
- 10
include/auth.php View File

@ -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') {

+ 2
- 2
include/dba.php View File

@ -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';

+ 1
- 1
index.php View File

@ -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");

+ 1
- 1
mod/network.php View File

@ -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'] ;

+ 1
- 1
mod/ping.php View File

@ -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()),

+ 1
- 2
mod/profile.php View File

@ -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');

+ 5
- 0
util/typo.php View File

@ -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');

Loading…
Cancel
Save