luyadev / luya

modules/admin/file/Item.php

Spacing +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
      */
     public function getHttpSource()
     {
-        return Yii::$app->storage->httpPath . '/' . $this->itemArray['name_new_compound'];
+        return Yii::$app->storage->httpPath.'/'.$this->itemArray['name_new_compound'];
     }
     
     /**
@@ -153,7 +153,7 @@ 
      */
     public function getServerSource()
     {
-        return Yii::$app->storage->serverPath . '/' . $this->itemArray['name_new_compound'];
+        return Yii::$app->storage->serverPath.'/'.$this->itemArray['name_new_compound'];
     }
     
     /**

modules/admin/storage/QueryTrait.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     {
         $data = array_filter($this->getDataProvider(), [$this, 'whereFilter']);
         
-        return (count($data) !== 0) ? $this->createItem(array_values($data)[0]): false;
+        return (count($data) !== 0) ? $this->createItem(array_values($data)[0]) : false;
     }
     
     /**

modules/admin/storage/IteratorAbstract.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      * Callculate to number of items when using count() function against the QueryIterator object.
      *
      * @return int The number of elements in the object.
-    */
+     */
     public function count()
     {
         return count($this->data);

modules/admin/components/AdminMenu.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 
                 // see if the groups has items
                 foreach ($item['groups'] as $groupName => $groupItem) {
-                    if (count($groupItem['items'])  > 0) {
+                    if (count($groupItem['items']) > 0) {
                         if ($permissionGranted) {
                             continue;
                         }

modules/admin/aws/CoordinatesActiveWindow.php

Indentation +44 added lines, -44 removed lines

@@ -12,59 +12,59 @@
  */
 class CoordinatesActiveWindow extends \admin\ngrest\base\ActiveWindow
 {
-	public $module = '@admin';
+    public $module = '@admin';
 	
-	public $alias = 'Coordinates';
+    public $alias = 'Coordinates';
 	
-	public $icon = 'pin_drop';
+    public $icon = 'pin_drop';
 	
-	/**
-	 * @var string Register your maps application and enter your api key here
-	 * while configure the active window (https://console.developers.google.com).
-	 */
-	public $mapsApiKey = null;
+    /**
+     * @var string Register your maps application and enter your api key here
+     * while configure the active window (https://console.developers.google.com).
+     */
+    public $mapsApiKey = null;
 	
-	/**
-	 * {@inheritDoc}
-	 * @see \admin\ngrest\base\ActiveWindow::init()
-	 */
-	public function init()
-	{
-	    if ($this->mapsApiKey === null) {
-	        throw new Exception('A google maps API key can not be null.');
-	    }
-	}
+    /**
+     * {@inheritDoc}
+     * @see \admin\ngrest\base\ActiveWindow::init()
+     */
+    public function init()
+    {
+        if ($this->mapsApiKey === null) {
+            throw new Exception('A google maps API key can not be null.');
+        }
+    }
 	
-	/**
-	 * Renders the index file of the ActiveWindow.
-	 *
-	 * @return string The render index file.
-	 */
-	public function index()
-	{
-		return $this->render('index', [
-			'id' => $this->itemId,
-		    'mapsApiKey' => $this->mapsApiKey,
-		]);
-	}
+    /**
+     * Renders the index file of the ActiveWindow.
+     *
+     * @return string The render index file.
+     */
+    public function index()
+    {
+        return $this->render('index', [
+            'id' => $this->itemId,
+            'mapsApiKey' => $this->mapsApiKey,
+        ]);
+    }
 	
-	public function callbackGetCoordinates($address)
-	{
-	    $curl = new Curl();
-	    $curl->get('https://maps.googleapis.com/maps/api/geocode/json?', ['key' => $this->mapsApiKey, 'address' => $address]);
+    public function callbackGetCoordinates($address)
+    {
+        $curl = new Curl();
+        $curl->get('https://maps.googleapis.com/maps/api/geocode/json?', ['key' => $this->mapsApiKey, 'address' => $address]);
 	    
-	    if ($curl->error) {
-	        return $this->sendError('Error while getting data from google maps API: ' . $curl->error_message);
-	    }
+        if ($curl->error) {
+            return $this->sendError('Error while getting data from google maps API: ' . $curl->error_message);
+        }
 	    
-	    $response = Json::decode($curl->response);
+        $response = Json::decode($curl->response);
 	    
-	    if (!isset($response['results']) || !isset($response['results'][0])) {
-	        return $this->sendError('Error while collecting data for your adresse. Check if you adress was correct and try again.');
-	    }
+        if (!isset($response['results']) || !isset($response['results'][0])) {
+            return $this->sendError('Error while collecting data for your adresse. Check if you adress was correct and try again.');
+        }
 	    
-	    $cords = $response['results'][0]['geometry']['location'];
+        $cords = $response['results'][0]['geometry']['location'];
 	    
-	    return $this->sendSuccess('We have found your location and pinned the marker on the submit.', ['cords' => $cords]);
-	}
+        return $this->sendSuccess('We have found your location and pinned the marker on the submit.', ['cords' => $cords]);
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	    $curl->get('https://maps.googleapis.com/maps/api/geocode/json?', ['key' => $this->mapsApiKey, 'address' => $address]);
 	    
 	    if ($curl->error) {
-	        return $this->sendError('Error while getting data from google maps API: ' . $curl->error_message);
+	        return $this->sendError('Error while getting data from google maps API: '.$curl->error_message);
 	    }
 	    
 	    $response = Json::decode($curl->response);

modules/admin/base/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
                 'allow' => true,
                 'actions' => [], // apply to all actions by default
                 'roles' => ['@'],
-                'matchCallback' => function ($rule, $action) {
+                'matchCallback' => function($rule, $action) {
                     // see if a controller property has been defined to disabled the permission checks
                     if ($action->controller->disablePermissionCheck) {
                         return true;

modules/admin/controllers/FileController.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
                 header('Expires: 0');
                 header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
                 header('Pragma: public');
-                header('Content-Length: ' . filesize($fileSourcePath));
+                header('Content-Length: '.filesize($fileSourcePath));
                 flush();
                 readfile($fileSourcePath);
                 exit;

modules/admin/views/ngrest/render/crud.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <script>
-    activeWindowCallbackUrl = '<?php echo $activeWindowCallbackUrl;?>';
+    activeWindowCallbackUrl = '<?php echo $activeWindowCallbackUrl; ?>';
     ngrestConfigHash = '<?php echo $config->hash; ?>';
     zaa.bootstrap.register('<?php echo $config->hash; ?>', function($scope, $controller) {
         /* extend class */

modules/admin/views/ngrest/render/crud.orig.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<script>activeWindowCallbackUrl='<?php echo $activeWindowCallbackUrl;?>'; ngrestConfigHash='<?php echo $config->hash; ?>'; zaa.bootstrap.register('<?php echo $config->hash; ?>', function($scope, $controller){/* extend class */ $.extend(this, $controller('CrudController',{$scope : $scope})); /* local controller config */ $scope.config.apiListQueryString='<?php echo $this->context->apiQueryString('list'); ?>'; $scope.config.apiUpdateQueryString='<?php echo $this->context->apiQueryString('update'); ?>'; $scope.config.apiEndpoint='<?php echo $this->context->getRestUrl(); ?>'; $scope.config.list=<?php echo $this->context->getFieldsJson('list'); ?>; $scope.config.create=<?php echo $this->context->getFieldsJson('create'); ?>; $scope.config.update=<?php echo $this->context->getFieldsJson('update'); ?>; $scope.config.ngrestConfigHash='<?php echo $config->hash; ?>'; $scope.config.activeWindowCallbackUrl='<?php echo $activeWindowCallbackUrl; ?>'; $scope.config.pk='<?php echo $this->context->getPrimaryKey(); ?>';});</script><div ng-controller="<?php echo $config->hash; ?>" ng-init="init()"><div style="visibility:hidden;" ui-view></div><div> <div class="tabs"> <ul> <li class="tabs__item" ng-class="{'tabs__item--active' : crudSwitchType==0}"> <a class="tabs__anchor" ng-click="switchTo(0)"><i class="material-icons tabs__icon">menu</i> <?php echo \admin\Module::t('ngrest_crud_btn_list'); ?></a> </li><?php if ($canCreate && $config->getPointer('create')): ?> <li class="tabs__item" ng-class="{'tabs__item--active' : crudSwitchType==1}"> <a class="tabs__anchor" style="" ng-click="switchTo(1)"><i class="material-icons tabs__icon">add_box</i> <?php echo \admin\Module::t('ngrest_crud_btn_add'); ?></a> </li><?php endif; ?> <li ng-show="crudSwitchType==2" class="tabs__item" ng-class="{'tabs__item--active' : crudSwitchType==2}"> <a class="tabs__anchor" ng-click="switchTo(0)"><i class="material-icons tabs__icon">cancel</i> <?php echo \admin\Module::t('ngrest_crud_btn_close'); ?></a> </li></ul> </div><div class="langswitch crud__langswitch" ng-if="crudSwitchType!==0"> <a ng-repeat="lang in AdminLangService.data" ng-click="AdminLangService.toggleSelection(lang)" ng-class="{'langswitch__item--active' : AdminLangService.isInSelection(lang.short_code)}" class="langswitch__item [ waves-effect waves-blue][ btn-flat btn--small btn--bold] ng-binding ng-scope"> <span class="flag flag--{{lang.short_code}}"> <span class="flag__fallback">{{lang.name}}</span> </span> </a> </div><div class="card-panel" ng-show="crudSwitchType==0"> <div style="margin-bottom:30px;"> <div class="input input--text"> <div class="input__field-wrapper"> <input class="input__field" id="searchString" ng-model="searchString" ng-change="evalSearchString()" type="text" placeholder="<?php echo \admin\Module::t('ngrest_crud_search_text'); ?>"/> </div></div></div><div ng-show="deleteErrors.length"> <div class="alert alert--danger"> <ul> <li ng-repeat="e in deleteErrors">{{e}}</li></ul> </div></div><table class="striped responsive-table hoverable"> <thead> <tr> <?php foreach ($config->getPointer('list') as $item): ?> <th><?php echo $item['alias']; ?> <i ng-click="changeOrder('<?php echo $item['name']; ?>', '+')" ng-class="{'active-orderby' : isOrderBy('+<?php echo $item['name']; ?>')}" class="material-icons grid-sort-btn">keyboard_arrow_up</i> <i ng-click="changeOrder('<?php echo $item['name']; ?>', '-')" ng-class="{'active-orderby' : isOrderBy('-<?php echo $item['name']; ?>')}" class="material-icons grid-sort-btn">keyboard_arrow_down</i></th> <?php endforeach; ?> <?php if (count($this->context->getButtons()) > 0): ?> <th style="text-align:right;"><span class="grid-data-length">{{data.list.length}} <?php echo \admin\Module::t('ngrest_crud_rows_count'); ?></span></th> <?php endif; ?> </tr></thead> <tbody> <tr ng-repeat="(key, item) in data.list | srcbox:searchString" ng-class="{'crud__item-highlight': isHighlighted(item)}"> <?php foreach ($config->getPointer('list') as $item): ?> <?php foreach ($this->context->createElements($item, \admin\ngrest\render\RenderCrud::TYPE_LIST) as $element): ?> <td><?php echo $element['html']; ?></td><?php endforeach; ?> <?php endforeach; ?> <?php if (count($this->context->getButtons()) > 0): ?> <td style="text-align:right;"> <?php foreach ($this->context->getButtons() as $item): ?> <a class="waves-effect waves-light btn-flat btn--bordered" ng-click="<?php echo $item['ngClick']; ?>"><i class="material-icons<?php if (!empty($item['label'])): ?> left<?php endif; ?>"><?php echo $item['icon']; ?></i><?php echo $item['label']; ?></a> <?php endforeach; ?> </td><?php endif; ?> </tr></tbody> </table> <div ng-show="data.list.length==0" class="alert alert--info"><?php echo \admin\Module::t('ngrest_crud_empty_row'); ?></div></div><div class="card-panel" ng-show="crudSwitchType==1" zaa-esc="closeCreate()"> <?php if ($canCreate && $config->getPointer('create')): ?> <form name="formCreate" role="form" ng-submit="submitCreate()"> <div class="modal__content"> <?php foreach ($config->getPointer('create') as $k=> $item): ?> <div class="row"> <?php foreach ($this->context->createElements($item, \admin\ngrest\render\RenderCrud::TYPE_CREATE) as $element): ?> <?php echo $element['html']; ?> <?php endforeach; ?> </div><?php endforeach; ?> <div class="red lighten-2" style="color:white;" ng-show="createErrors.length"> <ul> <li ng-repeat="error in createErrors" style="padding:6px;">-{{error.message}}</li></ul> </div></div><div class="modal__footer"> <div class="row"> <div class="col s12"> <div class="right"> <button class="btn waves-effect waves-light" type="submit" ng-disabled="createForm.$invalid"> <?php echo \admin\Module::t('ngrest_crud_btn_create'); ?> <i class="material-icons right">check</i> </button> <button class="btn waves-effect waves-light red" type="button" ng-click="closeCreate()"> <i class="material-icons left">cancel</i> <?php echo \admin\Module::t('button_abort'); ?> </button> </div></div></div></div></form> <?php endif; ?> </div><div class="card-panel" ng-show="crudSwitchType==2" zaa-esc="closeUpdate()"> <?php if ($canUpdate && $config->getPointer('update')): ?> <form name="formUpdate" role="form" ng-submit="submitUpdate()"> <div class="modal__content"> <?php foreach ($config->getPointer('update') as $k=> $item): ?> <div class="row"> <?php foreach ($this->context->createElements($item, \admin\ngrest\render\RenderCrud::TYPE_UPDATE) as $element): ?> <?php echo $element['html']; ?> <?php endforeach; ?> </div><?php endforeach; ?> <div class="red lighten-2" style="color:white;" ng-show="updateErrors.length"> <ul> <li ng-repeat="error in updateErrors" style="padding:6px;">-{{error.message}}</li></ul> </div></div><div class="modal__footer"> <div class="row"> <div class="col s12"> <div class="right"> <button class="btn waves-effect waves-light" type="submit" ng-disabled="updateForm.$invalid"> <?php echo \admin\Module::t('button_save'); ?> <i class="material-icons right">check</i> </button> <button class="btn waves-effect waves-light red" type="button" ng-click="closeUpdate()"> <i class="material-icons left">cancel</i> <?php echo \admin\Module::t('button_abort'); ?> </button> </div></div></div></div></form> <?php endif; ?> </div></div><div ng-show="activeWindowModal" class="modal__wrapper" zaa-esc="closeActiveWindow()"> <div class="modal"> <button class="btn waves-effect waves-light modal__close btn-floating red" type="button" ng-click="closeActiveWindow()"> <i class="material-icons">close</i> </button> <div class="modal-content" compile-html ng-bind-html="data.aw.content"></div></div><div class="modal__background"></div></div></div>
\ No newline at end of file
+<script>activeWindowCallbackUrl='<?php echo $activeWindowCallbackUrl; ?>'; ngrestConfigHash='<?php echo $config->hash; ?>'; zaa.bootstrap.register('<?php echo $config->hash; ?>', function($scope, $controller){/* extend class */ $.extend(this, $controller('CrudController',{$scope : $scope})); /* local controller config */ $scope.config.apiListQueryString='<?php echo $this->context->apiQueryString('list'); ?>'; $scope.config.apiUpdateQueryString='<?php echo $this->context->apiQueryString('update'); ?>'; $scope.config.apiEndpoint='<?php echo $this->context->getRestUrl(); ?>'; $scope.config.list=<?php echo $this->context->getFieldsJson('list'); ?>; $scope.config.create=<?php echo $this->context->getFieldsJson('create'); ?>; $scope.config.update=<?php echo $this->context->getFieldsJson('update'); ?>; $scope.config.ngrestConfigHash='<?php echo $config->hash; ?>'; $scope.config.activeWindowCallbackUrl='<?php echo $activeWindowCallbackUrl; ?>'; $scope.config.pk='<?php echo $this->context->getPrimaryKey(); ?>';});</script><div ng-controller="<?php echo $config->hash; ?>" ng-init="init()"><div style="visibility:hidden;" ui-view></div><div> <div class="tabs"> <ul> <li class="tabs__item" ng-class="{'tabs__item--active' : crudSwitchType==0}"> <a class="tabs__anchor" ng-click="switchTo(0)"><i class="material-icons tabs__icon">menu</i> <?php echo \admin\Module::t('ngrest_crud_btn_list'); ?></a> </li><?php if ($canCreate && $config->getPointer('create')): ?> <li class="tabs__item" ng-class="{'tabs__item--active' : crudSwitchType==1}"> <a class="tabs__anchor" style="" ng-click="switchTo(1)"><i class="material-icons tabs__icon">add_box</i> <?php echo \admin\Module::t('ngrest_crud_btn_add'); ?></a> </li><?php endif; ?> <li ng-show="crudSwitchType==2" class="tabs__item" ng-class="{'tabs__item--active' : crudSwitchType==2}"> <a class="tabs__anchor" ng-click="switchTo(0)"><i class="material-icons tabs__icon">cancel</i> <?php echo \admin\Module::t('ngrest_crud_btn_close'); ?></a> </li></ul> </div><div class="langswitch crud__langswitch" ng-if="crudSwitchType!==0"> <a ng-repeat="lang in AdminLangService.data" ng-click="AdminLangService.toggleSelection(lang)" ng-class="{'langswitch__item--active' : AdminLangService.isInSelection(lang.short_code)}" class="langswitch__item [ waves-effect waves-blue][ btn-flat btn--small btn--bold] ng-binding ng-scope"> <span class="flag flag--{{lang.short_code}}"> <span class="flag__fallback">{{lang.name}}</span> </span> </a> </div><div class="card-panel" ng-show="crudSwitchType==0"> <div style="margin-bottom:30px;"> <div class="input input--text"> <div class="input__field-wrapper"> <input class="input__field" id="searchString" ng-model="searchString" ng-change="evalSearchString()" type="text" placeholder="<?php echo \admin\Module::t('ngrest_crud_search_text'); ?>"/> </div></div></div><div ng-show="deleteErrors.length"> <div class="alert alert--danger"> <ul> <li ng-repeat="e in deleteErrors">{{e}}</li></ul> </div></div><table class="striped responsive-table hoverable"> <thead> <tr> <?php foreach ($config->getPointer('list') as $item): ?> <th><?php echo $item['alias']; ?> <i ng-click="changeOrder('<?php echo $item['name']; ?>', '+')" ng-class="{'active-orderby' : isOrderBy('+<?php echo $item['name']; ?>')}" class="material-icons grid-sort-btn">keyboard_arrow_up</i> <i ng-click="changeOrder('<?php echo $item['name']; ?>', '-')" ng-class="{'active-orderby' : isOrderBy('-<?php echo $item['name']; ?>')}" class="material-icons grid-sort-btn">keyboard_arrow_down</i></th> <?php endforeach; ?> <?php if (count($this->context->getButtons()) > 0): ?> <th style="text-align:right;"><span class="grid-data-length">{{data.list.length}} <?php echo \admin\Module::t('ngrest_crud_rows_count'); ?></span></th> <?php endif; ?> </tr></thead> <tbody> <tr ng-repeat="(key, item) in data.list | srcbox:searchString" ng-class="{'crud__item-highlight': isHighlighted(item)}"> <?php foreach ($config->getPointer('list') as $item): ?> <?php foreach ($this->context->createElements($item, \admin\ngrest\render\RenderCrud::TYPE_LIST) as $element): ?> <td><?php echo $element['html']; ?></td><?php endforeach; ?> <?php endforeach; ?> <?php if (count($this->context->getButtons()) > 0): ?> <td style="text-align:right;"> <?php foreach ($this->context->getButtons() as $item): ?> <a class="waves-effect waves-light btn-flat btn--bordered" ng-click="<?php echo $item['ngClick']; ?>"><i class="material-icons<?php if (!empty($item['label'])): ?> left<?php endif; ?>"><?php echo $item['icon']; ?></i><?php echo $item['label']; ?></a> <?php endforeach; ?> </td><?php endif; ?> </tr></tbody> </table> <div ng-show="data.list.length==0" class="alert alert--info"><?php echo \admin\Module::t('ngrest_crud_empty_row'); ?></div></div><div class="card-panel" ng-show="crudSwitchType==1" zaa-esc="closeCreate()"> <?php if ($canCreate && $config->getPointer('create')): ?> <form name="formCreate" role="form" ng-submit="submitCreate()"> <div class="modal__content"> <?php foreach ($config->getPointer('create') as $k=> $item): ?> <div class="row"> <?php foreach ($this->context->createElements($item, \admin\ngrest\render\RenderCrud::TYPE_CREATE) as $element): ?> <?php echo $element['html']; ?> <?php endforeach; ?> </div><?php endforeach; ?> <div class="red lighten-2" style="color:white;" ng-show="createErrors.length"> <ul> <li ng-repeat="error in createErrors" style="padding:6px;">-{{error.message}}</li></ul> </div></div><div class="modal__footer"> <div class="row"> <div class="col s12"> <div class="right"> <button class="btn waves-effect waves-light" type="submit" ng-disabled="createForm.$invalid"> <?php echo \admin\Module::t('ngrest_crud_btn_create'); ?> <i class="material-icons right">check</i> </button> <button class="btn waves-effect waves-light red" type="button" ng-click="closeCreate()"> <i class="material-icons left">cancel</i> <?php echo \admin\Module::t('button_abort'); ?> </button> </div></div></div></div></form> <?php endif; ?> </div><div class="card-panel" ng-show="crudSwitchType==2" zaa-esc="closeUpdate()"> <?php if ($canUpdate && $config->getPointer('update')): ?> <form name="formUpdate" role="form" ng-submit="submitUpdate()"> <div class="modal__content"> <?php foreach ($config->getPointer('update') as $k=> $item): ?> <div class="row"> <?php foreach ($this->context->createElements($item, \admin\ngrest\render\RenderCrud::TYPE_UPDATE) as $element): ?> <?php echo $element['html']; ?> <?php endforeach; ?> </div><?php endforeach; ?> <div class="red lighten-2" style="color:white;" ng-show="updateErrors.length"> <ul> <li ng-repeat="error in updateErrors" style="padding:6px;">-{{error.message}}</li></ul> </div></div><div class="modal__footer"> <div class="row"> <div class="col s12"> <div class="right"> <button class="btn waves-effect waves-light" type="submit" ng-disabled="updateForm.$invalid"> <?php echo \admin\Module::t('button_save'); ?> <i class="material-icons right">check</i> </button> <button class="btn waves-effect waves-light red" type="button" ng-click="closeUpdate()"> <i class="material-icons left">cancel</i> <?php echo \admin\Module::t('button_abort'); ?> </button> </div></div></div></div></form> <?php endif; ?> </div></div><div ng-show="activeWindowModal" class="modal__wrapper" zaa-esc="closeActiveWindow()"> <div class="modal"> <button class="btn waves-effect waves-light modal__close btn-floating red" type="button" ng-click="closeActiveWindow()"> <i class="material-icons">close</i> </button> <div class="modal-content" compile-html ng-bind-html="data.aw.content"></div></div><div class="modal__background"></div></div></div>
\ No newline at end of file