diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php index 23ee649d5..5b61c5e38 100644 --- a/app/Http/Controllers/Dashboard/AdminController.php +++ b/app/Http/Controllers/Dashboard/AdminController.php @@ -8,6 +8,7 @@ use DB; //Libraries use App\Library\Taxes\TaxesHelper; +use App\Library\Wiki\WikiHelper; //Models use App\Models\User\User; @@ -15,6 +16,9 @@ use App\Models\User\UserRole; use App\Models\User\UserPermission; use App\Models\User\AvailableUserPermission; use App\Models\Admin\AllowedLogin; +use App\Models\Doku\DokuGroupNames; +use App\Models\Doku\DokuMember; +use App\Models\Doku\DokuUser; class AdminController extends Controller { @@ -123,10 +127,6 @@ class AdminController extends Controller return view('admin.dashboards.allowed_logins')->with('entities', $entities); } - public function displayPurgeWiki() { - return view('admin.dashboards.purge_wiki'); - } - public function displayTaxes() { //Declare variables needed for displaying items on the page $months = 3; @@ -321,4 +321,66 @@ class AdminController extends Controller return redirect('/admin/dashboard')->with('success', 'Entity removed from allowed login list.'); } + + /** + * Displays the purge wiki page. This will be removed in favor of the wiki dashboard. + */ + public function displayPurgeWiki() { + return view('admin.dashboards.purge_wiki'); + } + + /** + * Display the wiki dashboard for wiki functions + */ + public function displayWikiDashboard() { + $wikiUsers = DokuUser::all(); + $wikiGroups = DokuGroupNames::all(); + $wikiMembership = DokuMember::all(); + + return view('admin.dashboard.wiki')->with('wikiUsers', $wikiUsers) + ->with('wikiGroups', $wikiGroups) + ->with('wikiMembership', $wikiMembership); + } + + /** + * Modify a user's wiki group + */ + public function modifyWikiUser(Request $request) { + + } + + /** + * Delete a wiki user + */ + public function deleteWikiUser(Request $request) { + + } + + /** + * Add a group to a wiki user + */ + public function addWikiUserGroup(Request $request) { + + } + + /** + * Remove a group from a wiki user + */ + public function removeWikiUserGroup(Request $request) { + + } + + /** + * Remove a user from all wiki groups + */ + public function removeWikiUserAllGroups(Request $request) { + + } + + /** + * Insert a new group for wiki user's to be added to + */ + public function insertNewWikiUserGroup(Request $request) { + + } } diff --git a/app/Http/Controllers/Wiki/WikiController.php b/app/Http/Controllers/Wiki/WikiController.php index 77728257b..300b1d3b0 100644 --- a/app/Http/Controllers/Wiki/WikiController.php +++ b/app/Http/Controllers/Wiki/WikiController.php @@ -158,13 +158,6 @@ class WikiController extends Controller return redirect('/dashboard')->with('success', 'Password changed successfully. Your username is: ' . $name); } - /** - * Displays the page to add a user to a certain group - */ - public function displayAddUserToGroup() { - return view('wiki.displayaddug'); - } - private function DeleteWikiUser($user) { //Get the uid of the user as we will need to purge them from the member table as well. //the member table holds their permissions.