Various changes
mobile-friendly ui updates admin user-edit bugfix file cleanup added searchFields add blog search remove unused code add maintenance mode config
This commit is contained in:
@ -38,6 +38,9 @@ class Group extends DatabaseModel {
|
||||
[ 'name', 'varchar', '32' ],
|
||||
[ 'permissions', 'text', '' ],
|
||||
];
|
||||
public $searchFields = [
|
||||
'name',
|
||||
];
|
||||
public $permissionMatrix = [
|
||||
'adminAccess' => [
|
||||
'pretty' => 'Access Administrator Areas',
|
||||
|
@ -46,6 +46,9 @@ class Log extends DatabaseModel {
|
||||
[ 'source', 'varchar', '64' ],
|
||||
[ 'action', 'text', '' ],
|
||||
];
|
||||
public $searchFields = [
|
||||
'source',
|
||||
];
|
||||
|
||||
/**
|
||||
* The model constructor.
|
||||
|
@ -24,6 +24,9 @@ class Routes extends DatabaseModel {
|
||||
[ 'original_url', 'varchar', '32' ],
|
||||
[ 'forwarded_url', 'text', '' ],
|
||||
];
|
||||
public $searchFields = [
|
||||
'nickname',
|
||||
];
|
||||
public $resourceMatrix = [
|
||||
[
|
||||
'original_url' => 'fb',
|
||||
|
@ -36,6 +36,9 @@ class Sessions extends DatabaseModel {
|
||||
[ 'username', 'varchar', '20' ],
|
||||
[ 'token', 'varchar', '120' ],
|
||||
];
|
||||
public $searchFields = [
|
||||
'username',
|
||||
];
|
||||
public static $activeSession = false;
|
||||
|
||||
/**
|
||||
|
@ -31,6 +31,10 @@ class Token extends DatabaseModel {
|
||||
[ 'createdBy', 'int', '10' ],
|
||||
[ 'expiresAt', 'int', '10' ],
|
||||
];
|
||||
public $searchFields = [
|
||||
'name',
|
||||
'token',
|
||||
];
|
||||
public $permissionMatrix = [
|
||||
'addAppToken' => [
|
||||
'pretty' => 'Add Application Tokens',
|
||||
|
@ -44,6 +44,9 @@ class User extends DatabaseModel {
|
||||
[ 'confirmationCode', 'varchar', '80' ],
|
||||
[ 'prefs', 'text', '' ],
|
||||
];
|
||||
public $searchFields = [
|
||||
'username',
|
||||
];
|
||||
public $permissionMatrix = [
|
||||
'uploadImages' => [
|
||||
'pretty' => 'Upload images (such as avatars)',
|
||||
@ -428,7 +431,7 @@ class User extends DatabaseModel {
|
||||
if ( ! empty( $filter ) ) {
|
||||
switch ( $filter ) {
|
||||
case 'newsletter':
|
||||
$data = self::$db->search( $this->tableName, 'prefs', 'newsletter":"true' );
|
||||
$data = self::$db->searchColumn( $this->tableName, 'prefs', 'newsletter":"true' );
|
||||
break;
|
||||
default:
|
||||
$data = self::$db->get( $this->tableName, '*' );
|
||||
@ -546,6 +549,7 @@ class User extends DatabaseModel {
|
||||
$instance->prefs = json_decode( $instance->prefs, true );
|
||||
$instance->gender = $instance->prefs['gender'];
|
||||
$instance->avatar = $instance->prefs['avatar'];
|
||||
$instance->usernamePretty = \ucfirst( $instance->username );
|
||||
$out[] = $instance;
|
||||
if ( !empty( $end ) ) {
|
||||
$out = $out[0];
|
||||
@ -659,7 +663,7 @@ class User extends DatabaseModel {
|
||||
}
|
||||
if ( !self::$db->update( $this->tableName, $id, $fields ) ) {
|
||||
new CustomException( 'userUpdate' );
|
||||
Debug::error( "User: $id not updated: $fields" );
|
||||
Debug::error( "User: $id not updated: " . var_export( $fields, true ) );
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user