formatting

This commit is contained in:
Shish 2019-12-15 15:31:44 +00:00
parent f09d328b30
commit d705578f79
10 changed files with 120 additions and 88 deletions

View File

@ -834,12 +834,12 @@ function get_class_from_file(string $file): string
return $class; return $class;
} }
function stringer($s) { function stringer($s)
{
if (is_array($s)) { if (is_array($s)) {
if (isset($s[0])) { if (isset($s[0])) {
return "[" . implode(", ", array_map("stringer", $s)) . "]"; return "[" . implode(", ", array_map("stringer", $s)) . "]";
} } else {
else {
$pairs = []; $pairs = [];
foreach ($s as $k=>$v) { foreach ($s as $k=>$v) {
$pairs[] = "\"$k\"=>" . stringer($v); $pairs[] = "\"$k\"=>" . stringer($v);

View File

@ -1,5 +1,6 @@
<?php <?php
use function MicroHTML\{FORM,INPUT}; use function MicroHTML\FORM;
use function MicroHTML\INPUT;
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Misc * * Misc *
@ -541,8 +542,7 @@ function _fatal_error(Exception $e): void
} }
print("Version: $version (on $phpver)\n"); print("Version: $version (on $phpver)\n");
} } else {
else {
$q = (!isset($e->query) || is_null($e->query)) ? "" : "<p><b>Query:</b> " . html_escape($e->query); $q = (!isset($e->query) || is_null($e->query)) ? "" : "<p><b>Query:</b> " . html_escape($e->query);
header("HTTP/1.0 500 Internal Error"); header("HTTP/1.0 500 Internal Error");
echo ' echo '
@ -688,7 +688,8 @@ function make_form(string $target, string $method="POST", bool $multipart=false,
return '<form action="'.$target.'" method="'.$method.'" '.$extra.'>'.$extra_inputs; return '<form action="'.$target.'" method="'.$method.'" '.$extra.'>'.$extra_inputs;
} }
function SHM_FORM(string $target, string $method="POST", bool $multipart=false, string $form_id="", string $onsubmit="") { function SHM_FORM(string $target, string $method="POST", bool $multipart=false, string $form_id="", string $onsubmit="")
{
global $user; global $user;
$attrs = [ $attrs = [

View File

@ -1,6 +1,21 @@
<?php <?php
use function MicroHTML\{LABEL,A,B,IMG,TABLE,THEAD,TFOOT,TBODY,TH,TR,TD,INPUT,DIV,P,BR,emptyHTML}; use function MicroHTML\LABEL;
use function MicroHTML\A;
use function MicroHTML\B;
use function MicroHTML\IMG;
use function MicroHTML\TABLE;
use function MicroHTML\THEAD;
use function MicroHTML\TFOOT;
use function MicroHTML\TBODY;
use function MicroHTML\TH;
use function MicroHTML\TR;
use function MicroHTML\TD;
use function MicroHTML\INPUT;
use function MicroHTML\DIV;
use function MicroHTML\P;
use function MicroHTML\BR;
use function MicroHTML\emptyHTML;
class ExtManagerTheme extends Themelet class ExtManagerTheme extends Themelet
{ {

View File

@ -1,13 +1,20 @@
<?php <?php
use function MicroHTML\{A,SPAN,emptyHTML,INPUT,BR,SELECT,OPTION,rawHTML}; use function MicroHTML\A;
use function MicroHTML\SPAN;
use function MicroHTML\emptyHTML;
use function MicroHTML\INPUT;
use function MicroHTML\BR;
use function MicroHTML\SELECT;
use function MicroHTML\OPTION;
use function MicroHTML\rawHTML;
use MicroCRUD\Column; use MicroCRUD\Column;
use MicroCRUD\DateTimeColumn; use MicroCRUD\DateTimeColumn;
use MicroCRUD\TextColumn; use MicroCRUD\TextColumn;
use MicroCRUD\Table; use MicroCRUD\Table;
class ShortDateTimeColumn extends DateTimeColumn
class ShortDateTimeColumn extends DateTimeColumn { {
public function read_input(array $inputs) public function read_input(array $inputs)
{ {
return emptyHTML( return emptyHTML(
@ -24,10 +31,10 @@ class ShortDateTimeColumn extends DateTimeColumn {
]) ])
); );
} }
} }
class ActorColumn extends Column { class ActorColumn extends Column
{
public function __construct($name, $title) public function __construct($name, $title)
{ {
parent::__construct($name, $title, "((username LIKE :{$name}) OR (address::text LIKE :{$name}))"); parent::__construct($name, $title, "((username LIKE :{$name}) OR (address::text LIKE :{$name}))");
@ -48,7 +55,8 @@ class ActorColumn extends Column {
} }
} }
class MessageColumn extends Column { class MessageColumn extends Column
{
public function __construct($name, $title) public function __construct($name, $title)
{ {
parent::__construct( parent::__construct(
@ -60,8 +68,7 @@ class MessageColumn extends Column {
list($m, $l) = $var; list($m, $l) = $var;
if (empty($m)) { if (empty($m)) {
$m = "%"; $m = "%";
} } else {
else {
$m = "%$m%"; $m = "%$m%";
} }
if (empty($l)) { if (empty($l)) {

View File

@ -112,8 +112,10 @@ class NotATag extends Extension
} elseif ($event->get_arg(0) == "remove") { } elseif ($event->get_arg(0) == "remove") {
$user->ensure_authed(); $user->ensure_authed();
$input = validate_input(["d_tag"=>"string"]); $input = validate_input(["d_tag"=>"string"]);
$database->execute($database->scoreql_to_sql( $database->execute(
"DELETE FROM untags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"), $database->scoreql_to_sql(
"DELETE FROM untags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"
),
["tag"=>$input['d_tag']] ["tag"=>$input['d_tag']]
); );
flash_message("Image ban removed"); flash_message("Image ban removed");

View File

@ -8,24 +8,31 @@ use MicroCRUD\EnumColumn;
use MicroCRUD\TextColumn; use MicroCRUD\TextColumn;
use MicroCRUD\Table; use MicroCRUD\Table;
class UserNameColumn extends TextColumn { class UserNameColumn extends TextColumn
public function display(array $row) { {
public function display(array $row)
{
return A(["href"=>make_link("user/{$row[$this->name]}")], $row[$this->name]); return A(["href"=>make_link("user/{$row[$this->name]}")], $row[$this->name]);
} }
} }
class UserLinksColumn extends Column { class UserLinksColumn extends Column
public function __construct() { {
public function __construct()
{
parent::__construct("links", "User Links", "(1=1)"); parent::__construct("links", "User Links", "(1=1)");
$this->sortable = false; $this->sortable = false;
} }
public function create_input(array $inputs) { public function create_input(array $inputs)
{
return ""; return "";
} }
public function read_input(array $inputs) { public function read_input(array $inputs)
{
return ""; return "";
} }
public function display(array $row) { public function display(array $row)
{
return A(["href"=>make_link("post/list/user_id={$row['id']}/1")], "Posts"); return A(["href"=>make_link("post/list/user_id={$row['id']}/1")], "Posts");
} }
} }