phpffcms / ffcms

Apps/Model/Front/Profile/FormAvatarUpload.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
     public function copyFile(iUser $user)
     {
         // move file to original folder
-        $upload = $this->file->move(root . '/upload/user/avatar/original/', $user->id . '.' . $this->file->guessExtension());
+        $upload = $this->file->move(root.'/upload/user/avatar/original/', $user->id.'.'.$this->file->guessExtension());
 
         try {
             // big image
@@ -82,11 +82,11 @@ 
         }
 
         $image = new Image();
-        $image->setCacheDir(root . '/Private/Cache/images');
+        $image->setCacheDir(root.'/Private/Cache/images');
 
         $image->open($original->getPathname())
             ->cropResize($sizeConvert[$size][0], $sizeConvert[$size][1])
-            ->save(root . '/upload/user/avatar/' . $size . '/' . $user_id . '.jpg', 'jpg', static::COMPRESS_QUALITY);
+            ->save(root.'/upload/user/avatar/'.$size.'/'.$user_id.'.jpg', 'jpg', static::COMPRESS_QUALITY);
 
         return null;
     }

Indentation +4 added lines, -4 removed lines

@@ -20,8 +20,8 @@ 
     const COMPRESS_QUALITY = 90;
 
     /**
-    * Form text helper data with translation
-    */
+     * Form text helper data with translation
+     */
     public function labels()
     {
         return [
@@ -30,8 +30,8 @@ 
     }
 
     /**
-    * Validation rules for avatar uploading
-    */
+     * Validation rules for avatar uploading
+     */
     public function rules()
     {
         return [

Apps/Model/Console/ArchBuilder.php

Spacing +16 added lines, -16 removed lines

@@ -29,8 +29,8 @@ 
         $objectTemplate = null;
 
         if ($singleName) {
-            $objectDirPath = root . '/Apps/' . $type . '/';
-            $objectNamespace = 'Apps\\' . $type;
+            $objectDirPath = root.'/Apps/'.$type.'/';
+            $objectNamespace = 'Apps\\'.$type;
             $objectName = ucfirst($name);
         } else {
             $split = explode('/', $name);
@@ -47,46 +47,46 @@ 
             }
             
             if ($type === 'Widget') {
-                $objectDirPath = root . '/Widgets/' . $workground;
-                $objectNamespace = 'Widgets\\' . $workground;
+                $objectDirPath = root.'/Widgets/'.$workground;
+                $objectNamespace = 'Widgets\\'.$workground;
             } else {
-                $objectDirPath = root . '/Apps/' . $type . '/' . $workground;
-                $objectNamespace = 'Apps\\' . $type . '\\' . $workground;
+                $objectDirPath = root.'/Apps/'.$type.'/'.$workground;
+                $objectNamespace = 'Apps\\'.$type.'\\'.$workground;
             }
             
             if (false !== $subName) {
-                $objectDirPath .= '/' . implode('/', $subName);
-                $objectNamespace .= '\\' . implode('\\', $subName);
+                $objectDirPath .= '/'.implode('/', $subName);
+                $objectNamespace .= '\\'.implode('\\', $subName);
             }
 
 
             // try to find workground-based controller
-            if (File::exist('/Private/Carcase/' . $workground . '/' . $type . '.tphp')) {
-                $objectTemplate = File::read('/Private/Carcase/' . $workground . '/' . $type . '.tphp');
+            if (File::exist('/Private/Carcase/'.$workground.'/'.$type.'.tphp')) {
+                $objectTemplate = File::read('/Private/Carcase/'.$workground.'/'.$type.'.tphp');
             }
         }
 
         if (!Directory::exist($objectDirPath) && !Directory::create($objectDirPath)) {
-            $this->message = 'Directory could not be created: ' . $objectDirPath;
+            $this->message = 'Directory could not be created: '.$objectDirPath;
             return false;
         }
 
         if ($objectTemplate === null) {
-            $objectTemplate = File::read('/Private/Carcase/' . $type . '.tphp');
+            $objectTemplate = File::read('/Private/Carcase/'.$type.'.tphp');
             if (false === $objectTemplate) {
-                $this->message = 'Php template file is not founded: /Private/Carcase/' . $type . '.tphp';
+                $this->message = 'Php template file is not founded: /Private/Carcase/'.$type.'.tphp';
                 return false;
             }
         }
 
         $objectContent = Str::replace(['%namespace%', '%name%'], [$objectNamespace, $objectName], $objectTemplate);
-        $objectFullPath = $objectDirPath . '/' . $objectName . '.php';
+        $objectFullPath = $objectDirPath.'/'.$objectName.'.php';
         if (File::exist($objectFullPath)) {
-            $this->message = $type . ' is always exist: ' . $objectFullPath;
+            $this->message = $type.' is always exist: '.$objectFullPath;
             return false;
         }
         File::write($objectFullPath, $objectContent);
-        $this->message = $type . ' template was created: [' . $objectName . '] in path: ' . Str::replace(root, '', $objectDirPath);
+        $this->message = $type.' template was created: ['.$objectName.'] in path: '.Str::replace(root, '', $objectDirPath);
         return true;
     }
 }
\ No newline at end of file

Doc Comments +4 added lines

@@ -10,6 +10,10 @@
 {
     public $message;
 
+    /**
+     * @param string $name
+     * @param string $type
+     */
     public function createObject($name, $type)
     {
         $singleName = false;

Apps/Model/Basic/Antivirus.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
         $this->beginTime = time();
 
         $this->signatures = new \DOMDocument();
-        $this->signatures->load(root . '/Private/Antivirus/Signatures.xml');
+        $this->signatures->load(root.'/Private/Antivirus/Signatures.xml');
 
         // list of files is not prepared, 1st iteration
         if (!File::exist('/Private/Antivirus/ScanFiles.json')) {
@@ -46,7 +46,7 @@ 
 
         $this->scanFiles = json_decode(File::read('/Private/Antivirus/ScanFiles.json'));
         if (File::exist('/Private/Antivirus/Infected.json')) {
-            $this->infected = (array)json_decode(File::read('/Private/Antivirus/Infected.json'));
+            $this->infected = (array) json_decode(File::read('/Private/Antivirus/Infected.json'));
         }
     }
 
@@ -108,13 +108,13 @@ 
 
             switch ($attrFormat) {
                 case 're':
-                    if ((preg_match('#(' . $sigContent . ')#smi', $content, $found, PREG_OFFSET_CAPTURE)) ||
-                        (preg_match('#(' . $sigContent . ')#smi', $normalized, $found, PREG_OFFSET_CAPTURE))
+                    if ((preg_match('#('.$sigContent.')#smi', $content, $found, PREG_OFFSET_CAPTURE)) ||
+                        (preg_match('#('.$sigContent.')#smi', $normalized, $found, PREG_OFFSET_CAPTURE))
                     ) {
                         $detected = true;
                         $pos = $found[0][1];
                         $this->infected[$path][] = [
-                            'pos' => (int)$pos,
+                            'pos' => (int) $pos,
                             'sigId' => $attrId,
                             'sigRule' => $sigContent,
                             'sever' => $attrSever,
@@ -128,7 +128,7 @@ 
                         (($pos = strpos($normalized, $sigContent)) !== false)
                     ) {
                         $this->infected[$path][] = [
-                            'pos' => (int)$pos,
+                            'pos' => (int) $pos,
                             'sigId' => $attrId,
                             'sigRule' => $sigContent,
                             'sever' => $attrSever,
@@ -148,7 +148,7 @@ 
      */
     private function prepareScanlist()
     {
-        $files = (object)File::listFiles(root, $this->affectedExt);
+        $files = (object) File::listFiles(root, $this->affectedExt);
         File::write('/Private/Antivirus/ScanFiles.json', json_encode($files));
     }
 

Apps/Controller/Admin/Feedback.php

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
     public function actionIndex()
     {
         // set current page and offset
-        $page = (int)App::$Request->query->get('page');
+        $page = (int) App::$Request->query->get('page');
         $offset = $page * self::ITEM_PER_PAGE;
 
         // get feedback posts AR table
@@ -73,7 +73,7 @@ 
 
         // initialize model with answer add if thread is not closed
         $model = null;
-        if ((int)$record->closed !== 1) {
+        if ((int) $record->closed !== 1) {
             $model = new FormAnswerAdd($record, App::$User->identity()->getId());
             if ($model->send()) {
                 if ($model->validate()) {
@@ -104,7 +104,7 @@ 
             case 'answer':
                 $record = FeedbackAnswer::find($id);
                 if ($record !== null && $record !== false) {
-                    $postId = (int)$record->getFeedbackPost()->id;
+                    $postId = (int) $record->getFeedbackPost()->id;
                 }
                 break;
         }
@@ -120,7 +120,7 @@ 
             if ($model->validate()) {
                 $model->make();
                 App::$Session->getFlashBag()->add('success', __('Feedback item are successful changed'));
-                App::$Response->redirect('feedback/read/' . $postId);
+                App::$Response->redirect('feedback/read/'.$postId);
             } else {
                 App::$Session->getFlashBag()->add('danger', __('Updating is failed'));
             }
@@ -170,7 +170,7 @@ 
         App::$Session->getFlashBag()->add('success', __('Feedback request is changed!'));
 
         // redirect to feedback post read
-        App::$Response->redirect('feedback/read/' . $id);
+        App::$Response->redirect('feedback/read/'.$id);
         return null;
     }
 
@@ -214,7 +214,7 @@ 
                 // its a answer, lets remove it and redirect back in post
                 $postId = $record->feedback_id;
                 $record->delete();
-                App::$Response->redirect('feedback/read/' . $postId);
+                App::$Response->redirect('feedback/read/'.$postId);
             }
         }
 

Apps/Controller/Admin/Profile.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
         $query = new ProfileRecords();
 
         // set current page and offset
-        $page = (int)App::$Request->query->get('page');
+        $page = (int) App::$Request->query->get('page');
         $offset = $page * self::ITEM_PER_PAGE;
 
         // build pagination
@@ -59,7 +59,7 @@ 
      */
     public function actionDelete($id)
     {
-        App::$Response->redirect('user/delete/' . $id);
+        App::$Response->redirect('user/delete/'.$id);
     }
 
     /**

Apps/Controller/Front/Feedback.php

Spacing +9 added lines, -9 removed lines

@@ -40,19 +40,19 @@ 
     {
         // get configs
         $configs = $this->getConfigs();
-        if (!App::$User->isAuth() && (int)$configs['guestAdd'] !== 1) {
+        if (!App::$User->isAuth() && (int) $configs['guestAdd'] !== 1) {
             throw new ForbiddenException(__('Feedback available only for authorized users'));
         }
 
         // initialize model
-        $model = new FormFeedbackAdd((int)$configs['useCaptcha'] === 1);
+        $model = new FormFeedbackAdd((int) $configs['useCaptcha'] === 1);
         if ($model->send()) {
             if ($model->validate()) {
                 // if validation is passed save data to db and get row
                 $record = $model->make();
                 App::$Session->getFlashBag()->add('success', __('Your message was added successful'));
                 // todo: add email notification
-                App::$Response->redirect('feedback/read/' . $record->id . '/' . $record->hash);
+                App::$Response->redirect('feedback/read/'.$record->id.'/'.$record->hash);
             } else {
                 App::$Session->getFlashBag()->add('error', __('Message is not sended! Please, fix issues in form below'));
             }
@@ -61,7 +61,7 @@ 
         // render output view
         return App::$View->render('create', [
             'model' => $model->export(),
-            'useCaptcha' => (int)$configs['useCaptcha'] === 1
+            'useCaptcha' => (int) $configs['useCaptcha'] === 1
         ]);
     }
 
@@ -92,7 +92,7 @@ 
         $userId = App::$User->isAuth() ? App::$User->identity()->getId() : 0;
         $model = null;
         // check if feedback post is not closed for answers
-        if ((int)$recordPost->closed === 0) {
+        if ((int) $recordPost->closed === 0) {
             // init new answer add model
             $model = new FormAnswerAdd($recordPost, $userId);
             // if answer is sender lets try to make it model
@@ -127,10 +127,10 @@ 
         // check if action is submited
         if (App::$Request->request->get('closeRequest', false)) {
             // if created by authorized user
-            if ((int)$record->user_id !== 0) {
+            if ((int) $record->user_id !== 0) {
                 $user = App::$User->identity();
                 // button is pressed not by request creator
-                if ($user === null || $user->getId() !== (int)$record->user_id) {
+                if ($user === null || $user->getId() !== (int) $record->user_id) {
                     throw new ForbiddenException(__('This feedback request was created by another user'));
                 }
             }
@@ -141,7 +141,7 @@ 
 
             // add notification and redirect
             App::$Session->getFlashBag()->add('warning', __('Feedback request now is closed!'));
-            App::$Response->redirect('feedback/read/' . $id . '/' . $hash);
+            App::$Response->redirect('feedback/read/'.$id.'/'.$hash);
         }
 
         return App::$View->render('close');
@@ -156,7 +156,7 @@ 
     public function actionList()
     {
         // set current page and offset
-        $page = (int)App::$Request->query->get('page');
+        $page = (int) App::$Request->query->get('page');
         $offset = $page * self::ITEM_PER_PAGE;
 
         // check if user is authorized or throw exception

Apps/Controller/Front/Profile.php

Spacing +18 added lines, -18 removed lines

@@ -36,9 +36,9 @@ 
         $records = null;
 
         // set current page and offset
-        $page = (int)App::$Request->query->get('page');
+        $page = (int) App::$Request->query->get('page');
         $cfgs = Serialize::decode($this->application->configs);
-        $userPerPage = (int)$cfgs['usersOnPage'];
+        $userPerPage = (int) $cfgs['usersOnPage'];
         if ($userPerPage < 1) {
             $userPerPage = 1;
         }
@@ -47,7 +47,7 @@ 
         switch ($filter_name) {
             case 'rating': // rating list, order by rating DESC
                 // check if rating is enabled
-                if ((int)$cfgs['rating'] !== 1) {
+                if ((int) $cfgs['rating'] !== 1) {
                     throw new NotFoundException();
                 }
                 $records = (new ProfileRecords())->orderBy('rating', 'DESC');
@@ -56,7 +56,7 @@ 
                 if (Str::likeEmpty($filter_value)) {
                     throw new NotFoundException();
                 }
-                $records = (new ProfileRecords())->where('hobby', 'like', '%' . $filter_value . '%');
+                $records = (new ProfileRecords())->where('hobby', 'like', '%'.$filter_value.'%');
                 break;
             case 'city':
                 if (Str::likeEmpty($filter_value)) {
@@ -68,7 +68,7 @@ 
                 if ($filter_value === null || !Obj::isLikeInt($filter_value)) {
                     throw new NotFoundException();
                 }
-                $records = (new ProfileRecords())->where('birthday', 'like', $filter_value . '-%');
+                $records = (new ProfileRecords())->where('birthday', 'like', $filter_value.'-%');
                 break;
             case 'all':
                 $records = (new ProfileRecords())->orderBy('id', 'DESC');
@@ -91,7 +91,7 @@ 
             'pagination' => $pagination,
             'id' => $filter_name,
             'add' => $filter_value,
-            'ratingOn' => (int)$cfgs['rating']
+            'ratingOn' => (int) $cfgs['rating']
         ]);
     }
 
@@ -104,7 +104,7 @@ 
     public function actionShow($userId)
     {
         $cfg = Serialize::decode($this->application->configs);
-        if ((int)$cfg['guestView'] !== 1 && !App::$User->isAuth()) {
+        if ((int) $cfg['guestView'] !== 1 && !App::$User->isAuth()) {
             throw new ForbiddenException('You must be registered user to view other profile');
         }
         // check if target exists
@@ -126,7 +126,7 @@ 
                     App::$Session->getFlashBag()->add('error', __('This user are in your black list or you are in blacklist!'));
                 } else {
                     // check if message added
-                    if ($wallModel->makePost($targetPersone, $viewerPersone, (int)$cfg['delayBetweenPost'])) {
+                    if ($wallModel->makePost($targetPersone, $viewerPersone, (int) $cfg['delayBetweenPost'])) {
                         App::$Session->getFlashBag()->add('success', __('The message was successful posted!'));
                     } else {
                         App::$Session->getFlashBag()->add('warning', __('Posting message was failed! You need to wait some time...'));
@@ -137,8 +137,8 @@ 
 
         $query = $targetPersone->getWall(); // relation hasMany from users to walls
         // pagination and query params
-        $wallPage = (int)App::$Request->query->get('page');
-        $wallItems = (int)$cfg['wallPostOnPage'];
+        $wallPage = (int) App::$Request->query->get('page');
+        $wallItems = (int) $cfg['wallPostOnPage'];
         $wallOffset = $wallPage * $wallItems;
 
         // build pagination
@@ -160,7 +160,7 @@ 
             'notify' => App::$Session->getFlashBag()->all(),
             'wallRecords' => $wallRecords,
             'pagination' => $wallPagination,
-            'ratingOn' => (int)$cfg['rating'] === 1
+            'ratingOn' => (int) $cfg['rating'] === 1
         ]);
     }
 
@@ -227,7 +227,7 @@ 
         $wallModel = new FormWallPostDelete($wallPost);
         if ($wallModel->send() && $wallModel->validate()) {
             $wallModel->make();
-            App::$Response->redirect('profile/show/' . $wallPost->target_id);
+            App::$Response->redirect('profile/show/'.$wallPost->target_id);
         }
 
         return App::$View->render('wall_delete', [
@@ -320,7 +320,7 @@ 
 
         // set user id from ?id= get param if form not sended
         if (!$model->send()) {
-            $uid = (int)App::$Request->query->get('id');
+            $uid = (int) App::$Request->query->get('id');
             if ($uid > 0) {
                 $model->id = $uid;
             }
@@ -338,7 +338,7 @@ 
         // get blocked users
         $records = Blacklist::where('user_id', '=', $user->getId());
 
-        $page = (int)App::$Request->query->get('page');
+        $page = (int) App::$Request->query->get('page');
         $offset = $page * self::BLOCK_PER_PAGE;
 
         // build pagination
@@ -410,9 +410,9 @@ 
         // check if request is sended
         if ($model->send() && $model->validate()) {
             // get records from db
-            $records = ProfileRecords::where('nick', 'like', '%' . $model->query . '%');
-            $page = (int)App::$Request->query->get('page');
-            $userPerPage = (int)$cfgs['usersOnPage'];
+            $records = ProfileRecords::where('nick', 'like', '%'.$model->query.'%');
+            $page = (int) App::$Request->query->get('page');
+            $userPerPage = (int) $cfgs['usersOnPage'];
             if ($userPerPage < 1) {
                 $userPerPage = 1;
             }
@@ -434,7 +434,7 @@ 
             'model' => $model->export(),
             'records' => $records,
             'pagination' => $pagination,
-            'ratingOn' => (int)$cfgs['rating']
+            'ratingOn' => (int) $cfgs['rating']
         ]);
     }
 }
\ No newline at end of file

Apps/Controller/Api/Main.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $connector = new \elFinderConnector(new \elFinder([
             'locale' => '',
             'roots' => [
-                ['driver' => 'LocalFileSystem', 'path' => root . '/upload/', 'URL' => App::$Alias->scriptUrl . '/upload/']
+                ['driver' => 'LocalFileSystem', 'path' => root.'/upload/', 'URL' => App::$Alias->scriptUrl.'/upload/']
             ]
         ]));
 

Apps/ActiveRecord/Profile.php

Spacing +9 added lines, -9 removed lines

@@ -46,8 +46,8 @@ 
         }
 
         // check in cache
-        if (MainApp::$Memory->get('profile.object.cache.' . $user_id) !== null) {
-            return MainApp::$Memory->get('profile.object.cache.' . $user_id);
+        if (MainApp::$Memory->get('profile.object.cache.'.$user_id) !== null) {
+            return MainApp::$Memory->get('profile.object.cache.'.$user_id);
         }
 
         // find row
@@ -60,7 +60,7 @@ 
 
         $object = $profile->first();
 
-        MainApp::$Memory->set('profile.object.cache.' . $user_id, $object);
+        MainApp::$Memory->set('profile.object.cache.'.$user_id, $object);
         return $object;
     }
 
@@ -71,17 +71,17 @@ 
      */
     public function getAvatarUrl($type = 'small')
     {
-        $default = '/upload/user/avatar/' . $type . '/default.jpg';
+        $default = '/upload/user/avatar/'.$type.'/default.jpg';
         if (!Arr::in($type, ['small', 'big', 'medium'])) {
-            return MainApp::$Alias->scriptUrl . $default;
+            return MainApp::$Alias->scriptUrl.$default;
         }
 
-        $route = '/upload/user/avatar/' . $type . '/' . $this->user_id . '.jpg';
+        $route = '/upload/user/avatar/'.$type.'/'.$this->user_id.'.jpg';
         if (File::exist($route)) {
-            return MainApp::$Alias->scriptUrl . $route . '?mtime=' . File::mTime($route);
+            return MainApp::$Alias->scriptUrl.$route.'?mtime='.File::mTime($route);
         }
 
-        return MainApp::$Alias->scriptUrl . $default;
+        return MainApp::$Alias->scriptUrl.$default;
     }
 
     /**
@@ -92,7 +92,7 @@ 
     {
         $userNick = $this->nick;
         if ($userNick === null || Str::likeEmpty($userNick)) {
-            $userNick = 'id' . $this->id;
+            $userNick = 'id'.$this->id;
         }
 
         return $userNick;