phpffcms / ffcms

Apps/Model/Admin/Content/FormContentUpdate.php

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
         if ($this->_content->id === null) {
             $this->_new = true;
             if (null === $this->galleryFreeId) {
-                $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32));
+                $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32));
             }
             if (null === $this->authorId) {
                 $this->authorId = App::$User->identity()->getId();
@@ -81,9 +81,9 @@ 
      */
     public function rules()
     {
-        $res =  [
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required', null, true, true],
+        $res = [
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required', null, true, true],
             ['text', 'used', null, true, true],
             ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'],
             [['path', 'categoryId', 'authorId', 'display', 'galleryFreeId', 'title'], 'required'],
@@ -96,9 +96,9 @@ 
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $res[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $res[] = ['keywords.' . $lang, 'length_max', 150];
-            $res[] = ['description.' . $lang, 'length_max', 250];
+            $res[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $res[] = ['keywords.'.$lang, 'length_max', 150];
+            $res[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $res;
@@ -142,8 +142,8 @@ 
         $this->_content->meta_description = Serialize::encode(App::$Security->strip_tags($this->metaDescription));
         $this->_content->source = App::$Security->strip_tags($this->source);
         // check if rating is changed
-        if ((int)$this->addRating !== 0) {
-            $this->_content->rating += (int)$this->addRating;
+        if ((int) $this->addRating !== 0) {
+            $this->_content->rating += (int) $this->addRating;
         }
         // check if special comment hash is exist
         if ($this->_new || Str::length($this->_content->comment_hash) < 32) {
@@ -155,7 +155,7 @@ 
         }
 
         // save poster data
-        $posterPath = '/upload/gallery/' . $this->galleryFreeId . '/orig/' . $this->poster;
+        $posterPath = '/upload/gallery/'.$this->galleryFreeId.'/orig/'.$this->poster;
         if (File::exist($posterPath)) {
             $this->_content->poster = $this->poster;
         }
@@ -168,7 +168,7 @@ 
 
         // move files
         if ($tmpGalleryId !== $this->_content->id) {
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
         }
     }
 
@@ -181,7 +181,7 @@ 
         $data = ContentCategory::getSortedCategories();
         $response = [];
         foreach ($data as $key=>$val) {
-            $response[] = (string)$key;
+            $response[] = (string) $key;
         }
         return $response;
     }

Apps/Model/Admin/Content/FormCategoryUpdate.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
         ];
 
         // general category
-        if ($this->_new === false && (int)$this->_record->id === 1) {
+        if ($this->_new === false && (int) $this->_record->id === 1) {
             $rules[] = ['path', 'used'];
         } else {
             $rules[] = ['path', 'required'];
@@ -116,7 +116,7 @@ 
             $rules[] = ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'];
         }
 
-        $rules[] = ['title.' . App::$Request->getLanguage(), 'required'];
+        $rules[] = ['title.'.App::$Request->getLanguage(), 'required'];
 
 
         return $rules;
@@ -129,7 +129,7 @@ 
     {
         $this->_record->title = Serialize::encode(App::$Security->strip_tags($this->title));
         $this->_record->description = Serialize::encode(App::$Security->strip_tags($this->description));
-        $savePath = trim($this->_pathNested . '/' . $this->path, '/');
+        $savePath = trim($this->_pathNested.'/'.$this->path, '/');
         $this->_record->path = $savePath;
         $this->_record->configs = Serialize::encode($this->configs);
         $this->_record->save();
@@ -164,7 +164,7 @@ 
         // build path with owner category
         $this->_pathNested = $owner->path;
         if (Str::length($this->_pathNested) > 0) {
-            $path = $this->_pathNested . '/' . $path;
+            $path = $this->_pathNested.'/'.$path;
         }
 
         // make select for check

Apps/Model/Front/Profile/FormSettings.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
     */
     public function labels()
     {
-        $labels =  [
+        $labels = [
             'nick' => __('Nickname'),
             'sex' => __('Sex'),
             'birthday' => __('Birthday'),
@@ -68,7 +68,7 @@ 
 
         // labels for custom fields
         foreach (ProfileField::getAll() as $custom) {
-            $labels['custom_data.' . $custom->id] = Serialize::getDecodeLocale($custom->name);
+            $labels['custom_data.'.$custom->id] = Serialize::getDecodeLocale($custom->name);
         }
 
         return $labels;
@@ -93,12 +93,12 @@ 
         // custom profile fields
         foreach (ProfileField::getAll() as $custom) {
             $rules[] = [
-                'custom_data.' . $custom->id,
+                'custom_data.'.$custom->id,
                 'used'
             ];
             $rules[] = [
-                'custom_data.' . $custom->id,
-                (int)$custom->reg_cond === 1 ? 'direct_match' : 'reverse_match',
+                'custom_data.'.$custom->id,
+                (int) $custom->reg_cond === 1 ? 'direct_match' : 'reverse_match',
                 $custom->reg_exp
             ];
         }

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;
     }

Apps/Model/Front/Content/EntityContentRead.php

Spacing +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
         }
 
         $this->source = $this->_content->source;
-        $this->views = $this->_content->views+1;
+        $this->views = $this->_content->views + 1;
         // check for dependence, add '' for general cat, ex: general/depend1/depend2/.../depend-n
         $catNestingArray = Arr::merge([0 => ''], explode('/', $this->catPath));
         if ($catNestingArray > 1) {
@@ -127,15 +127,15 @@ 
         ];
 
         // get gallery images and poster data
-        $galleryPath = '/upload/gallery/' . $this->_content->id;
+        $galleryPath = '/upload/gallery/'.$this->_content->id;
         // check if gallery folder is exist
         if (Directory::exist($galleryPath)) {
-            $originImages = File::listFiles($galleryPath . '/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
+            $originImages = File::listFiles($galleryPath.'/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
             // generate poster data
             if (Arr::in($this->_content->poster, $originImages)) {
                 // original poster
                 $posterName = $this->_content->poster;
-                $this->posterFull = $galleryPath . '/orig/' . $posterName;
+                $this->posterFull = $galleryPath.'/orig/'.$posterName;
                 if (!File::exist($this->posterFull)) {
                     $this->posterFull = null;
                 }
@@ -143,7 +143,7 @@ 
                 $posterSplit = explode('.', $posterName);
                 array_pop($posterSplit);
                 $posterCleanName = implode('.', $posterSplit);
-                $this->posterThumb = $galleryPath . '/thumb/' . $posterCleanName . '.jpg';
+                $this->posterThumb = $galleryPath.'/thumb/'.$posterCleanName.'.jpg';
                 if (!File::exist($this->posterThumb)) {
                     $this->posterThumb = null;
                 }
@@ -158,9 +158,9 @@ 
                 if (Str::startsWith($imageClearName, $this->_content->poster)) {
                     continue;
                 }
-                $thumbPath = $galleryPath . '/thumb/' . $imageClearName . '.jpg';
+                $thumbPath = $galleryPath.'/thumb/'.$imageClearName.'.jpg';
                 if (File::exist($thumbPath)) {
-                    $this->galleryItems[$thumbPath] = $galleryPath . '/orig/' . $image;
+                    $this->galleryItems[$thumbPath] = $galleryPath.'/orig/'.$image;
                 }
             }
         }
@@ -169,7 +169,7 @@ 
         $this->rating = $this->_content->rating;
         $ignoredRate = App::$Session->get('content.rate.ignore');
         $this->canRate = true;
-        if (Obj::isArray($ignoredRate) && Arr::in((string)$this->id, $ignoredRate)) {
+        if (Obj::isArray($ignoredRate) && Arr::in((string) $this->id, $ignoredRate)) {
             $this->canRate = false;
         }
         if (!App::$User->isAuth()) {

Apps/Model/Front/Content/EntityContentSearch.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
             $this->items[] = [
                 'title' => $item->getLocaled('title'),
                 'snippet' => Text::snippet($text),
-                'uri' => '/content/read/' . $item->getPath(),
+                'uri' => '/content/read/'.$item->getPath(),
                 'thumb' => $item->getPosterThumbUri()
             ];
         }

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

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/Model/Install/Main/FormInstall.php

Spacing +4 added lines, -4 removed lines

@@ -71,14 +71,14 @@
         $cfg['database'] = $this->db;
         $cfg['adminEmail'] = $this->email;
         $cfg['singleLanguage'] = $this->singleLanguage;
-        $cfg['multiLanguage'] = (bool)$this->multiLanguage;
-        $cfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$';
-        $cfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(4, 16));
+        $cfg['multiLanguage'] = (bool) $this->multiLanguage;
+        $cfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$';
+        $cfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(4, 16));
         $cfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128));
 
         // import database tables
         $connectName = 'install';
-        include(root . '/Private/Database/install.php');
+        include(root.'/Private/Database/install.php');
 
         // insert admin user
         $user = new User();