This commit is contained in:
Shish 2019-11-04 01:04:08 +00:00
parent 7601140825
commit c7d90c2df7
9 changed files with 19 additions and 20 deletions

View file

@ -272,9 +272,9 @@ class AdminPage extends Extension
}
$database->execute("ALTER TABLE images AUTO_INCREMENT=".(count($ids) + 1));
} elseif ($matches['proto'] == DatabaseDriver::PGSQL) {
//TODO: Make this work with PostgreSQL
throw new SCoreException("TODO: Make this work with PostgreSQL");
} elseif ($matches['proto'] == DatabaseDriver::SQLITE) {
//TODO: Make this work with SQLite
throw new SCoreException("TODO: Make this work with SQLite");
}
return true;
}

View file

@ -207,11 +207,13 @@ class Artists extends Extension
$images = Image::find_images(0, 4, Tag::explode($artist['name']));
$this->theme->show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin);
/*
if ($userIsLogged) {
//$this->theme->show_new_alias_composer($artistID);
//$this->theme->show_new_member_composer($artistID);
//$this->theme->show_new_url_composer($artistID);
$this->theme->show_new_alias_composer($artistID);
$this->theme->show_new_member_composer($artistID);
$this->theme->show_new_url_composer($artistID);
}
*/
$this->theme->sidebar_options("editor", $artistID, $userIsAdmin);

View file

@ -109,7 +109,7 @@ class BulkActions extends Extension
$query = $event->args[0];
$items = $this->yield_search_results($event->args[1]);
$newEvent = new BulkActionEvent($event->args[0], $event, $items);
print($newEvent);
var_dump($newEvent);
# send_event($newEvent);
}
}

View file

@ -36,7 +36,6 @@ abstract class CronUploaderConfig
$config->set_int(self::USER, $value);
}
public static function get_key(): string
{
global $config;
@ -55,10 +54,10 @@ abstract class CronUploaderConfig
return $config->get_int(self::COUNT);
}
public static function set_count(int $value): int
public static function set_count(int $value): void
{
global $config;
$config->get_int(self::COUNT, $value);
$config->set_int(self::COUNT, $value);
}
public static function get_dir(): string

View file

@ -118,9 +118,11 @@ and of course start organising your images :-)
$page->set_subheading("Page {$this->page_number} / {$this->total_pages}");
}
}
/*
if ($this->page_number > 1 || count($this->search_terms) > 0) {
// $page_title .= " / $page_number";
$page_title .= " / $page_number";
}
*/
$page->set_title($page_title);
$page->set_heading($page_title);

View file

@ -139,7 +139,7 @@ class PrivMsg extends Extension
}
$this->theme->display_message($page, $from_user, $user, new PM($pm));
} else {
// permission denied
$this->theme->display_permission_denied();
}
break;
case "delete":

View file

@ -331,13 +331,13 @@ class TranscodeImage extends Extension
}
break;
}
if ($result===false) {
throw new ImageTranscodeException("Error while transcoding ".$source_name." to ".$target_format);
}
return $tmp_name;
} finally {
imagedestroy($image);
}
if ($result===false) {
throw new ImageTranscodeException("Error while transcoding ".$source_name." to ".$target_format);
}
return $tmp_name;
}
private function transcode_image_convert(String $source_name, String $source_format, string $target_format): string

View file

@ -28,10 +28,6 @@ class Upgrade extends Extension
$this->set_version("db_version", 2);
}
if ($this->get_version("db_version") < 6) {
// cry :S
}
// v7 is convert to innodb with adodb
// now done again as v9 with PDO

View file

@ -8,7 +8,7 @@ class CustomExtManagerTheme extends ExtManagerTheme
parent::display_table($page, $extensions, $editable);
}
public function display_doc(Page $page, ExtensionManagerInfo $info)
public function display_doc(Page $page, ExtensionInfo $info)
{
$page->disable_left();
parent::display_doc($page, $info);