GreenMeteor / humhub-geolocation-module

controllers/IndexController.php

Spacing +27 added lines, -27 removed lines

@@ -74,7 +74,7 @@ 
 
         $group = null;
         $pagination = new Pagination([]);
-        if ($model->load(Yii::$app->request->post())){
+        if ($model->load(Yii::$app->request->post())) {
 
 
             if ($model->groupID) {
@@ -98,7 +98,7 @@ 
 
         }
 
-        if ($model->keyword != ''){
+        if ($model->keyword != '') {
             $searchResultSet = Yii::$app->search->find($model->keyword, $searchOptions);
 
             $pagination = new Pagination([
@@ -106,15 +106,15 @@ 
                 'pageSize' => $searchResultSet->pageSize
             ]);
 
-        }else {
+        } else {
 
             $limit = $this->module->pageSize;
 
-            if ($model->page > 1){
+            if ($model->page > 1) {
                 $limit = ($model->page * $this->module->pageSize) . ', ' . $this->module->pageSize;
             }
 
-            if ($model->latitude == null || $model->longitude == null){
+            if ($model->latitude == null || $model->longitude == null) {
                 $user = User::find()->where(['id' => Yii::$app->user->id])->one();
                 /* @var $user User */
                 $model->latitude = $user->latitude;
@@ -122,19 +122,19 @@ 
             }
 
             /* @var $searchResultSet User[] */
-            if ($model->latitude != null && $model->longitude != null){
+            if ($model->latitude != null && $model->longitude != null) {
 
-                if ($model->distance == null){
+                if ($model->distance == null) {
                     $model->distance = 25;
                 }
 
                 $commandString = 'SELECT *, get_distance_in_miles_between_geo_locations( ' . $model->latitude . ', ' . $model->longitude . ', latitude, longitude) as distance
-                    from user WHERE longitude BETWEEN ' . $model->longitude . ' - ' . $model->distance . ' /abs(cos(radians(' . $model->latitude . '))*69) and '. $model->longitude .' + ' . $model->distance . ' /abs(cos(radians(' . $model->latitude . '))*69)
-                    and latitude BETWEEN ' . $model->latitude . ' - (' . $model->distance . '/69) and '. $model->latitude . '+(' . $model->distance . '/69) and id != ' . Yii::$app->user->id;
+                    from user WHERE longitude BETWEEN ' . $model->longitude . ' - ' . $model->distance . ' /abs(cos(radians(' . $model->latitude . '))*69) and ' . $model->longitude . ' + ' . $model->distance . ' /abs(cos(radians(' . $model->latitude . '))*69)
+                    and latitude BETWEEN ' . $model->latitude . ' - (' . $model->distance . '/69) and ' . $model->latitude . '+(' . $model->distance . '/69) and id != ' . Yii::$app->user->id;
 
-                if ($model->page > 1){
+                if ($model->page > 1) {
                     $limit = ($model->page * $this->module->pageSize) . ', ' . $this->module->pageSize;
-                }else {
+                } else {
                     $limit = $this->module->pageSize;
                 }
 
@@ -143,7 +143,7 @@ 
                 $searchResultSet = Yii::$app->db->createCommand($commandString)->queryAll();
 
                 $instances = [];
-                foreach ($searchResultSet as $result){
+                foreach ($searchResultSet as $result) {
                     $modelClass = User::class;
                     $instance = $modelClass::findOne(['id' => $result['id']]);
                     $instance->distance = $result['distance'];
@@ -151,11 +151,11 @@ 
                 }
                 $searchResultSet = $instances;
 
-                if (count($searchResultSet) < $this->module->pageSize){
+                if (count($searchResultSet) < $this->module->pageSize) {
 
                     $users = User::find()->where(['latitude' => null])->limit($this->module->pageSize - count($searchResultSet))->all();
                     $instances = [];
-                    foreach ($users as $user){
+                    foreach ($users as $user) {
                         $modelClass = User::class;
                         $instance = $modelClass::findOne(['id' => $user->id]);
                         $instance->distance = "Unknown Distance";
@@ -169,39 +169,39 @@ 
                     'totalCount' => count($searchResultSet),
                     'pageSize' => $this->module->pageSize
                 ]);
-            }else {
+            } else {
                 $pagination = new Pagination([]);
             }
 
         }
 
-        Event::on(Sidebar::class, Sidebar::EVENT_INIT, function ($event) {
+        Event::on(Sidebar::class, Sidebar::EVENT_INIT, function($event) {
             $event->sender->addWidget(NewMembers::class, [], ['sortOrder' => 10]);
             $event->sender->addWidget(MemberStatistics::class, [], ['sortOrder' => 20]);
         });
 
         $users = null;
-        if ($model->keyword == null){
-            if ($model->latitude != null && $model->longitude != null){
+        if ($model->keyword == null) {
+            if ($model->latitude != null && $model->longitude != null) {
 
                 $users = $searchResultSet;
-            }else {
+            } else {
                 $users = new SearchResultSet();
                 $users = $users->getResultInstances();
             }
 
-        }else {
+        } else {
             $users = $searchResultSet->getResultInstances();
         }
 
-        if (yii::$app->request->isAjax){
+        if (yii::$app->request->isAjax) {
             return $this->render('members', [
                 'model' => $model,
                 'group' => $group,
                 'users' => $users,
                 'pagination' => $pagination
             ]);
-        }else {
+        } else {
             return $this->render('members', [
                 'model' => $model,
                 'group' => $group,
@@ -212,14 +212,14 @@ 
 
     }
 
-    public function actionUpdatelocation( $lat,  $long){
+    public function actionUpdatelocation($lat, $long) {
 
         $record = User::find()->where(['id' => Yii::$app->user->id])->one();
         $record->latitude = $lat;
         $record->longitude = $long;
-        if ($record->save()){
+        if ($record->save()) {
             return true;
-        }else {
+        } else {
             return false;
         }
 
@@ -249,7 +249,7 @@ 
             'pageSize' => $searchResultSet->pageSize
         ]);
 
-        Event::on(Sidebar::class, Sidebar::EVENT_INIT, function ($event) {
+        Event::on(Sidebar::class, Sidebar::EVENT_INIT, function($event) {
             $event->sender->addWidget(NewSpaces::class, [], ['sortOrder' => 10]);
             $event->sender->addWidget(SpaceStatistics::class, [], ['sortOrder' => 20]);
         });
@@ -274,7 +274,7 @@ 
 
         $groups = Group::getDirectoryGroups();
 
-        Event::on(Sidebar::class, Sidebar::EVENT_INIT, function ($event) {
+        Event::on(Sidebar::class, Sidebar::EVENT_INIT, function($event) {
             $event->sender->addWidget(GroupStatistics::class, [], ['sortOrder' => 10]);
         });
 

Braces +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
                 'pageSize' => $searchResultSet->pageSize
             ]);
 
-        }else {
+        } else {
 
             $limit = $this->module->pageSize;
 
@@ -134,7 +134,7 @@ 
 
                 if ($model->page > 1){
                     $limit = ($model->page * $this->module->pageSize) . ', ' . $this->module->pageSize;
-                }else {
+                } else {
                     $limit = $this->module->pageSize;
                 }
 
@@ -169,7 +169,7 @@ 
                     'totalCount' => count($searchResultSet),
                     'pageSize' => $this->module->pageSize
                 ]);
-            }else {
+            } else {
                 $pagination = new Pagination([]);
             }
 
@@ -185,12 +185,12 @@ 
             if ($model->latitude != null && $model->longitude != null){
 
                 $users = $searchResultSet;
-            }else {
+            } else {
                 $users = new SearchResultSet();
                 $users = $users->getResultInstances();
             }
 
-        }else {
+        } else {
             $users = $searchResultSet->getResultInstances();
         }
 
@@ -201,7 +201,7 @@ 
                 'users' => $users,
                 'pagination' => $pagination
             ]);
-        }else {
+        } else {
             return $this->render('members', [
                 'model' => $model,
                 'group' => $group,
@@ -219,7 +219,7 @@ 
         $record->longitude = $long;
         if ($record->save()){
             return true;
-        }else {
+        } else {
             return false;
         }
 

widgets/Menu.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 
 use Yii;
 use yii\helpers\Url;
-
 use humhub\modules\directory\models\User;
 
 /**

views/widgets/views/memberActionsButton.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 if (!Yii::$app->user->isGuest && !$user->isCurrentUser() && Yii::$app->getModule('friendship')->getIsEnabled()) {
     $friendShipState = Friendship::getStateForUser(Yii::$app->user->getIdentity(), $user);
     if ($friendShipState === Friendship::STATE_NONE) {
-        echo Html::a('<span class="glyphicon glyphicon-plus"></span>&nbsp;&nbsp;' . Yii::t("FriendshipModule.base", "Add Friend"), Url::to(['/friendship/request/add', 'userId' => $user->id]), ['class' => 'btn btn-primary btn-sm','data-ui-loader' => '', 'data-method' => 'POST']);
+        echo Html::a('<span class="glyphicon glyphicon-plus"></span>&nbsp;&nbsp;' . Yii::t("FriendshipModule.base", "Add Friend"), Url::to(['/friendship/request/add', 'userId' => $user->id]), ['class' => 'btn btn-primary btn-sm', 'data-ui-loader' => '', 'data-method' => 'POST']);
     } elseif ($friendShipState === Friendship::STATE_FRIENDS) {
         echo Html::a('<span class="glyphicon glyphicon-ok"></span>&nbsp;&nbsp;' . Yii::t("FriendshipModule.base", "Friends"), $user->getUrl(), ['class' => 'btn btn-info btn-sm', 'data-ui-loader' => '']);
     }

Events.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 
 class Events extends \yii\base\BaseObject
 {
-    public static function directoryAfterInit(){
+    public static function directoryAfterInit() {
         $x = 3;
     }
 
@@ -24,14 +24,14 @@ 
         $arrayNumber = null;
         $it = 0;
         /* @var $sender TopMenu */
-        foreach ($event->sender->items as $item){
+        foreach ($event->sender->items as $item) {
             if ($item['label'] == Yii::t('DirectoryModule.base', 'Directory'))
             {
                 $arrayNumber = $it;
             }
             $it++;
         }
-        $event->sender->items[$arrayNumber]['url'] = Url::to([ "/geolocation/index"]);
+        $event->sender->items[$arrayNumber]['url'] = Url::to(["/geolocation/index"]);
     }
 
 

messages/en-US/base.php

Indentation +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 return [
-  'Geolocation' => '',
-  '<strong>Geolocation</strong> configuration' => '',
-  'Welcome to the admin only area.' => '',
+    'Geolocation' => '',
+    '<strong>Geolocation</strong> configuration' => '',
+    'Welcome to the admin only area.' => '',
 ];