More linting and fixing

This commit is contained in:
jgen 2017-03-08 23:52:31 -08:00
parent fc0945354d
commit ede2fcf4eb
3 changed files with 12 additions and 7 deletions

View file

@ -790,28 +790,28 @@ class MockDatabase extends Database {
/** /**
* @param string $query * @param string $query
* @param array $args * @param array $args
* @return array|PDOStatement * @return PDOStatement
*/ */
public function get_all($query, $args=array()) {return $this->execute($query, $args);} public function get_all($query, $args=array()) {return $this->execute($query, $args);}
/** /**
* @param string $query * @param string $query
* @param array $args * @param array $args
* @return mixed|null|PDOStatement * @return PDOStatement
*/ */
public function get_row($query, $args=array()) {return $this->execute($query, $args);} public function get_row($query, $args=array()) {return $this->execute($query, $args);}
/** /**
* @param string $query * @param string $query
* @param array $args * @param array $args
* @return array|PDOStatement * @return PDOStatement
*/ */
public function get_col($query, $args=array()) {return $this->execute($query, $args);} public function get_col($query, $args=array()) {return $this->execute($query, $args);}
/** /**
* @param string $query * @param string $query
* @param array $args * @param array $args
* @return array|PDOStatement * @return PDOStatement
*/ */
public function get_pairs($query, $args=array()) {return $this->execute($query, $args);} public function get_pairs($query, $args=array()) {return $this->execute($query, $args);}

View file

@ -59,6 +59,11 @@ class _SafeOuroborosImage
* @var integer * @var integer
*/ */
public $width = null; public $width = null;
/**
* File extension
* @var string
*/
public $file_ext = '';
/** /**
* File Size in bytes * File Size in bytes
* @var integer * @var integer
@ -189,7 +194,7 @@ class _SafeOuroborosImage
* Constructor * Constructor
* @param Image $img * @param Image $img
*/ */
function __construct(Image $img) public function __construct(Image $img)
{ {
global $config; global $config;
// author // author
@ -343,7 +348,7 @@ class _SafeOuroborosTag
public $name = ''; public $name = '';
public $type = 0; public $type = 0;
function __construct(array $tag) public function __construct(array $tag)
{ {
$this->count = $tag['count']; $this->count = $tag['count'];
$this->id = $tag['id']; $this->id = $tag['id'];

View file

@ -164,7 +164,7 @@ class Layout {
$flash = $page->get_cookie("flash_message"); $flash = $page->get_cookie("flash_message");
$flash_html = ""; $flash_html = "";
if($flash) { if(!empty($flash)) {
$flash_html = "<b id='flash'>".nl2br(html_escape($flash))." <a href='#' onclick=\"\$('#flash').hide(); return false;\">[X]</a></b>"; $flash_html = "<b id='flash'>".nl2br(html_escape($flash))." <a href='#' onclick=\"\$('#flash').hide(); return false;\">[X]</a></b>";
} }