@@ -4,11 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Apps\ActiveRecord\Profile; |
| 6 | 6 | use Apps\ActiveRecord\User; |
| 7 | -use Apps\Model\Front\User\FormLogin; |
|
| 8 | 7 | use Ffcms\Core\App; |
| 9 | 8 | use Ffcms\Core\Arch\Model; |
| 10 | 9 | use Ffcms\Core\Helper\Type\Str; |
| 11 | -use Ffcms\Core\Interfaces\iUser; |
|
| 12 | 10 | |
| 13 | 11 | class FormRegister extends Model |
| 14 | 12 | { |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | - * Parse user identifier to attributes |
|
| 48 | - */ |
|
| 47 | + * Parse user identifier to attributes |
|
| 48 | + */ |
|
| 49 | 49 | public function before() |
| 50 | 50 | { |
| 51 | 51 | // set unique user id from provider response |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function __construct($provider, $identity) |
| 40 | 40 | { |
| 41 | - $this->_provider_name = (string)$provider; |
|
| 41 | + $this->_provider_name = (string) $provider; |
|
| 42 | 42 | $this->_identity = $identity; |
| 43 | 43 | parent::__construct(false); |
| 44 | 44 | } |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | } |
| 126 | 126 | // set birthday if available |
| 127 | 127 | if ($this->_identity->birthDay !== null && $this->_identity->birthMonth !== null && $this->_identity->birthYear !== null) { |
| 128 | - $profile->birthday = $this->_identity->birthYear . '-' . $this->_identity->birthMonth . '-' . $this->_identity->birthDay; |
|
| 128 | + $profile->birthday = $this->_identity->birthYear.'-'.$this->_identity->birthMonth.'-'.$this->_identity->birthDay; |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | // try to parse avatar from remote service |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | protected function parseAvatar($url, $userId) |
| 149 | 149 | { |
| 150 | 150 | // check if user is defined |
| 151 | - if ((int)$userId < 1) { |
|
| 151 | + if ((int) $userId < 1) { |
|
| 152 | 152 | return; |
| 153 | 153 | } |
| 154 | 154 | |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | // write image to filesystem |
| 168 | - $imagePath = '/upload/user/avatar/original/' . $userId . '.' . $imageExtension; |
|
| 168 | + $imagePath = '/upload/user/avatar/original/'.$userId.'.'.$imageExtension; |
|
| 169 | 169 | $write = File::write($imagePath, $imageContent); |
| 170 | 170 | if ($write === false) { |
| 171 | 171 | return; |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | // try to write and resize file |
| 175 | 175 | try { |
| 176 | - $fileObject = new FileObject(root . $imagePath); |
|
| 176 | + $fileObject = new FileObject(root.$imagePath); |
|
| 177 | 177 | $avatarUpload = new FormAvatarUpload(); |
| 178 | 178 | $avatarUpload->resizeAndSave($fileObject, $userId, 'small'); |
| 179 | 179 | $avatarUpload->resizeAndSave($fileObject, $userId, 'medium'); |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | die(); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -require_once (root . '/Loader/Autoload.php'); |
|
| 9 | +require_once (root.'/Loader/Autoload.php'); |
|
| 10 | 10 | |
| 11 | 11 | class Console extends Ffcms\Console\Console {} |
| 12 | 12 | |
@@ -18,5 +18,5 @@ discard block |
||
| 18 | 18 | // display output |
| 19 | 19 | echo \Console::run(); |
| 20 | 20 | } catch (Exception $e) { |
| 21 | - echo $e->getMessage() . "\n"; |
|
| 21 | + echo $e->getMessage()."\n"; |
|
| 22 | 22 | } |
| 23 | 23 | \ No newline at end of file |
@@ -24,13 +24,13 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | public function actionImport($activeRecord) |
| 26 | 26 | { |
| 27 | - $importFile = root . '/Private/Database/Tables/' . ucfirst(strtolower($activeRecord)) . '.php'; |
|
| 27 | + $importFile = root.'/Private/Database/Tables/'.ucfirst(strtolower($activeRecord)).'.php'; |
|
| 28 | 28 | if (!File::exist($importFile)) { |
| 29 | - return 'Database model table not founded: ' . $activeRecord; |
|
| 29 | + return 'Database model table not founded: '.$activeRecord; |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | @include($importFile); |
| 33 | - return 'Database table import done: ' . $activeRecord; |
|
| 33 | + return 'Database table import done: '.$activeRecord; |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -40,9 +40,9 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function actionImportAll($connectName = 'default') |
| 42 | 42 | { |
| 43 | - $importFile = root . '/Private/Database/install.php'; |
|
| 43 | + $importFile = root.'/Private/Database/install.php'; |
|
| 44 | 44 | if (!File::exist($importFile)) { |
| 45 | - return 'Import file is not exist: ' . $importFile; |
|
| 45 | + return 'Import file is not exist: '.$importFile; |
|
| 46 | 46 | } |
| 47 | 47 | @include($importFile); |
| 48 | 48 | return 'All database tables was imported!'; |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | throw new NativeException('Password is bad'); |
| 72 | 72 | } |
| 73 | 73 | echo "RoleId (1 = onlyread, 2 = user, 3 = moderator, 4 = admin):"; |
| 74 | - $role = (int)Console::$Input->read(); |
|
| 75 | - if (!Arr::in($role, [1,2,3,4])) { |
|
| 74 | + $role = (int) Console::$Input->read(); |
|
| 75 | + if (!Arr::in($role, [1, 2, 3, 4])) { |
|
| 76 | 76 | $role = 2; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Ffcms\Core\App as MainApp; |
| 6 | 6 | use Ffcms\Core\Arch\ActiveModel; |
| 7 | 7 | use Ffcms\Core\Helper\Type\Arr; |
| 8 | -use Ffcms\Core\Helper\Type\Str; |
|
| 9 | 8 | |
| 10 | 9 | class Role extends ActiveModel |
| 11 | 10 | { |
@@ -14,13 +14,13 @@ discard block |
||
| 14 | 14 | $this->title = __('User list'); |
| 15 | 15 | |
| 16 | 16 | if ($id === 'all') { |
| 17 | - $this->title .= ': ' . __('All'); |
|
| 17 | + $this->title .= ': '.__('All'); |
|
| 18 | 18 | } elseif ($id === 'rating') { |
| 19 | - $this->title .= ': ' . __('Rating'); |
|
| 19 | + $this->title .= ': '.__('Rating'); |
|
| 20 | 20 | } elseif ($id === 'city') { |
| 21 | - $this->title .= ': ' . __('City') . ' ' . \App::$Security->strip_tags($add); |
|
| 21 | + $this->title .= ': '.__('City').' '.\App::$Security->strip_tags($add); |
|
| 22 | 22 | } elseif ($id === 'hobby') { |
| 23 | - $this->title .= ': ' . __('Hobby') . ' ' . \App::$Security->strip_tags($add); |
|
| 23 | + $this->title .= ': '.__('Hobby').' '.\App::$Security->strip_tags($add); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | $this->breadcrumbs = [ |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | <?php |
| 37 | 37 | if ($records === null || $records->count() < 1) { |
| 38 | - echo '<div class="alert alert-danger">' . __('Users are not founded!') . '</div>'; |
|
| 38 | + echo '<div class="alert alert-danger">'.__('Users are not founded!').'</div>'; |
|
| 39 | 39 | return; |
| 40 | 40 | } |
| 41 | 41 | ?> |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | </div> |
| 49 | 49 | <div class="col-md-8"> |
| 50 | 50 | <h3> |
| 51 | - <?= Url::link(['profile/show', $profile->user_id], Str::likeEmpty($profile->nick) ? __('No name') . '(id' . $profile->user_id . ')' : $profile->nick) ?> |
|
| 51 | + <?= Url::link(['profile/show', $profile->user_id], Str::likeEmpty($profile->nick) ? __('No name').'(id'.$profile->user_id.')' : $profile->nick) ?> |
|
| 52 | 52 | </h3> |
| 53 | 53 | <p><?= __('Registered') ?>: <?= Date::convertToDatetime($profile->created_at, Date::FORMAT_TO_DAY) ?></p> |
| 54 | 54 | <?php if (\App::$User->identity() !== null && $profile->user_id !== \App::$User->identity()->getId()): ?> |
| 55 | - <?= Url::link(['profile/messages', null, null, ['newdialog' => $profile->user_id]], '<i class="fa fa-pencil-square-o"></i> ' . __('New message'), ['class' => 'btn btn-info']) ?> |
|
| 55 | + <?= Url::link(['profile/messages', null, null, ['newdialog' => $profile->user_id]], '<i class="fa fa-pencil-square-o"></i> '.__('New message'), ['class' => 'btn btn-info']) ?> |
|
| 56 | 56 | <?php endif; ?> |
| 57 | 57 | </div> |
| 58 | 58 | <div class="col-md-2"> |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | date_default_timezone_set(App::$Properties->get('timezone')); |
| 14 | 14 | |
| 15 | 15 | return [ |
| 16 | - 'Database' => function () { |
|
| 16 | + 'Database' => function() { |
|
| 17 | 17 | $capsule = new Capsule; |
| 18 | 18 | if (env_name !== 'Install') { |
| 19 | 19 | try { |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | try { |
| 35 | 35 | $capsule->connection()->getPdo(); |
| 36 | 36 | } catch (\Exception $e) { |
| 37 | - $instUri = \App::$Alias->scriptUrl . '/install'; |
|
| 37 | + $instUri = \App::$Alias->scriptUrl.'/install'; |
|
| 38 | 38 | \App::$Response->redirect($instUri, true); |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -46,10 +46,10 @@ discard block |
||
| 46 | 46 | try { |
| 47 | 47 | $pdo = \App::$Database->connection()->getPdo(); |
| 48 | 48 | $handler = new PdoSessionHandler($pdo, [ |
| 49 | - 'db_table' => App::$Properties->get('database')['prefix'] . 'sessions' |
|
| 49 | + 'db_table' => App::$Properties->get('database')['prefix'].'sessions' |
|
| 50 | 50 | ]); |
| 51 | 51 | } catch (Exception $e) { |
| 52 | - $handler = new NativeFileSessionHandler(root . '/Private/Sessions'); |
|
| 52 | + $handler = new NativeFileSessionHandler(root.'/Private/Sessions'); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $storage = new NativeSessionStorage([ |
@@ -60,21 +60,21 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | return new Session($storage); |
| 62 | 62 | }, |
| 63 | - 'User' => function () { |
|
| 63 | + 'User' => function() { |
|
| 64 | 64 | return new Apps\ActiveRecord\User(); |
| 65 | 65 | }, |
| 66 | - 'Mailer' => function () { |
|
| 66 | + 'Mailer' => function() { |
|
| 67 | 67 | $swiftTransport = Swift_MailTransport::newInstance(); |
| 68 | 68 | return Swift_Mailer::newInstance($swiftTransport); |
| 69 | 69 | }, |
| 70 | - 'Captcha' => function () { |
|
| 70 | + 'Captcha' => function() { |
|
| 71 | 71 | return new Extend\Core\Captcha\Gregwar(); |
| 72 | 72 | }, |
| 73 | - 'Cache' => function () { |
|
| 73 | + 'Cache' => function() { |
|
| 74 | 74 | // initialize cache manager. You can use redis, memcache or anything else. Look at: phpfastcache.com |
| 75 | 75 | CacheManager::setup([ |
| 76 | 76 | 'storage' => 'files', |
| 77 | - 'path' => root . '/Private/Cache' |
|
| 77 | + 'path' => root.'/Private/Cache' |
|
| 78 | 78 | ]); |
| 79 | 79 | return CacheManager::getInstance('files'); |
| 80 | 80 | }, |
@@ -1,9 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use Ffcms\Core\Helper\Date; |
|
| 4 | 3 | use Ffcms\Core\Helper\HTML\Form; |
| 5 | 4 | use Ffcms\Core\Helper\Simplify; |
| 6 | -use Ffcms\Core\Helper\Type\Str; |
|
| 7 | 5 | use Ffcms\Core\Helper\Url; |
| 8 | 6 | |
| 9 | 7 | /** @var $model Apps\Model\Front\Profile\FormIgnoreDelete */ |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php return [ |
| 2 | - 'Alias' => [ |
|
| 3 | - 'Front' => [ |
|
| 4 | - '/' => '/content/list/news' |
|
| 5 | - ] |
|
| 6 | - ] |
|
| 2 | + 'Alias' => [ |
|
| 3 | + 'Front' => [ |
|
| 4 | + '/' => '/content/list/news' |
|
| 5 | + ] |
|
| 6 | + ] |
|
| 7 | 7 | ]; |
| 8 | 8 | \ No newline at end of file |