diff --git a/app/Console/Commands/Test.php b/app/Console/Commands/Test.php index f628be9b..bbe1d920 100644 --- a/app/Console/Commands/Test.php +++ b/app/Console/Commands/Test.php @@ -13,7 +13,6 @@ use App\Models\ExamUser; use App\Models\HitAndRun; use App\Models\Medal; use App\Models\Peer; -use App\Models\Role; use App\Models\SearchBox; use App\Models\Snatch; use App\Models\Tag; @@ -39,14 +38,14 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -use JeroenG\Explorer\Domain\Syntax\Matching; -use JeroenG\Explorer\Infrastructure\Scout\ElasticEngine; use League\Flysystem\StorageAttributes; use Nexus\Database\NexusDB; use Nexus\Imdb\Imdb; use NexusPlugin\Menu\Filament\MenuItemResource\Pages\ManageMenuItems; use NexusPlugin\Menu\MenuRepository; use NexusPlugin\Menu\Models\MenuItem; +use NexusPlugin\Permission\Models\Permission; +use NexusPlugin\Permission\Models\Role; use NexusPlugin\PostLike\PostLikeRepository; use NexusPlugin\StickyPromotion\Models\StickyPromotion; use NexusPlugin\StickyPromotion\Models\StickyPromotionParticipator; @@ -87,7 +86,9 @@ class Test extends Command */ public function handle() { - Role::initClassRoles(); + $user = User::query()->find(10003); + $permissions = $user->rolePermissions; + dd($permissions); } diff --git a/app/Filament/Resources/Permission/PermissionResource.php b/app/Filament/Resources/Permission/PermissionResource.php deleted file mode 100644 index 00a0fb36..00000000 --- a/app/Filament/Resources/Permission/PermissionResource.php +++ /dev/null @@ -1,68 +0,0 @@ -schema([ - // - ]); - } - - public static function table(Table $table): Table - { - return $table - ->columns([ - // - ]) - ->filters([ - // - ]) - ->actions([ - Tables\Actions\EditAction::make(), - Tables\Actions\DeleteAction::make(), - ]) - ->bulkActions([ - Tables\Actions\DeleteBulkAction::make(), - ]); - } - - public static function getPages(): array - { - return [ - 'index' => Pages\ManagePermissions::route('/'), - ]; - } -} diff --git a/app/Filament/Resources/Permission/PermissionResource/Pages/ManagePermissions.php b/app/Filament/Resources/Permission/PermissionResource/Pages/ManagePermissions.php deleted file mode 100644 index 15c650a0..00000000 --- a/app/Filament/Resources/Permission/PermissionResource/Pages/ManagePermissions.php +++ /dev/null @@ -1,21 +0,0 @@ -schema([ - // - ]); - } - - public static function table(Table $table): Table - { - return $table - ->columns([ - Tables\Columns\TextColumn::make('id'), - Tables\Columns\TextColumn::make('name')->label(__('label.name')), - Tables\Columns\TextColumn::make('classText')->label(__('label.role.class')), - Tables\Columns\TextColumn::make('updated_at')->label(__('label.updated_at')), - ]) - ->filters([ - // - ]) - ->actions([ - Tables\Actions\EditAction::make(), - ]) - ->bulkActions([ - Tables\Actions\DeleteBulkAction::make(), - ]); - } - - public static function getRelations(): array - { - return [ - // - ]; - } - - public static function getPages(): array - { - return [ - 'index' => Pages\ListRoles::route('/'), - 'create' => Pages\CreateRole::route('/create'), - 'edit' => Pages\EditRole::route('/{record}/edit'), - ]; - } -} diff --git a/app/Filament/Resources/Permission/RoleResource/Pages/CreateRole.php b/app/Filament/Resources/Permission/RoleResource/Pages/CreateRole.php deleted file mode 100644 index 98b4d99a..00000000 --- a/app/Filament/Resources/Permission/RoleResource/Pages/CreateRole.php +++ /dev/null @@ -1,12 +0,0 @@ -buildEnableDisableAction(); $actions[] = $this->buildEnableDisableDownloadPrivilegesAction(); } - return $actions; + return apply_filter('user_profile_actions', $actions); } private function buildEnableDisableAction(): Actions\Action diff --git a/app/Models/Permission.php b/app/Models/Permission.php deleted file mode 100644 index 55f122ad..00000000 --- a/app/Models/Permission.php +++ /dev/null @@ -1,11 +0,0 @@ -hasMany(Permission::class, 'role_id'); - } - - public function getClassTextAttribute() - { - if ($this->class < 0) { - return ''; - } - return User::getClassText($this->class); - } - - public static function initClassRoles() - { - foreach (User::$classes as $class => $info) { - $attributes = [ - 'class' => $class - ]; - $values = [ - 'name' => $info['text'], - ]; - Role::query()->firstOrCreate($attributes, $values); - } - } - -} diff --git a/app/Models/RolePermission.php b/app/Models/RolePermission.php deleted file mode 100644 index 6254aaaa..00000000 --- a/app/Models/RolePermission.php +++ /dev/null @@ -1,11 +0,0 @@ - 'torrentmanage', + ]; + /** * get setting autoload = yes with cache * diff --git a/app/Models/User.php b/app/Models/User.php index 47f4404e..3db9e52c 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -17,6 +17,8 @@ use Laravel\Sanctum\HasApiTokens; use Nexus\Database\NexusDB; use Filament\Models\Contracts\FilamentUser; use Filament\Models\Contracts\HasName; +use NexusPlugin\Permission\Models\Permission; +use NexusPlugin\Permission\Models\Role; class User extends Authenticatable implements FilamentUser, HasName { @@ -98,7 +100,7 @@ class User extends Authenticatable implements FilamentUser, HasName public static function getClassText($class) { - if (!isset(self::$classes[$class])) { + if (!is_numeric($class)|| !isset(self::$classes[$class])) { return ''; } if ($class >= self::CLASS_VIP) { @@ -113,6 +115,15 @@ class User extends Authenticatable implements FilamentUser, HasName return $classText; } + public static function listClass(): array + { + $result = []; + foreach (self::$classes as $class => $info) { + $result[$class] = self::getClassText($class); + } + return $result; + } + public function canAccessFilament(): bool { return $this->canAccessAdmin(); @@ -463,7 +474,7 @@ class User extends Authenticatable implements FilamentUser, HasName return $this->belongsToMany(Role::class, 'user_roles', 'uid', 'role_id')->withTimestamps(); } - public function permissions() + public function directPermissions() { return $this->belongsToMany(Permission::class, 'user_permissions', 'uid', 'permission_id')->withTimestamps(); } diff --git a/app/Models/UserPermission.php b/app/Models/UserPermission.php deleted file mode 100644 index b8c2954d..00000000 --- a/app/Models/UserPermission.php +++ /dev/null @@ -1,11 +0,0 @@ - $value) { - $out[(string)$key] = $value['text']; - } - return $out; + return User::listClass(); } public function disableUser(User $operator, $uid, $reason) diff --git a/database/migrations/2022_08_17_052202_create_roles_table.php b/database/migrations/2022_08_17_052202_create_roles_table.php deleted file mode 100644 index 8b97824e..00000000 --- a/database/migrations/2022_08_17_052202_create_roles_table.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->string('name'); - $table->integer('class')->default(-1); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('roles'); - } -}; diff --git a/database/migrations/2022_08_17_052422_create_permissions_table.php b/database/migrations/2022_08_17_052422_create_permissions_table.php deleted file mode 100644 index 526d0a38..00000000 --- a/database/migrations/2022_08_17_052422_create_permissions_table.php +++ /dev/null @@ -1,32 +0,0 @@ -id(); - $table->string('name'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('permissions'); - } -}; diff --git a/database/migrations/2022_08_17_052512_create_role_permissions_table.php b/database/migrations/2022_08_17_052512_create_role_permissions_table.php deleted file mode 100644 index 9dac41e9..00000000 --- a/database/migrations/2022_08_17_052512_create_role_permissions_table.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->integer('role_id'); - $table->integer('permission_id'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('role_permissions'); - } -}; diff --git a/database/migrations/2022_08_17_052650_create_user_roles_table.php b/database/migrations/2022_08_17_052650_create_user_roles_table.php deleted file mode 100644 index b7535b40..00000000 --- a/database/migrations/2022_08_17_052650_create_user_roles_table.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->integer('uid'); - $table->integer('role_id'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('user_roles'); - } -}; diff --git a/database/migrations/2022_08_17_052746_create_user_permissions_table.php b/database/migrations/2022_08_17_052746_create_user_permissions_table.php deleted file mode 100644 index b1fbbb92..00000000 --- a/database/migrations/2022_08_17_052746_create_user_permissions_table.php +++ /dev/null @@ -1,34 +0,0 @@ -id(); - $table->integer('uid'); - $table->integer('permission_id'); - $table->text('payload'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('user_permissions'); - } -}; diff --git a/include/functions.php b/include/functions.php index 7688c170..ebf6a846 100644 --- a/include/functions.php +++ b/include/functions.php @@ -482,7 +482,7 @@ function get_user_id() return auth()->user()->id ?? 0; } -function get_user_class_name($class, $compact = false, $b_colored = false, $I18N = false) +function get_user_class_name($class, $compact = false, $b_colored = false, $I18N = false, array $options = []) { if (!IN_NEXUS) { return \App\Models\User::getClassName($class, $compact, $b_colored, $I18N); @@ -557,9 +557,14 @@ function get_user_class_name($class, $compact = false, $b_colored = false, $I18N case UC_SYSOP: {$class_name_color = $en_lang_functions['text_sysops']; break;} case UC_STAFFLEADER: {$class_name_color = $en_lang_functions['text_staff_leader']; break;} } - $class_name = ( $compact == true ? str_replace(" ", "",$class_name) : $class_name); - if ($class_name) return ($b_colored == true ? "" . $class_name . "" : $class_name); + if (isset($options['uid'], $options['with_role'])) { + $class_name = implode(' | ', apply_filter('user_class_name', [$class_name], $options['uid'])); + } + if ($class_name && $b_colored) { + $class_name = "" . $class_name . ""; + } + return $class_name; } function is_valid_user_class($class) @@ -3748,7 +3753,11 @@ function get_username($id, $big = false, $link = true, $bold = true, $target = f } $href = getSchemeAndHttpHost() . "/userdetails.php?id=$id"; - $username = ($link == true ? "" . $username . "" : $username) . $pics . ($withtitle == true ? " (" . ($arr['title'] == "" ? get_user_class_name($arr['class'],false,true,true) : "".htmlspecialchars($arr['title'])) . ")" : ""); + $options = [ + 'uid' => $id, + 'with_role' => true, + ]; + $username = ($link == true ? "" . $username . "" : $username) . $pics . ($withtitle == true ? " (" . ($arr['title'] == "" ? get_user_class_name($arr['class'],false,true,true, $options) : "".htmlspecialchars($arr['title'])) . ")" : ""); $username = "" . ( $bracket == true ? "(" . $username . ")" : $username) . "$medalHtml"; } diff --git a/include/globalfunctions.php b/include/globalfunctions.php index 8fb65bdf..09ec9af9 100644 --- a/include/globalfunctions.php +++ b/include/globalfunctions.php @@ -895,3 +895,28 @@ function clear_user_cache($uid, $passkey = '') \Nexus\Database\NexusDB::cache_del('user_passkey_'.$passkey.'_content'); } } + +function clear_setting_cache() +{ + \Nexus\Database\NexusDB::cache_del('nexus_settings_in_laravel'); + \Nexus\Database\NexusDB::cache_del('nexus_settings_in_nexus'); +} + +function user_can($permission, $uid = 0): bool +{ + if ($uid == 0) { + $uid = get_user_id(); + } + if ($uid <= 0) { + return false; + } + $result = apply_filter('nexus_user_can', null, $permission, $uid); + if (is_bool($result)) { + return $result; + } + if (isset(\App\Models\Setting::$permissionDegeneration[$permission])) { + $permission = \App\Models\Setting::$permissionDegeneration[$permission]; + } + $requireClass = get_setting("authority.$permission"); + return is_numeric($requireClass) && $requireClass < get_user_class(); +} diff --git a/public/increment-bulk.php b/public/increment-bulk.php index 794a97fa..108521e9 100644 --- a/public/increment-bulk.php +++ b/public/increment-bulk.php @@ -50,13 +50,13 @@ $classes = array_chunk(\App\Models\User::$classes, 4, true); Amount - Add to + Add to Class '); foreach ($chunk as $class => $info) { - printf('', $class, $info['text']); + printf('', $class, $info['text']); } printf(''); } @@ -64,6 +64,7 @@ $classes = array_chunk(\App\Models\User::$classes, 4, true);
+ Subject Reason diff --git a/public/settings.php b/public/settings.php index ddd058c2..87c210d2 100644 --- a/public/settings.php +++ b/public/settings.php @@ -11,8 +11,7 @@ permissiondenied(); function go_back() { global $lang_settings; - \Nexus\Database\NexusDB::cache_del('nexus_settings_in_laravel'); - \Nexus\Database\NexusDB::cache_del('nexus_settings_in_nexus'); + clear_setting_cache(); stdmsg($lang_settings['std_message'], $lang_settings['std_click']."".$lang_settings['std_here']."".$lang_settings['std_to_go_back']); } diff --git a/public/take-increment-bulk.php b/public/take-increment-bulk.php index 12e723b3..b94310aa 100644 --- a/public/take-increment-bulk.php +++ b/public/take-increment-bulk.php @@ -29,25 +29,23 @@ if (!isset($validTypeMap[$type])) { if ($type == 'uploaded') { $amount = sqlesc(getsize_int($amount,"G")); } -$updateset = $_POST['clases']; -if (is_array($updateset)) { - foreach ($updateset as $class) { - if (!is_valid_id($class) && $class != 0) - stderr("Error","Invalid Class"); - } -}else{ - if (!is_valid_id($updateset) && $updateset != 0) - stderr("Error","Invalid Class"); -} $subject = trim($_POST['subject']); $size = 10000; $page = 1; set_time_limit(300); -$classStr = implode(",", $updateset); +$conditions = []; +if (!empty($_POST['classes'])) { + $conditions[] = "class IN (" . implode(', ', $_POST['classes']) . ")"; +} +$conditions = apply_filter("increment_bulk_conditions", $conditions, $_POST); +if (empty($conditions)) { + stderr("Error","No valid filter"); +} +$whereStr = implode(' OR ', $conditions); while (true) { $msgValues = $idArr = []; $offset = ($page - 1) * $size; - $query = sql_query("SELECT id FROM users WHERE class IN ($classStr) and `enabled` = 'yes' and `status` = 'confirmed' limit $offset, $size"); + $query = sql_query("SELECT id FROM users WHERE ($whereStr) and `enabled` = 'yes' and `status` = 'confirmed' limit $offset, $size"); while($dat=mysql_fetch_assoc($query)) { $idArr[] = $dat['id'];