Replace all App\User entries with \PanicHDMember

Author: xaviqv

src/Controllers/InstallController.php

@@ -3,7 +3,6 @@
 namespace PanicHD\PanicHD\Controllers;
 
 use App\Http\Controllers\Controller;
-use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
@@ -177,7 +176,7 @@ public function setup(Request $request)
 		]);
 
 		// Add current user to panichd_admin
-		$admin_user = User::find(auth()->user()->id);
+		$admin_user = \PanicHDMember::find(auth()->user()->id);
         $admin_user->panichd_admin = true;
 
 		if ($request->has('quickstart')){

src/Controllers/MembersController.php

@@ -3,7 +3,6 @@
 namespace PanicHD\PanicHD\Controllers;
 
 use App\Http\Controllers\Controller;
-use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 use PanicHD\PanicHD\Models;
@@ -40,7 +39,7 @@ public function store(Request $request)
 
         $this->validate($request, $rules);
 
-        $member = new User;
+        $member = new \PanicHDMember;
 		$member->name = $request->name;
 		$member->email = $request->email;
 		$member->password = bcrypt($request->password);
@@ -53,7 +52,7 @@ public function store(Request $request)
 
 	public function update(Request $request, $id)
 	{
-		$member = User::findOrFail($id);
+		$member = \PanicHDMember::findOrFail($id);
 
 		$rules = [
 			'id' => 'exists:users',
@@ -86,7 +85,7 @@ public function update(Request $request, $id)
 
 	public function destroy(Request $request, $id)
 	{
-		$user = User::findOrFail($id);
+		$user = \PanicHDMember::findOrFail($id);
 		$member = \PanicHDMember::findOrFail($id);
 		if (auth()->user()->id == $id){
 			\Session::flash('warning', trans('panichd::admin.member-delete-own-user-error'));

src/Controllers/NoticesController.php

@@ -49,7 +49,7 @@ public function store(Request $request)
 
         $this->validate($request, $rules);
 
-        $user = \App\User::findOrFail($request->input('user_id'));
+        $user = \PanicHDMember::findOrFail($request->input('user_id'));
 
 		$user->ticketit_department = $request->input('department_id');
 		$user->save();
@@ -65,7 +65,7 @@ public function update(Request $request)
 	}
 
 	public function destroy($id){
-		$user = \App\User::findOrFail($id);
+		$user = \PanicHDMember::findOrFail($id);
 		$user->ticketit_department = null;
 		$user->save();
 

src/Models/Attachment.php

@@ -2,7 +2,6 @@
 
 namespace PanicHD\PanicHD\Models;
 
-use App\User;
 use Illuminate\Database\Eloquent\Model;
 use PanicHD\PanicHD\Traits\Attachments;
 
@@ -74,7 +73,7 @@ public function comment()
 
     public function uploadedBy()
     {
-        return $this->belongsTo(User::class, 'uploaded_by_id');
+        return $this->belongsTo(\PanicHDMember::class, 'uploaded_by_id');
     }
 
 	public function scopeImages($query)

src/Models/Category.php

@@ -58,7 +58,7 @@ public function tickets()
      */
     public function agents()
     {
-        return $this->belongsToMany('PanicHDMember', 'panichd_categories_users', 'category_id', 'user_id')->withPivot('autoassign')->orderBy('name');
+        return $this->belongsToMany('\PanicHDMember', 'panichd_categories_users', 'category_id', 'user_id')->withPivot('autoassign')->orderBy('name');
     }
 
     /**

src/Models/Comment.php

@@ -49,13 +49,13 @@ public function ticket()
 
 	// TODO: Delete user() method
     /**
-     * Get comment related App\User.
+     * Get comment related \PanicHDMember.
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
     {
-        return $this->belongsTo('App\User', 'user_id');
+        return $this->belongsTo('\PanicHDMember', 'user_id');
     }
 
 	/**
@@ -65,7 +65,7 @@ public function user()
      */
     public function owner()
     {
-        return $this->belongsTo('PanicHDMember', 'user_id');
+        return $this->belongsTo('\PanicHDMember', 'user_id');
     }
 
     public function attachments()

src/Models/Department.php

@@ -38,7 +38,7 @@ public function descendants()
      */
     public function members()
     {
-        return $this->hasMany('PanicHDMember')->orderBy('name');
+        return $this->hasMany('\PanicHDMember')->orderBy('name');
     }
 
 	/**

src/Models/Member.php

@@ -3,7 +3,6 @@
 namespace PanicHD\PanicHD\Models;
 
 use App\User;
-use Auth;
 use PanicHD\PanicHD\Helpers\LaravelVersion;
 use PanicHD\PanicHD\Models\Category;
 
@@ -94,7 +93,7 @@ public function scopeAgentsLists($query)
     public static function isAgent($id = null)
     {
         if (isset($id)) {
-            $user = User::find($id);
+            $user = \PanicHDMember::find($id);
             if ($user->panichd_agent) {
                 return true;
             }

src/Models/Ticket.php

@@ -183,17 +183,17 @@ public function category()
      */
     public function creator()
     {
-        return $this->belongsTo('App\User', 'creator_id');
+        return $this->belongsTo('\PanicHDMember', 'creator_id');
     }
 
     /**
-     * Get Ticket owner as App\User model
+     * Get Ticket owner as \PanicHDMember model
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function user()
     {
-        return $this->belongsTo('App\User', 'user_id');
+        return $this->belongsTo('\PanicHDMember', 'user_id');
     }
 
 	/**
@@ -203,7 +203,7 @@ public function user()
      */
     public function owner()
     {
-        return $this->belongsTo('PanicHDMember', 'user_id');
+        return $this->belongsTo('\PanicHDMember', 'user_id');
     }
 
     /**
@@ -213,7 +213,7 @@ public function owner()
      */
     public function agent()
     {
-        return $this->belongsTo('PanicHDMember', 'agent_id');
+        return $this->belongsTo('\PanicHDMember', 'agent_id');
     }
 
     /**

src/Views/admin/notice/modal_user.blade.php

@@ -23,7 +23,7 @@
 			<div class="col-lg-9 modal_user_wrap">
 				<div id="modal_user_name"></div>
 				<select name="user_id" id="user_select2" class="form_select2 form-control" style="display: none; width: 100%">
-				@foreach (App\User::whereNull('ticketit_department')->orderBy('name')->get() as $user)
+				@foreach (\PanicHDMember::whereNull('ticketit_department')->orderBy('name')->get() as $user)
 					<option value="{{ $user->id }}">{{ $user->name }} - {{ $user->email }}</option>
 				@endforeach
 				</select>