mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-23 05:34:55 +00:00
Code Issues Activity

Tweaks

Browse source
This commit is contained in:
J. King 2017-07-11 09:15:44 -04:00
parent eacada3982
commit 387b40829b
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Conf.php
View file

@ -16,13 +16,13 @@ class Conf {
public $dbPostgreSQLPort = 5432; public $dbPostgreSQLPort = 5432;
public $dbPostgreSQLDb = "arsse"; public $dbPostgreSQLDb = "arsse";
public $dbPostgreSQLSchema = ""; public $dbPostgreSQLSchema = "";
public $dbPostgreSQLAutoUpd = false; public $dbPostgreSQLAutoUpd = true;
public $dbMySQLHost = "localhost"; public $dbMySQLHost = "localhost";
public $dbMySQLUser = "arsse"; public $dbMySQLUser = "arsse";
public $dbMySQLPass = ""; public $dbMySQLPass = "";
public $dbMySQLPort = 3306; public $dbMySQLPort = 3306;
public $dbMySQLDb = "arsse"; public $dbMySQLDb = "arsse";
public $dbMySQLAutoUpd = false; public $dbMySQLAutoUpd = true;
public $userDriver = User\Internal\Driver::class; public $userDriver = User\Internal\Driver::class;
public $userComposeNames = true; public $userComposeNames = true;
@ -33,14 +33,15 @@ class Conf {
public $fetchUserAgentString; public $fetchUserAgentString;
public function __construct(string $import_file = "") { public function __construct(string $import_file = "") {
if($import_file != "") $this->importFile($import_file);
if(is_null($this->fetchUserAgentString)) {
$this->fetchUserAgentString = sprintf('Arsse/%s (%s %s; %s; https://code.jkingweb.ca/jking/arsse) PicoFeed (https://github.com/fguillot/picoFeed)', $this->fetchUserAgentString = sprintf('Arsse/%s (%s %s; %s; https://code.jkingweb.ca/jking/arsse) PicoFeed (https://github.com/fguillot/picoFeed)',
VERSION, // Arsse version VERSION, // Arsse version
php_uname('s'), // OS php_uname('s'), // OS
php_uname('r'), // OS version php_uname('r'), // OS version
php_uname('m') // platform architecture php_uname('m') // platform architecture
); );
}
if($import_file != "") $this->importFile($import_file);
} }
public function importFile(string $file): self { public function importFile(string $file): self {

1
lib/Misc/DateFormatter.php
View file

@ -21,7 +21,6 @@ trait DateFormatter {
} }
protected function dateNormalize($date, string $inFormat = null, bool $inLocal = false) { protected function dateNormalize($date, string $inFormat = null, bool $inLocal = false) {
// convert input to a Unix timestamp
if($date instanceof \DateTimeInterface) { if($date instanceof \DateTimeInterface) {
return $date; return $date;
} else if(is_numeric($date)) { } else if(is_numeric($date)) {

13
sql/SQLite3/0.sql
View file

@ -11,10 +11,19 @@ create table arsse_users(
name text, -- display name name text, -- display name
avatar_type text, -- internal avatar image's MIME content type avatar_type text, -- internal avatar image's MIME content type
avatar_data blob, -- internal avatar image's binary data avatar_data blob, -- internal avatar image's binary data
rights integer not null default 0 -- any administrative rights the user may have admin boolean default 0, -- whether the user is a member of the special "admin" group
rights integer not null default 0 -- temporary admin-rights marker FIXME: remove reliance on this
); );
-- NextCloud folders -- extra user metadata
create table arsse_users_meta(
owner text not null references arsse_users(id) on delete cascade on update cascade,
key text not null,
value text,
primary key(owner,key)
);
-- NextCloud News folders
create table arsse_folders( create table arsse_folders(
id integer primary key, -- sequence number id integer primary key, -- sequence number
owner text not null references arsse_users(id) on delete cascade on update cascade, -- owner of folder owner text not null references arsse_users(id) on delete cascade on update cascade, -- owner of folder