familytree365 / backend

app/Http/Controllers/EventController.php

Spacing +9 added lines, -9 removed lines

@@ -16,34 +16,34 @@ 
     {
         $query = Event::query();
 
-        if($request->has('searchTerm')) {
+        if ($request->has('searchTerm')) {
             $columnsToSearch = ['name', 'email', 'phone'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -127,7 +127,7 @@ 
     public function destroy($id)
     {
         $event = Event::find($id);
-        if($event) {
+        if ($event) {
             $event->delete();
             return "true";
         }

app/Http/Controllers/SourceController.php

Spacing +13 added lines, -13 removed lines

@@ -16,39 +16,39 @@ 
      */
     public function index(Request $request)
     {
-        $query = Source::query()->with(['publication','repositories','author','type']);
+        $query = Source::query()->with(['publication', 'repositories', 'author', 'type']);
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['titl', 'sour', 'auth','data','text','publ','abbr','name','description','repository_id','author_id','publication_id','type_id','is_active','group','quay','page'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['titl', 'sour', 'auth', 'data', 'text', 'publ', 'abbr', 'name', 'description', 'repository_id', 'author_id', 'publication_id', 'type_id', 'is_active', 'group', 'quay', 'page'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
-            $relationship_column = array('repositories.name','author.name','publication.name','type.name');
-            foreach($filters as $key => $value) {
-                if(!in_array($key, $relationship_column))
+            $relationship_column = array('repositories.name', 'author.name', 'publication.name', 'type.name');
+            foreach ($filters as $key => $value) {
+                if (!in_array($key, $relationship_column))
                 {
-                    if(!empty($value)) {
+                    if (!empty($value)) {
                         $query->orWhere($key, 'like', '%' . $value . '%');
                     }
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -180,7 +180,7 @@ 
     public function destroy($id)
     {
         $source = Source::find($id);
-        if($source) {
+        if ($source) {
             $source->delete();
             return "true";
         }

app/Http/Controllers/RegisterController.php

Indentation +95 added lines, -95 removed lines

@@ -10,121 +10,121 @@
 use Spatie\Multitenancy\Models\Concerns\UsesLandlordConnection;
 use Illuminate\Auth\Events\Registered;
 class RegisterController extends Controller {
-	use UsesLandlordConnection;
-
-	public function register(Request $request) {
-
-		$request->validate([
-			'first_name' => ['required'],
-			'last_name' => ['required'],
-			'email' => ['required', 'email', 'unique:landlord.users'],
-			'password' => ['required', 'min:8', 'confirmed'],
-		]);
-
-		DB::connection($this->getConnectionName())->beginTransaction();
-
-		try
-		{
-
-		// $user_id = DB::connection($this->getConnectionName())->table('users')->insertGetId([
-		// 	'first_name' => $request->first_name,
-		// 	'last_name' => $request->last_name,
-		// 	'email' => $request->email,
-		// 	'password' => bcrypt($request->password),
-		// ]);
-		// $user = User::create([
-		// 	'first_name' => $request->first_name,
-		// 	'last_name' => $request->last_name,
-		// 	'email' => $request->email,
-		// 	'password' => bcrypt($request->password)
-		// ]);
-
-		$user = new User;
-
-		$user->first_name = $request->first_name;
-		$user->last_name = $request->last_name;
-		$user->email = $request->email;
-		$user->password = bcrypt($request->password);
-		$user->save();
-		event(new Registered($user));
-		$user_id = $user->id;
-		$user = User::find($user_id);
+    use UsesLandlordConnection;
+
+    public function register(Request $request) {
+
+        $request->validate([
+            'first_name' => ['required'],
+            'last_name' => ['required'],
+            'email' => ['required', 'email', 'unique:landlord.users'],
+            'password' => ['required', 'min:8', 'confirmed'],
+        ]);
+
+        DB::connection($this->getConnectionName())->beginTransaction();
+
+        try
+        {
+
+        // $user_id = DB::connection($this->getConnectionName())->table('users')->insertGetId([
+        // 	'first_name' => $request->first_name,
+        // 	'last_name' => $request->last_name,
+        // 	'email' => $request->email,
+        // 	'password' => bcrypt($request->password),
+        // ]);
+        // $user = User::create([
+        // 	'first_name' => $request->first_name,
+        // 	'last_name' => $request->last_name,
+        // 	'email' => $request->email,
+        // 	'password' => bcrypt($request->password)
+        // ]);
+
+        $user = new User;
+
+        $user->first_name = $request->first_name;
+        $user->last_name = $request->last_name;
+        $user->email = $request->email;
+        $user->password = bcrypt($request->password);
+        $user->save();
+        event(new Registered($user));
+        $user_id = $user->id;
+        $user = User::find($user_id);
         $user->assignRole('free');
         // $user->sendEmailVerificationNotification();
 
-		$random = $this->unique_random('companies', 'name', 5);
-		$company_id = DB::connection($this->getConnectionName())->table('companies')->insertGetId([
-			'name' => 'company' . $random,
-			'status' => 1,
-			'current_tenant' => 1,
-		]);
+        $random = $this->unique_random('companies', 'name', 5);
+        $company_id = DB::connection($this->getConnectionName())->table('companies')->insertGetId([
+            'name' => 'company' . $random,
+            'status' => 1,
+            'current_tenant' => 1,
+        ]);
 
-		DB::connection($this->getConnectionName())->table('user_company')->insert([
-			'user_id' => $user_id,
-			'company_id' => $company_id,
-		]);
+        DB::connection($this->getConnectionName())->table('user_company')->insert([
+            'user_id' => $user_id,
+            'company_id' => $company_id,
+        ]);
 
-		$tree_id = DB::connection($this->getConnectionName())->table('trees')->insertGetId([
-			'company_id' => $company_id,
-			'name' => 'tree' . $company_id,
-			'description' => '',
-			'current_tenant' => 1,
-		]);
+        $tree_id = DB::connection($this->getConnectionName())->table('trees')->insertGetId([
+            'company_id' => $company_id,
+            'name' => 'tree' . $company_id,
+            'description' => '',
+            'current_tenant' => 1,
+        ]);
 
-		$tenant_id = DB::connection($this->getConnectionName())->table('tenants')->insertGetId([
-			'name' => 'tenant' . $tree_id,
-			'tree_id' => $tree_id,
-			'database' => 'tenant' . $tree_id,
-		]);
+        $tenant_id = DB::connection($this->getConnectionName())->table('tenants')->insertGetId([
+            'name' => 'tenant' . $tree_id,
+            'tree_id' => $tree_id,
+            'database' => 'tenant' . $tree_id,
+        ]);
 
-		DB::statement('create database tenant' . $tree_id);
+        DB::statement('create database tenant' . $tree_id);
 
-		Artisan::call('tenants:artisan "migrate --database=tenant --force"');
-		} catch (Exception $e) {
-			DB::connection($this->getConnectionName())->rollback();
-		}
+        Artisan::call('tenants:artisan "migrate --database=tenant --force"');
+        } catch (Exception $e) {
+            DB::connection($this->getConnectionName())->rollback();
+        }
 
-		DB::connection($this->getConnectionName())->commit();
-	}
+        DB::connection($this->getConnectionName())->commit();
+    }
 
-	public function unique_random($table, $col, $chars = 16) {
+    public function unique_random($table, $col, $chars = 16) {
 
-		$unique = false;
+        $unique = false;
 
-		// Store tested results in array to not test them again
-		$tested = [];
+        // Store tested results in array to not test them again
+        $tested = [];
 
-		do {
+        do {
 
-			// Generate random string of characters
-			$random = Str::random($chars);
+            // Generate random string of characters
+            $random = Str::random($chars);
 
-			// Check if it's already testing
-			// If so, don't query the database again
-			if (in_array($random, $tested)) {
-				continue;
-			}
+            // Check if it's already testing
+            // If so, don't query the database again
+            if (in_array($random, $tested)) {
+                continue;
+            }
 
-			// Check if it is unique in the database
-			$count = DB::connection($this->getConnectionName())->table('companies')->where($col, '=', $random)->count();
+            // Check if it is unique in the database
+            $count = DB::connection($this->getConnectionName())->table('companies')->where($col, '=', $random)->count();
 
-			// Store the random character in the tested array
-			// To keep track which ones are already tested
-			$tested[] = $random;
+            // Store the random character in the tested array
+            // To keep track which ones are already tested
+            $tested[] = $random;
 
-			// String appears to be unique
-			if ($count == 0) {
-				// Set unique to true to break the loop
-				$unique = true;
-			}
+            // String appears to be unique
+            if ($count == 0) {
+                // Set unique to true to break the loop
+                $unique = true;
+            }
 
-			// If unique is still false at this point
-			// it will just repeat all the steps until
-			// it has generated a random string of characters
+            // If unique is still false at this point
+            // it will just repeat all the steps until
+            // it has generated a random string of characters
 
-		} while (!$unique);
+        } while (!$unique);
 
-		return $random;
-	}
+        return $random;
+    }
 
 }

app/Http/Controllers/RepositoryController.php

Spacing +13 added lines, -13 removed lines

@@ -13,39 +13,39 @@ 
      */
     public function index(Request $request)
     {
-        $query = Repository::query()->with(['type','addr']);
+        $query = Repository::query()->with(['type', 'addr']);
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['repo','name','addr_id','rin','email','phon','fax','www','description','type_id','is_active'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['repo', 'name', 'addr_id', 'rin', 'email', 'phon', 'fax', 'www', 'description', 'type_id', 'is_active'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
-            $relationship_column = array('addr.adr1','type.name');
-            foreach($filters as $key => $value) {
-                if(!in_array($key, $relationship_column))
+            $relationship_column = array('addr.adr1', 'type.name');
+            foreach ($filters as $key => $value) {
+                if (!in_array($key, $relationship_column))
                 {
-                    if(!empty($value)) {
+                    if (!empty($value)) {
                         $query->orWhere($key, 'like', '%' . $value . '%');
                     }
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -159,7 +159,7 @@ 
     public function destroy($id)
     {
         $repository = Repository::find($id);
-        if($repository) {
+        if ($repository) {
             $repository->delete();
             return "true";
         }

app/Http/Controllers/PedigreeController.php

Spacing +41 added lines, -41 removed lines

@@ -76,12 +76,12 @@ 
 
             if ($person) {
                 $user = $person->user;
-                if($user) {
+                if ($user) {
                     $av = Avatar::where('user_id', '=', $user->id)->first();
                     $file = UploadFile::where('attachable_id', '=', $av->id)->where('attachable_type', '=', 'avatar')->first();
 
                     if ($file) {
-                        $person->setAttribute('avatar', '/api/core/avatars/'.$av->id);
+                        $person->setAttribute('avatar', '/api/core/avatars/' . $av->id);
                     } else {
                         $person->setAttribute('avatar', '');
                     }
@@ -98,37 +98,37 @@ 
                 return;
             }
             // do self
-            if (! array_key_exists($start_id, $this->persons)) {
+            if (!array_key_exists($start_id, $this->persons)) {
                 // this is not added
                 $_families = Family::where('husband_id', $start_id)->orwhere('wife_id', $start_id)->select('id')->get();
                 $_union_ids = [];
                 foreach ($_families as $item) {
 
-                    $_union_ids[] = 'u'.$item->id;
+                    $_union_ids[] = 'u' . $item->id;
                     // add current family link
                     // $this->links[] = [$start_id, 'u'.$item->id];
-                    array_unshift($this->links, [$start_id, 'u'.$item->id]);
+                    array_unshift($this->links, [$start_id, 'u' . $item->id]);
                 }
                 $person->setAttribute('own_unions', $_union_ids);
-                $person->setAttribute('parent_union', 'u'.$person->child_in_family_id);
+                $person->setAttribute('parent_union', 'u' . $person->child_in_family_id);
                 // add to persons
                 $this->persons[$start_id] = $person; 
 
                 // get self's parents data
-                if($person) {
-                if($person->id == 680) {
-                        array_unshift($this->person_id, 'first'.$person->id);
+                if ($person) {
+                if ($person->id == 680) {
+                        array_unshift($this->person_id, 'first' . $person->id);
                     }
             }
                 $p_family_id = $person->child_in_family_id;
-                array_unshift($this->start_id, 'family_in_child_id'.$person->child_in_family_id);
-                if($p_family_id) {
-                        array_unshift($this->family_id, 'first'.$p_family_id);
+                array_unshift($this->start_id, 'family_in_child_id' . $person->child_in_family_id);
+                if ($p_family_id) {
+                        array_unshift($this->family_id, 'first' . $p_family_id);
                     }
-                if (! empty($p_family_id)) {
+                if (!empty($p_family_id)) {
                     // add parent family link
                     // $this->links[] = ['u'.$p_family_id,  $start_id] ;
-                    array_unshift($this->links, ['u'.$p_family_id,  $start_id]);
+                    array_unshift($this->links, ['u' . $p_family_id, $start_id]);
                     $p_family = Family::find($p_family_id);
                     if (isset($p_family->husband_id)) {
                         $p_fatherid = $p_family->husband_id;
@@ -147,14 +147,14 @@ 
                 $father = Person::find($family->husband_id);
                 $mother = Person::find($family->wife_id);
                     
-                $user = NULL;//$father->user;
+                $user = NULL; //$father->user;
 
-                if($user) {
+                if ($user) {
                     $av = Avatar::where('user_id', '=', $user->id)->first();
                     $file = UploadFile::where('attachable_id', '=', $av->id)->where('attachable_type', '=', 'avatar')->first();
 
                     if ($file) {
-                        $father->setAttribute('avatar', '/api/core/avatars/'.$av->id);
+                        $father->setAttribute('avatar', '/api/core/avatars/' . $av->id);
                     } else {
                         $father->setAttribute('avatar', '');
                     }
@@ -164,12 +164,12 @@ 
                 if ($mother) {
                     $user = $mother->user;
 
-                    if($user) {
+                    if ($user) {
                         $av = Avatar::where('user_id', '=', $user->id)->first();
                         $file = UploadFile::where('attachable_id', '=', $av->id)->where('attachable_type', '=', 'avatar')->first();
 
                         if ($file) {
-                            $mother->setAttribute('avatar', '/api/core/avatars/'.$av->id);
+                            $mother->setAttribute('avatar', '/api/core/avatars/' . $av->id);
                         } else {
                             $mother->setAttribute('avatar', '');
                         }
@@ -178,30 +178,30 @@ 
                 }
 
                 if (isset($father->id)) {
-                    if (! array_key_exists($father->id, $this->persons)) {
+                    if (!array_key_exists($father->id, $this->persons)) {
                         // this is not added
                         $_families = Family::where('husband_id', $father->id)->orwhere('wife_id', $father->id)->select('id')->get();
                         $_union_ids = [];
                         foreach ($_families as $item) {
-                            $_union_ids[] = 'u'.$item->id;
+                            $_union_ids[] = 'u' . $item->id;
                         }
                         $father->setAttribute('own_unions', $_union_ids);
-                        $father->setAttribute('parent_union', 'u'.$father->child_in_family_id);
+                        $father->setAttribute('parent_union', 'u' . $father->child_in_family_id);
                         // add to persons
                         $this->persons[$father->id] = $father;
 
                         // add current family link
                         // $this->links[] = [$father->id, 'u'.$family_id];
-                        array_unshift($this->links, [$father->id, 'u'.$family_id]);
+                        array_unshift($this->links, [$father->id, 'u' . $family_id]);
                         // get husband's parents data
                         $p_family_id = $father->child_in_family_id;
-                        if($p_family_id) {
-                        array_unshift($this->family_id, 'father'.$p_family_id);
+                        if ($p_family_id) {
+                        array_unshift($this->family_id, 'father' . $p_family_id);
                     }
-                        if (! empty($p_family_id)) {
+                        if (!empty($p_family_id)) {
                             // add parent family link
                             // $this->links[] = ['u'.$p_family_id,  $father->id] ;
-                            array_unshift($this->links, ['u'.$p_family_id,  $father->id]);
+                            array_unshift($this->links, ['u' . $p_family_id, $father->id]);
                             $p_family = Family::find($p_family_id);
                             if (isset($p_family->husband_id)) {
                                 $p_fatherid = $p_family->husband_id;
@@ -215,7 +215,7 @@ 
                     }
                 }
                 if (isset($mother->id)) {
-                    if (! array_key_exists($mother->id, $this->persons)) {
+                    if (!array_key_exists($mother->id, $this->persons)) {
                         // this is not added
                         $_families = Family::where('husband_id', $mother->id)->orwhere('wife_id', $mother->id)->select('id')->get();
                         $_union_ids = [];
@@ -223,30 +223,30 @@ 
                             $_union_ids[] = $item->id;
                         }
                         $mother->setAttribute('own_unions', $_union_ids);
-                        $mother->setAttribute('parent_union', 'u'.$mother->child_in_family_id);
+                        $mother->setAttribute('parent_union', 'u' . $mother->child_in_family_id);
                         // add to person
                         $this->persons[$mother->id] = $mother;
                         // add current family link
                         // $this->links[] = [$mother->id, 'u'.$family_id];
-                        array_unshift($this->links, [$mother->id, 'u'.$family_id]);
+                        array_unshift($this->links, [$mother->id, 'u' . $family_id]);
                         // get wifee's parents data
                         $p_family_id = $mother->child_in_family_id;
-                        if($p_family_id) {
+                        if ($p_family_id) {
                         
                     }
-                        if (! empty($p_family_id)) {
+                        if (!empty($p_family_id)) {
                             // add parent family link
                             // $this->links[] = ['u'.$p_family_id,  $father->id] ;
-                            array_unshift($this->links, ['u'.$p_family_id,  $mother->id]);
+                            array_unshift($this->links, ['u' . $p_family_id, $mother->id]);
 
                             $p_family = Family::find($p_family_id);
                             if (isset($p_family->husband_id)) {
-                                array_unshift($this->family_id, 'mother'.$p_family_id);
+                                array_unshift($this->family_id, 'mother' . $p_family_id);
                                 $p_fatherid = $p_family->husband_id;
                                 $this->getGraphDataUpward($p_fatherid, $nest + 1);
                             }
                             if (isset($p_family->wife_id)) {
-                                array_unshift($this->family_id, 'mother'.$p_family_id);
+                                array_unshift($this->family_id, 'mother' . $p_family_id);
                                 $p_motherid = $p_family->wife_id;
                                 $this->getGraphDataUpward($p_motherid, $nest + 1);
                             }
@@ -258,8 +258,8 @@ 
                 $children = Person::where('child_in_family_id', $family_id)->get();
                 $children_ids = [];
                 foreach ($children as $child) {
-                    $this->getGraphDataUpward($child->id, $nest+1);
-                    if($child->id == 680) {
+                    $this->getGraphDataUpward($child->id, $nest + 1);
+                    if ($child->id == 680) {
                         array_unshift($this->family_id, $child->id);
                     }
                     $child_id = $child->id;
@@ -268,20 +268,20 @@ 
 
                 // compose union item and add to unions
                 $union = [];
-                $union['id'] = 'u'.$family_id;
+                $union['id'] = 'u' . $family_id;
                 $union['partner'] = [isset($father->id) ? $father->id : null, isset($mother->id) ? $mother->id : null];
                 $union['children'] = $children_ids;
-                $this->unions['u'.$family_id] = $union;
+                $this->unions['u' . $family_id] = $union;
             }
             //get brother/sisters
-            $i =0;
+            $i = 0;
             $brothers = Person::where('child_in_family_id', $person->child_in_family_id)
                 ->whereNotNull('child_in_family_id')
                 ->where('id', '<>', $start_id)->get();
 
             foreach ($brothers as $brother) {
                 // if($i < 2) {
-                    $this->getGraphDataUpward($brother->id, $nest+1);
+                    $this->getGraphDataUpward($brother->id, $nest + 1);
                 // }
                 $i++;
             }

app/Http/Controllers/DashboardController.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
         $familiesjoined = Family::all()->count();
         $peoplesattached = Person::all()->count();
         $chart = array($male, $female, $unknown);
-        return ['chart' => $chart,'familiesjoined' => $familiesjoined,'peoplesattached' => $peoplesattached];
+        return ['chart' => $chart, 'familiesjoined' => $familiesjoined, 'peoplesattached' => $peoplesattached];
     }
 
     /**
@@ -37,7 +37,7 @@ 
     {
         $user = auth()->user();
         $company = $user->Company();
-        $trees =Tree::where('company_id',$company->id)->get();
+        $trees = Tree::where('company_id', $company->id)->get();
         return $trees;
     }
 
@@ -48,7 +48,7 @@ 
     }
 
     public function getTree() {
-        $trees =Tree::where('company_id',request('company_id'))->get();
+        $trees = Tree::where('company_id', request('company_id'))->get();
         return $trees;
     }
     public function changedb(Request $request)
@@ -130,7 +130,7 @@ 
     public function trial()
     {
         $user = auth()->user();
-        if($user->subscribed('default')) {
+        if ($user->subscribed('default')) {
             $days = Carbon::now()->diffInDays(Carbon::parse($user->subscription('default')->asStripeSubscription()->current_period_end));
         } else {
             $days = Carbon::now()->diffInDays($user->trial_ends_at);

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
             $tree->current_tenant = 1;
             $tree->save();
             return response()->json(['changedb' => true]);
-        }
-        else {
+        } else {
             return response()->json(['changedb' => false]);
         }
     }

app/Http/Controllers/PersonAssoController.php

Spacing +10 added lines, -10 removed lines

@@ -16,34 +16,34 @@ 
     {
         $query = PersonAsso::query();
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['group','indi','rela','import_confirm'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['group', 'indi', 'rela', 'import_confirm'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -135,7 +135,7 @@ 
     public function destroy($id)
     {
         $personasso = PersonAsso::find($id);
-        if($personasso) {
+        if ($personasso) {
             $personasso->delete();
             return "true";
         }

app/Http/Controllers/FamilyEventController.php

Spacing +11 added lines, -11 removed lines

@@ -18,36 +18,36 @@ 
      */
     public function index(Request $request)
     {
-        $query = FamilyEvent::query()->with(['family','place']);
+        $query = FamilyEvent::query()->with(['family', 'place']);
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['family_id','places_id','date','title','description','year','month','day','type','plac','phon','caus','age','agnc','husb','wife','converted_date','addr_id'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['family_id', 'places_id', 'date', 'title', 'description', 'year', 'month', 'day', 'type', 'plac', 'phon', 'caus', 'age', 'agnc', 'husb', 'wife', 'converted_date', 'addr_id'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -207,7 +207,7 @@ 
     public function destroy($id)
     {
         $familyevent = FamilyEvent::find($id);
-        if($familyevent) {
+        if ($familyevent) {
             $familyevent->delete();
             return "true";
         }

app/Http/Controllers/AddrController.php

Spacing +10 added lines, -10 removed lines

@@ -16,34 +16,34 @@ 
     {
         $query = Addr::query();
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['adr1','adr2','city','stae','post','ctry'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['adr1', 'adr2', 'city', 'stae', 'post', 'ctry'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -142,7 +142,7 @@ 
     public function destroy($id)
     {
         $addr = Addr::find($id);
-        if($addr) {
+        if ($addr) {
             $addr->delete();
             return "true";
         }